From 0857cf1830039d60ce73005f386f284cf575e511 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 14:00:19 +0800
Subject: [PATCH] feat(mes): 新增ERP销售订单生产状态枚举及MES工艺路线优化
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java | 23 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java | 48 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessSaveReqVO.java | 21 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java | 16 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java | 14
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessService.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 9
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessRespVO.java | 21 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessSaveReqVO.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderProcessDO.java | 19 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/route/MesProRouteProcessOutputMapper.java | 47 +++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessService.java | 21 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderProcessMapper.java | 20 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessRespVO.java | 18 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java | 190 ++++++++++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java | 82 +++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java | 30 ++
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java | 9
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteServiceImpl.java | 16 +
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpSaleOrderProductionStatusEnum.java | 22 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/route/MesProRouteProcessOutputDO.java | 72 +++++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java | 4
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskService.java | 7
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessOutputVO.java | 37 ++
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java | 1
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/listener/ProductionFinishedListener.java | 5
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java | 32 ++
30 files changed, 776 insertions(+), 40 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
index dea60a2..39940f1 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/dal/dataobject/sale/ErpSaleOrderDO.java
@@ -127,7 +127,9 @@
// ========== 鐢熶骇鍏宠仈 ==========
/**
- * 鐢熶骇鐘舵�侊細0-鏈畬鎴愶紝1-宸插畬鎴�
+ * 鐢熶骇鐘舵�侊細0-鏈畬鎴愶紝1-宸插畬鎴愶紝2-宸插彇娑�
+ *
+ * 鏋氫妇 {@link cn.iocoder.yudao.module.erp.enums.ErpSaleOrderProductionStatusEnum}
*/
private Integer productionStatus;
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpSaleOrderProductionStatusEnum.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpSaleOrderProductionStatusEnum.java
new file mode 100644
index 0000000..2619296
--- /dev/null
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErpSaleOrderProductionStatusEnum.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.module.erp.enums;
+
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+/**
+ * ERP 閿�鍞鍗曠敓浜х姸鎬佹灇涓�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@RequiredArgsConstructor
+@Getter
+public enum ErpSaleOrderProductionStatusEnum {
+
+ NOT_FINISHED(0, "鏈畬鎴�"),
+ FINISHED(1, "宸插畬鎴�"),
+ CANCELED(2, "宸插彇娑�"); // 鐢熶骇璁″垝琚彇娑�
+
+ private final Integer status;
+ private final String name;
+
+}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
index a0f4ca6..1bbffa3 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java
@@ -23,6 +23,7 @@
import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.enums.ErpSaleOrderProductionStatusEnum;
import cn.iocoder.yudao.module.erp.api.sale.enums.ErpSaleOrderOutStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
@@ -35,6 +36,7 @@
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -248,6 +250,13 @@
.setMpsId(mpsId));
createdCount++;
}
+ // 閲嶆柊鐢熸垚鐢熶骇璁″垝鍚庯紝璁㈠崟鐢熶骇鐘舵�佸洖鍒版湭瀹屾垚锛堣鐩栨鍓嶇殑鈥滃凡鍙栨秷鈥濓級
+ if (createdCount > 0) {
+ saleOrderMapper.update(null, new LambdaUpdateWrapper<ErpSaleOrderDO>()
+ .eq(ErpSaleOrderDO::getId, orderId)
+ .set(ErpSaleOrderDO::getProductionStatus, ErpSaleOrderProductionStatusEnum.NOT_FINISHED.getStatus())
+ .set(ErpSaleOrderDO::getProductionFinishTime, null));
+ }
log.info("[createMpsForSaleOrder] 閿�鍞鍗�({}) 瀹℃牳瀹屾垚锛屽垱寤� MPS {} 鏉★紝澶嶇敤 MPS {} 鏉�",
orderId, createdCount, reusedCount);
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/listener/ProductionFinishedListener.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/listener/ProductionFinishedListener.java
index f5d1bef..8ddbc48 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/listener/ProductionFinishedListener.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/listener/ProductionFinishedListener.java
@@ -2,6 +2,7 @@
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO;
import cn.iocoder.yudao.module.erp.dal.mysql.sale.ErpSaleOrderMapper;
+import cn.iocoder.yudao.module.erp.enums.ErpSaleOrderProductionStatusEnum;
import cn.iocoder.yudao.module.mes.api.event.ProductionFinishedEvent;
import cn.iocoder.yudao.module.mes.api.event.ProductionCanceledEvent;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -46,9 +47,9 @@
// 浣跨敤鏄惧紡 update wrapper 鎵嶈兘鎶婂凡瀛樺湪鐨勫畬鎴愭椂闂寸湡姝f洿鏂颁负 NULL
saleOrderMapper.update(null, new LambdaUpdateWrapper<ErpSaleOrderDO>()
.eq(ErpSaleOrderDO::getId, event.getSaleOrderId())
- .set(ErpSaleOrderDO::getProductionStatus, 0)
+ .set(ErpSaleOrderDO::getProductionStatus, ErpSaleOrderProductionStatusEnum.CANCELED.getStatus())
.set(ErpSaleOrderDO::getProductionFinishTime, null));
- log.info("[onProductionCanceled] 閿�鍞鍗� {} 鐢熶骇鐘舵�佸凡鎭㈠涓烘湭瀹屾垚", event.getSaleOrderId());
+ log.info("[onProductionCanceled] 閿�鍞鍗� {} 鐢熶骇鐘舵�佸凡鏇存柊涓哄凡鍙栨秷", event.getSaleOrderId());
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
index 1bc0813..32de347 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteProcessController.java
@@ -6,15 +6,25 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProProcessBomItemVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessOutputVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessOutputDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductBomDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -43,6 +53,14 @@
private MesProProcessService processService;
@Resource
private MesMdItemService mdItemService;
+ @Resource
+ private MesProRouteProductService routeProductService;
+ @Resource
+ private MesWmWarehouseService warehouseService;
+ @Resource
+ private MesWmWarehouseLocationService warehouseLocationService;
+ @Resource
+ private MesWmWarehouseAreaService warehouseAreaService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓宸ヨ壓璺嚎宸ュ簭")
@@ -111,7 +129,35 @@
}
}
}
+ // 濉厖宸ヨ壓璺嚎浜у搧涓婇厤缃殑榛樿鎶ュ伐浠撳簱锛堜笅鍗曟椂浣滀负宸ュ簭榛樿鍊硷級
+ fillDefaultOutputWarehouse(result, productId);
return success(result);
+ }
+
+ private void fillDefaultOutputWarehouse(List<MesProRouteProcessRespVO> list, Long productId) {
+ if (CollUtil.isEmpty(list)) {
+ return;
+ }
+ MesProRouteProductDO routeProduct = routeProductService.getRouteProductByItemId(productId);
+ if (routeProduct == null || routeProduct.getWarehouseId() == null) {
+ return;
+ }
+ MesWmWarehouseDO warehouse = warehouseService.getWarehouse(routeProduct.getWarehouseId());
+ MesWmWarehouseLocationDO location = routeProduct.getLocationId() != null
+ ? warehouseLocationService.getWarehouseLocation(routeProduct.getLocationId()) : null;
+ MesWmWarehouseAreaDO area = routeProduct.getAreaId() != null
+ ? warehouseAreaService.getWarehouseArea(routeProduct.getAreaId()) : null;
+ String warehouseName = warehouse != null ? warehouse.getName() : null;
+ String locationName = location != null ? location.getName() : null;
+ String areaName = area != null ? area.getName() : null;
+ for (MesProRouteProcessRespVO vo : list) {
+ vo.setWarehouseId(routeProduct.getWarehouseId());
+ vo.setWarehouseName(warehouseName);
+ vo.setLocationId(routeProduct.getLocationId());
+ vo.setLocationName(locationName);
+ vo.setAreaId(routeProduct.getAreaId());
+ vo.setAreaName(areaName);
+ }
}
@GetMapping("/list-by-route")
@@ -161,6 +207,41 @@
}
Map<Long, MesMdItemDO> outputItemMap = allOutputItemIds.isEmpty()
? Collections.emptyMap() : mdItemService.getItemMap(allOutputItemIds);
+ // 2.1 浜у嚭褰掑睘閰嶇疆锛坧roductId 涓虹┖琛ㄧず澶氫骇鍝侀�氱敤锛�
+ Map<Long, List<MesProRouteProcessOutputVO>> outputsByRouteProcessId = new HashMap<>();
+ Set<Long> routeProcessIds = convertSet(list, MesProRouteProcessDO::getId);
+ routeProcessIds.removeAll(Collections.singleton(null));
+ if (CollUtil.isNotEmpty(routeProcessIds)) {
+ List<MesProRouteProcessOutputDO> outputList = routeProcessService
+ .getRouteProcessOutputListByRouteProcessIds(routeProcessIds);
+ if (CollUtil.isNotEmpty(outputList)) {
+ Set<Long> ownerItemIds = new HashSet<>();
+ outputList.forEach(output -> {
+ if (output.getProductId() != null) {
+ ownerItemIds.add(output.getProductId());
+ }
+ if (output.getItemId() != null) {
+ ownerItemIds.add(output.getItemId());
+ }
+ });
+ Map<Long, MesMdItemDO> ownerItemMap = mdItemService.getItemMap(ownerItemIds);
+ for (MesProRouteProcessOutputDO output : outputList) {
+ MesProRouteProcessOutputVO outputVO = new MesProRouteProcessOutputVO();
+ outputVO.setId(output.getId());
+ outputVO.setRouteProcessId(output.getRouteProcessId());
+ outputVO.setProductId(output.getProductId());
+ outputVO.setItemId(output.getItemId());
+ outputVO.setSort(output.getSort());
+ outputVO.setRemark(output.getRemark());
+ MapUtils.findAndThen(ownerItemMap, output.getItemId(),
+ item -> outputVO.setItemCode(item.getCode()).setItemName(item.getName()));
+ MapUtils.findAndThen(ownerItemMap, output.getProductId(),
+ product -> outputVO.setProductName(product.getName()));
+ outputsByRouteProcessId.computeIfAbsent(output.getRouteProcessId(),
+ key -> new ArrayList<>()).add(outputVO);
+ }
+ }
+ }
// 3. 鎷兼帴 VO
List<MesProRouteProcessRespVO> result = BeanUtils.toBean(list, MesProRouteProcessRespVO.class);
for (int i = 0; i < result.size(); i++) {
@@ -188,6 +269,7 @@
vo.setOutputItemName(firstItem.getName());
}
}
+ vo.setOutputs(outputsByRouteProcessId.getOrDefault(vo.getId(), Collections.emptyList()));
}
return result;
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessOutputVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessOutputVO.java
new file mode 100644
index 0000000..0ee4fbb
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessOutputVO.java
@@ -0,0 +1,37 @@
+package cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "绠$悊鍚庡彴 - MES 宸ヨ壓璺嚎宸ュ簭浜у嚭褰掑睘 Response VO")
+@Data
+public class MesProRouteProcessOutputVO {
+
+ @Schema(description = "缂栧彿", example = "1")
+ private Long id;
+
+ @Schema(description = "宸ヨ壓璺嚎宸ュ簭缂栧彿", example = "1")
+ private Long routeProcessId;
+
+ @Schema(description = "褰掑睘浜у搧缂栧彿锛屼负绌鸿〃绀哄浜у搧閫氱敤")
+ private Long productId;
+
+ @Schema(description = "褰掑睘浜у搧鍚嶇О")
+ private String productName;
+
+ @Schema(description = "浜у嚭鐗╂枡缂栧彿", example = "100")
+ private Long itemId;
+
+ @Schema(description = "浜у嚭鐗╂枡缂栫爜")
+ private String itemCode;
+
+ @Schema(description = "浜у嚭鐗╂枡鍚嶇О")
+ private String itemName;
+
+ @Schema(description = "鎺掑簭", example = "1")
+ private Integer sort;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessRespVO.java
index 935d463..33c2563 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessRespVO.java
@@ -70,6 +70,27 @@
@Schema(description = "浜у嚭浜у搧鐗╂枡鍚嶇О锛堥�楀彿鎷兼帴锛�", example = "浜у搧A, 浜у搧B")
private String outputItemNames;
+ @Schema(description = "浜у嚭鐗╂枡褰掑睘閰嶇疆锛坧roductId 涓虹┖琛ㄧず澶氫骇鍝侀�氱敤锛�")
+ private List<MesProRouteProcessOutputVO> outputs;
+
+ @Schema(description = "榛樿鎶ュ伐浠撳簱缂栧彿锛堝彇鑷伐鑹鸿矾绾夸骇鍝佺殑鎶ュ伐浠撳簱閰嶇疆锛�", example = "10")
+ private Long warehouseId;
+
+ @Schema(description = "榛樿鎶ュ伐浠撳簱鍚嶇О")
+ private String warehouseName;
+
+ @Schema(description = "榛樿鎶ュ伐搴撳尯缂栧彿", example = "110")
+ private Long locationId;
+
+ @Schema(description = "榛樿鎶ュ伐搴撳尯鍚嶇О")
+ private String locationName;
+
+ @Schema(description = "榛樿鎶ュ伐搴撲綅缂栧彿", example = "210")
+ private Long areaId;
+
+ @Schema(description = "榛樿鎶ュ伐搴撲綅鍚嶇О")
+ private String areaName;
+
@Schema(description = "澶囨敞")
private String remark;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessSaveReqVO.java
index 17f71e2..1a452d2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/vo/process/MesProRouteProcessSaveReqVO.java
@@ -49,7 +49,28 @@
@Schema(description = "浜у嚭浜у搧鐗╂枡缂栧彿鍒楄〃锛堝閫夛紝涓虹┖鏃堕粯璁ょ敤宸ュ崟鎴愬搧锛�", example = "[100, 101]")
private List<Long> outputItemIds;
+ @Schema(description = "浜у嚭鐗╂枡褰掑睘閰嶇疆锛堜紭鍏堜簬 outputItemIds锛沺roductId 涓虹┖琛ㄧず澶氫骇鍝侀�氱敤锛�")
+ private List<OutputItem> outputs;
+
@Schema(description = "澶囨敞")
private String remark;
+ @Schema(description = "浜у嚭鐗╂枡褰掑睘")
+ @Data
+ public static class OutputItem {
+
+ @Schema(description = "褰掑睘浜у搧缂栧彿锛屼负绌鸿〃绀哄浜у搧閫氱敤")
+ private Long productId;
+
+ @Schema(description = "浜у嚭鐗╂枡缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED)
+ private Long itemId;
+
+ @Schema(description = "鎺掑簭")
+ private Integer sort;
+
+ @Schema(description = "澶囨敞")
+ private String remark;
+
+ }
+
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
index ff141d7..260fc44 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/task/MesProTaskController.java
@@ -222,6 +222,13 @@
return success(new PageResult<>(respVOList, pageResult.getTotal()));
}
+ @GetMapping("/pending-count-by-workstation")
+ @Operation(summary = "鎸夊伐浣滅珯鑾峰緱寰呮姤宸ヤ换鍔℃暟", description = "宸ヤ綔鍙伴�夋嫨宸ヤ綔绔欏崱鐗囧睍绀猴紝鍙e緞鍚屽緟鎶ュ伐鍙拌处")
+ @PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
+ public CommonResult<Map<Long, Long>> getPendingFeedbackCountByWorkstation() {
+ return success(taskService.getPendingFeedbackCountByWorkstation());
+ }
+
@GetMapping("/gantt-list")
@Operation(summary = "鑾峰緱鐢樼壒鍥句换鍔″垪琛�", description = "鍚庣缁勮宸ュ崟=project + 浠诲姟=task 鍒楄〃")
@PreAuthorize("@ss.hasPermission('mes:pro-task:query')")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java
index 1cb8944..d75b067 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderProcessController.java
@@ -14,10 +14,16 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO;
import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderBomService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderProcessService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -47,6 +53,12 @@
private MesProProcessService processService;
@Resource
private MesMdItemService itemService;
+ @Resource
+ private MesWmWarehouseService warehouseService;
+ @Resource
+ private MesWmWarehouseLocationService warehouseLocationService;
+ @Resource
+ private MesWmWarehouseAreaService warehouseAreaService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓宸ュ崟宸ュ簭")
@@ -150,6 +162,19 @@
}
Map<Long, MesMdItemDO> itemMap = CollUtil.isNotEmpty(allOutputItemIds)
? itemService.getItemMap(allOutputItemIds) : Collections.emptyMap();
+ // 鑾峰彇鎶ュ伐浠撳簱/搴撳尯/搴撲綅
+ Set<Long> warehouseIds = convertSet(list, MesProWorkOrderProcessDO::getWarehouseId);
+ warehouseIds.removeAll(Collections.singleton(null));
+ Set<Long> locationIds = convertSet(list, MesProWorkOrderProcessDO::getLocationId);
+ locationIds.removeAll(Collections.singleton(null));
+ Set<Long> areaIds = convertSet(list, MesProWorkOrderProcessDO::getAreaId);
+ areaIds.removeAll(Collections.singleton(null));
+ Map<Long, MesWmWarehouseDO> warehouseMap = CollUtil.isNotEmpty(warehouseIds)
+ ? warehouseService.getWarehouseMap(warehouseIds) : Collections.emptyMap();
+ Map<Long, MesWmWarehouseLocationDO> locationMap = CollUtil.isNotEmpty(locationIds)
+ ? warehouseLocationService.getWarehouseLocationMap(locationIds) : Collections.emptyMap();
+ Map<Long, MesWmWarehouseAreaDO> areaMap = CollUtil.isNotEmpty(areaIds)
+ ? warehouseAreaService.getWarehouseAreaMap(areaIds) : Collections.emptyMap();
// 2. 鏌ヨ鎶曟枡BOM锛堟寜宸ュ簭鍒嗙粍锛�
Set<Long> workOrderIds = convertSet(list, MesProWorkOrderProcessDO::getWorkOrderId);
@@ -185,6 +210,13 @@
MapUtils.findAndThen(processMap, vo.getNextProcessId(), process -> {
vo.setNextProcessName(process.getName());
});
+ // 鎶ュ伐浠撳簱/搴撳尯/搴撲綅鍚嶇О
+ MapUtils.findAndThen(warehouseMap, vo.getWarehouseId(),
+ warehouse -> vo.setWarehouseName(warehouse.getName()));
+ MapUtils.findAndThen(locationMap, vo.getLocationId(),
+ location -> vo.setLocationName(location.getName()));
+ MapUtils.findAndThen(areaMap, vo.getAreaId(),
+ area -> vo.setAreaName(area.getName()));
// 浜у嚭鐗╂枡锛堟敮鎸佸閫夛級
List<Long> ids = voOutputItemIdsMap.getOrDefault((long) i, Collections.emptyList());
if (!ids.isEmpty()) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessRespVO.java
index 1fdaabc..ce182cb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessRespVO.java
@@ -83,6 +83,24 @@
@Schema(description = "浜у嚭浜у搧鐗╂枡鍚嶇О锛堥�楀彿鎷兼帴锛�", example = "浜у搧A, 浜у搧B")
private String outputItemNames;
+ @Schema(description = "鎶ュ伐浠撳簱缂栧彿", example = "10")
+ private Long warehouseId;
+
+ @Schema(description = "鎶ュ伐浠撳簱鍚嶇О", example = "鎴愬搧浠�")
+ private String warehouseName;
+
+ @Schema(description = "鎶ュ伐搴撳尯缂栧彿", example = "110")
+ private Long locationId;
+
+ @Schema(description = "鎶ュ伐搴撳尯鍚嶇О", example = "鎴愬搧浠撻�氱敤搴撳尯")
+ private String locationName;
+
+ @Schema(description = "鎶ュ伐搴撲綅缂栧彿", example = "210")
+ private Long areaId;
+
+ @Schema(description = "鎶ュ伐搴撲綅鍚嶇О", example = "鎴愬搧浠撻粯璁ゅ簱浣�")
+ private String areaName;
+
@Schema(description = "澶囨敞", example = "澶囨敞")
@ExcelProperty("澶囨敞")
private String remark;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessSaveReqVO.java
index 3a09e6b..e79cd14 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/vo/process/MesProWorkOrderProcessSaveReqVO.java
@@ -52,6 +52,15 @@
@Schema(description = "浜у嚭浜у搧鐗╂枡缂栧彿鍒楄〃锛堝閫夛紝涓虹┖鏃堕粯璁ょ敤宸ュ崟鎴愬搧锛�", example = "[100, 101]")
private List<Long> outputItemIds;
+ @Schema(description = "鎶ュ伐浠撳簱缂栧彿", example = "10")
+ private Long warehouseId;
+
+ @Schema(description = "鎶ュ伐搴撳尯缂栧彿", example = "110")
+ private Long locationId;
+
+ @Schema(description = "鎶ュ伐搴撲綅缂栧彿", example = "210")
+ private Long areaId;
+
@Schema(description = "澶囨敞")
private String remark;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/route/MesProRouteProcessOutputDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/route/MesProRouteProcessOutputDO.java
new file mode 100644
index 0000000..39947f6
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/route/MesProRouteProcessOutputDO.java
@@ -0,0 +1,72 @@
+package cn.iocoder.yudao.module.mes.dal.dataobject.pro.route;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
+import com.baomidou.mybatisplus.annotation.KeySequence;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.*;
+
+/**
+ * MES 宸ヨ壓璺嚎宸ュ簭浜у嚭褰掑睘 DO
+ *
+ * 鍚屼竴閬撳伐搴忕殑浜у嚭鍙互鎸変骇鍝佸尯鍒嗭細褰掑睘浜у搧涓虹┖琛ㄧず璇ヨ矾绾夸笅鎵�鏈変骇鍝侀�氱敤銆�
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@TableName("mes_pro_route_process_output")
+@KeySequence("mes_pro_route_process_output_seq")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class MesProRouteProcessOutputDO extends BaseDO {
+
+ /**
+ * 缂栧彿
+ */
+ @TableId
+ private Long id;
+ /**
+ * 宸ヨ壓璺嚎宸ュ簭缂栧彿
+ *
+ * 鍏宠仈 {@link MesProRouteProcessDO#getId()}
+ */
+ private Long routeProcessId;
+ /**
+ * 宸ヨ壓璺嚎缂栧彿
+ *
+ * 鍏宠仈 {@link MesProRouteDO#getId()}
+ */
+ private Long routeId;
+ /**
+ * 宸ュ簭缂栧彿
+ *
+ * 鍏宠仈 {@link MesProProcessDO#getId()}
+ */
+ private Long processId;
+ /**
+ * 褰掑睘浜у搧缂栧彿锛屼负绌鸿〃绀哄浜у搧閫氱敤
+ *
+ * 鍏宠仈 {@link MesMdItemDO#getId()}
+ */
+ private Long productId;
+ /**
+ * 浜у嚭鐗╂枡缂栧彿
+ *
+ * 鍏宠仈 {@link MesMdItemDO#getId()}
+ */
+ private Long itemId;
+ /**
+ * 鎺掑簭
+ */
+ private Integer sort;
+ /**
+ * 澶囨敞
+ */
+ private String remark;
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderProcessDO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderProcessDO.java
index 4ca8b28..e9a0bb9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderProcessDO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/pro/workorder/MesProWorkOrderProcessDO.java
@@ -90,6 +90,25 @@
*/
private String outputItemId;
/**
+ * 鎶ュ伐浠撳簱缂栧彿
+ *
+ * 涓嬪崟鏃朵粠宸ヨ壓璺嚎浜у搧甯﹀叆锛屽彲鎵嬪伐璋冩暣锛涙姤宸ヤ骇鍑烘寜姝や粨搴撳叆搴�
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseDO#getId()}
+ */
+ private Long warehouseId;
+ /**
+ * 鎶ュ伐搴撳尯缂栧彿
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseLocationDO#getId()}
+ */
+ private Long locationId;
+ /**
+ * 鎶ュ伐搴撲綅缂栧彿
+ *
+ * 鍏宠仈 {@link cn.iocoder.yudao.module.mes.dal.dataobject.wm.warehouse.MesWmWarehouseAreaDO#getId()}
+ */
+ private Long areaId;
+ /**
* 澶囨敞
*/
private String remark;
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
index 1567a73..f4bb335 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/md/item/MesMdItemMapper.java
@@ -41,10 +41,6 @@
return selectOne(MesMdItemDO::getCode, code);
}
- default MesMdItemDO selectByName(String name) {
- return selectOne(MesMdItemDO::getName, name);
- }
-
default Long selectCountByItemTypeId(Long itemTypeId) {
return selectCount(MesMdItemDO::getItemTypeId, itemTypeId);
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/route/MesProRouteProcessOutputMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/route/MesProRouteProcessOutputMapper.java
new file mode 100644
index 0000000..46b9af2
--- /dev/null
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/route/MesProRouteProcessOutputMapper.java
@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.mes.dal.mysql.pro.route;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessOutputDO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * MES 宸ヨ壓璺嚎宸ュ簭浜у嚭褰掑睘 Mapper
+ *
+ * @author 瓒呯骇绠$悊鍛�
+ */
+@Mapper
+public interface MesProRouteProcessOutputMapper extends BaseMapperX<MesProRouteProcessOutputDO> {
+
+ default List<MesProRouteProcessOutputDO> selectListByRouteProcessId(Long routeProcessId) {
+ return selectList(new LambdaQueryWrapperX<MesProRouteProcessOutputDO>()
+ .eq(MesProRouteProcessOutputDO::getRouteProcessId, routeProcessId)
+ .orderByAsc(MesProRouteProcessOutputDO::getSort));
+ }
+
+ default List<MesProRouteProcessOutputDO> selectListByRouteProcessIds(Collection<Long> routeProcessIds) {
+ return selectList(new LambdaQueryWrapperX<MesProRouteProcessOutputDO>()
+ .in(MesProRouteProcessOutputDO::getRouteProcessId, routeProcessIds)
+ .orderByAsc(MesProRouteProcessOutputDO::getSort));
+ }
+
+ default List<MesProRouteProcessOutputDO> selectListByRouteId(Long routeId) {
+ return selectList(new LambdaQueryWrapperX<MesProRouteProcessOutputDO>()
+ .eq(MesProRouteProcessOutputDO::getRouteId, routeId)
+ .orderByAsc(MesProRouteProcessOutputDO::getSort));
+ }
+
+ default void deleteByRouteProcessId(Long routeProcessId) {
+ delete(new LambdaQueryWrapperX<MesProRouteProcessOutputDO>()
+ .eq(MesProRouteProcessOutputDO::getRouteProcessId, routeProcessId));
+ }
+
+ default void deleteByRouteId(Long routeId) {
+ delete(new LambdaQueryWrapperX<MesProRouteProcessOutputDO>()
+ .eq(MesProRouteProcessOutputDO::getRouteId, routeId));
+ }
+
+}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
index 586c92b..1cf3bf0 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/task/MesProTaskMapper.java
@@ -67,6 +67,22 @@
return selectPage(reqVO, query);
}
+ /**
+ * 鎸夊伐浣滅珯缁熻寰呮姤宸ヤ换鍔℃暟锛屽彛寰勪笌 {@link #selectPendingFeedbackPage} 涓�鑷�
+ *
+ * @return 姣忚鍖呭惈 workstation_id銆乸ending_count
+ */
+ default List<Map<String, Object>> selectPendingFeedbackCountByWorkstation() {
+ return selectMaps(new QueryWrapper<MesProTaskDO>()
+ .select("workstation_id", "COUNT(*) AS pending_count")
+ .in("status", MesProTaskStatusEnum.PREPARE.getStatus(),
+ MesProTaskStatusEnum.PRODUCING.getStatus(), MesProTaskStatusEnum.PARTIAL_FINISHED.getStatus(),
+ MesProTaskStatusEnum.PAUSED.getStatus())
+ .apply("(quantity - IFNULL(produced_quantity, 0)) > 0")
+ .isNotNull("workstation_id")
+ .groupBy("workstation_id"));
+ }
+
default List<MesProTaskDO> selectListByWorkOrderId(Long workOrderId) {
return selectList(new LambdaQueryWrapperX<MesProTaskDO>()
.eqIfPresent(MesProTaskDO::getWorkOrderId, workOrderId)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderProcessMapper.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderProcessMapper.java
index c3626a2..247ca56 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderProcessMapper.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/mysql/pro/workorder/MesProWorkOrderProcessMapper.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessPageReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
@@ -29,6 +30,14 @@
.orderByAsc(MesProWorkOrderProcessDO::getSort));
}
+ default MesProWorkOrderProcessDO selectByWorkOrderIdAndProcessId(Long workOrderId, Long processId) {
+ return selectOne(new LambdaQueryWrapperX<MesProWorkOrderProcessDO>()
+ .eq(MesProWorkOrderProcessDO::getWorkOrderId, workOrderId)
+ .eq(MesProWorkOrderProcessDO::getProcessId, processId)
+ .orderByAsc(MesProWorkOrderProcessDO::getSort)
+ .last("LIMIT 1"));
+ }
+
default MesProWorkOrderProcessDO selectLastByWorkOrderId(Long workOrderId) {
return selectOne(new LambdaQueryWrapperX<MesProWorkOrderProcessDO>()
.eq(MesProWorkOrderProcessDO::getWorkOrderId, workOrderId)
@@ -36,6 +45,17 @@
.last("LIMIT 1"));
}
+ /**
+ * 鏇存柊鎶ュ伐浠撳簱锛氬厑璁哥疆绌猴紙updateById 浼氬拷鐣� null 瀛楁锛屾晠鍗曠嫭澶勭悊锛�
+ */
+ default void updateWarehouseById(Long id, Long warehouseId, Long locationId, Long areaId) {
+ update(null, new LambdaUpdateWrapper<MesProWorkOrderProcessDO>()
+ .set(MesProWorkOrderProcessDO::getWarehouseId, warehouseId)
+ .set(MesProWorkOrderProcessDO::getLocationId, locationId)
+ .set(MesProWorkOrderProcessDO::getAreaId, areaId)
+ .eq(MesProWorkOrderProcessDO::getId, id));
+ }
+
default void deleteByWorkOrderId(Long workOrderId) {
delete(new LambdaQueryWrapperX<MesProWorkOrderProcessDO>()
.eq(MesProWorkOrderProcessDO::getWorkOrderId, workOrderId));
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
index e9d01f3..26d839f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/ErrorCodeConstants.java
@@ -294,6 +294,7 @@
ErrorCode PRO_ROUTE_PROCESS_OUTPUT_NOT_BOUND = new ErrorCode(1_040_501_205, "宸ュ簭浜у嚭浜у搧銆恵}銆戞湭缁戝畾鍒板綋鍓嶅伐鑹鸿矾绾�");
ErrorCode PRO_ROUTE_MIDDLE_OUTPUT_INVALID = new ErrorCode(1_040_501_206, "涓棿宸ュ簭銆恵}銆戝彧鑳戒骇鍑哄崐鎴愬搧鍒嗙被浜у搧");
ErrorCode PRO_ROUTE_LAST_OUTPUT_INVALID = new ErrorCode(1_040_501_207, "鏈亾宸ュ簭銆恵}銆戝彧鑳戒骇鍑烘垚鍝佸垎绫讳骇鍝侊紝涓斿繀椤诲寘鍚叏閮ㄧ粦瀹氭垚鍝�");
+ ErrorCode PRO_ROUTE_LAST_OUTPUT_ATTRIBUTION_REQUIRED = new ErrorCode(1_040_501_208, "鏈亾宸ュ簭銆恵}銆戠殑鎴愬搧浜у嚭蹇呴』鎸変骇鍝佸綊灞為厤缃紝姣忎釜鎴愬搧褰掑睘鍒拌嚜韬紝涓嶈兘浣跨敤鈥滈�氱敤鈥�");
// ========== MES 鐢熶骇绠$悊-宸ヨ壓璺嚎浜у搧BOM锛�1-040-501-300锛� ==========
ErrorCode PRO_ROUTE_PRODUCT_BOM_NOT_EXISTS = new ErrorCode(1_040_501_300, "宸ヨ壓璺嚎浜у搧 BOM 涓嶅瓨鍦�");
ErrorCode PRO_ROUTE_PRODUCT_BOM_DUPLICATE = new ErrorCode(1_040_501_301, "褰撳墠 BOM 鐗╂枡鍦ㄦ宸ュ簭宸茬粡閰嶇疆杩�");
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java
index 319ea0f..b43e40f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/item/MesMdItemServiceImpl.java
@@ -135,8 +135,10 @@
private void validateItemSaveData(MesMdItemSaveReqVO reqVO) {
// 鏍¢獙鐗╂枡缂栫爜鐨勫敮涓�鎬�
validateItemCodeUnique(reqVO.getId(), reqVO.getCode());
- // 鏍¢獙鐗╂枡鍚嶇О鐨勫敮涓�鎬�
- validateItemNameUnique(reqVO.getId(), reqVO.getName());
+ // 鏍¢獙鐗╂枡鍚嶇О鐨勫敮涓�鎬э細MDM 涓绘暟鎹互缂栫爜涓哄敮涓�鏍囪瘑锛屽厑璁稿悓鍚嶄笉鍚岃鏍�
+ if (reqVO.getMdmItemId() == null) {
+ validateItemNameUnique(reqVO.getId(), reqVO.getName());
+ }
// 鏍¢獙鐗╂枡鍒嗙被瀛樺湪
validateItemTypeExists(reqVO.getItemTypeId());
// 鏍¢獙璁¢噺鍗曚綅瀛樺湪
@@ -212,11 +214,9 @@
}
private void validateItemNameUnique(Long id, String name) {
- MesMdItemDO item = itemMapper.selectByName(name);
- if (item == null) {
- return;
- }
- if (ObjUtil.notEqual(item.getId(), id)) {
+ // 浣跨敤鍒楄〃鏌ヨ锛氬瓨閲忔暟鎹彲鑳藉瓨鍦ㄥ悓鍚嶇墿鏂欙紝閬垮厤 selectOne 鐩存帴鎶涘紓甯�
+ List<MesMdItemDO> items = itemMapper.selectList(MesMdItemDO::getName, name);
+ if (items.stream().anyMatch(item -> ObjUtil.notEqual(item.getId(), id))) {
throw exception(MD_ITEM_NAME_DUPLICATE);
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
index 468a8c2..04f2b29 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java
@@ -114,8 +114,9 @@
// 1. 鏍¢獙
MesProTaskDO task = validateFeedbackData(createReqVO);
- // 2. 鎻掑叆锛堣嚜鍔ㄥ~鍏� itemId锛�
+ // 2. 鎻掑叆锛堜富閿敱鏁版嵁搴撹嚜澧烇紝蹇界暐璇锋眰涓彲鑳芥畫鐣欑殑 id锛涜嚜鍔ㄥ~鍏� itemId锛�
MesProFeedbackDO feedback = BeanUtils.toBean(createReqVO, MesProFeedbackDO.class)
+ .setId(null)
.setStatus(MesProFeedbackStatusEnum.PREPARE.getStatus())
.setItemId(task.getItemId());
feedbackMapper.insert(feedback);
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
index 60962e5..848f5d2 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java
@@ -617,8 +617,9 @@
}
Long routeId = routeProduct.getRouteId();
- // 2. 鏍¢獙宸ヨ壓璺嚎鏄惁鏈夊伐搴�
- List<MesProRouteProcessDO> routeProcesses = routeProcessService.getRouteProcessListByRouteId(routeId);
+ // 2. 鏍¢獙宸ヨ壓璺嚎鏄惁鏈夊伐搴忥紙鎸変骇鍝佽繃婊ゅ叾瀹冧骇鍝佺殑浜у嚭鐗╂枡锛�
+ List<MesProRouteProcessDO> routeProcesses = routeProcessService
+ .getRouteProcessListByProductId(mps.getProductId());
if (CollUtil.isEmpty(routeProcesses)) {
throw exception(PRO_ROUTE_ENABLE_NO_PROCESS);
}
@@ -658,6 +659,10 @@
.map(Long::valueOf).collect(Collectors.toList()));
}
process.setColorCode(rp.getColorCode());
+ // 甯﹀叆宸ヨ壓璺嚎浜у搧閰嶇疆鐨勬姤宸ヤ粨搴�
+ process.setWarehouseId(routeProduct.getWarehouseId());
+ process.setLocationId(routeProduct.getLocationId());
+ process.setAreaId(routeProduct.getAreaId());
// 甯﹀叆宸ュ簭鎶曟枡BOM
List<MesProRouteProductBomDO> routeBomItems = bomMap != null ? bomMap.get(rp.getProcessId()) : null;
if (CollUtil.isNotEmpty(routeBomItems)) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessService.java
index 403218c..591ae6d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessService.java
@@ -67,6 +67,27 @@
List<MesProRouteProcessDO> getRouteProcessListByProductId(Long productId);
/**
+ * 鑾峰緱宸ュ簭鍦ㄦ寚瀹氫骇鍝佷笅鐨勪骇鍑虹墿鏂欑紪鍙�
+ *
+ * 鎸変骇鍑哄綊灞炶繃婊わ細褰掑睘涓虹┖锛堝浜у搧閫氱敤锛夋垨褰掑睘绛変簬鎸囧畾浜у搧鐨勪骇鍑恒��
+ * 鏃犲綊灞炴暟鎹椂杩斿洖 {@code null}锛岃皟鐢ㄦ柟闇�鑷鍥為��锛涙湁褰掑睘鏁版嵁浣嗚浜у搧鏃犱骇鍑烘椂杩斿洖绌哄垪琛ㄣ��
+ *
+ * @param routeProcessId 宸ヨ壓璺嚎宸ュ簭缂栧彿
+ * @param productId 浜у搧缂栧彿
+ * @return 浜у嚭鐗╂枡缂栧彿鍒楄〃锛堟寜鎺掑簭锛夛紝鏃犲綊灞炴暟鎹椂涓� null
+ */
+ List<Long> getOutputItemIdsByRouteProcessId(Long routeProcessId, Long productId);
+
+ /**
+ * 鎸夊伐鑹鸿矾绾垮伐搴忕紪鍙锋壒閲忚幏寰椾骇鍑哄綊灞為厤缃�
+ *
+ * @param routeProcessIds 宸ヨ壓璺嚎宸ュ簭缂栧彿鏁扮粍
+ * @return 浜у嚭褰掑睘鍒楄〃
+ */
+ List<cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessOutputDO>
+ getRouteProcessOutputListByRouteProcessIds(Collection<Long> routeProcessIds);
+
+ /**
* 鎸変骇鍝佽幏寰楀伐搴忔姇鏂橞OM Map
*
* key = 宸ュ簭ID锛寁alue = 璇ュ伐搴忎笅鐨勬姇鏂橞OM鏄庣粏鍒楄〃
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java
index 9671e6e..34cb455 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteProcessServiceImpl.java
@@ -1,12 +1,15 @@
package cn.iocoder.yudao.module.mes.service.pro.route;
import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.NumberUtil;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.process.MesProRouteProcessSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessOutputDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.route.MesProRouteProcessMapper;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.route.MesProRouteProcessOutputMapper;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
@@ -14,11 +17,16 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
import java.util.stream.Collectors;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -35,6 +43,8 @@
@Resource
private MesProRouteProcessMapper routeProcessMapper;
+ @Resource
+ private MesProRouteProcessOutputMapper routeProcessOutputMapper;
@Resource
@Lazy
@@ -63,13 +73,10 @@
// 2. 鎻掑叆
MesProRouteProcessDO routeProcess = BeanUtils.toBean(createReqVO, MesProRouteProcessDO.class);
- if (CollUtil.isNotEmpty(createReqVO.getOutputItemIds())) {
- routeProcess.setOutputItemId(
- createReqVO.getOutputItemIds().stream()
- .map(String::valueOf)
- .collect(Collectors.joining(",")));
- }
+ routeProcess.setOutputItemId(resolveOutputItemId(createReqVO));
routeProcessMapper.insert(routeProcess);
+ // 2.1 淇濆瓨浜у嚭褰掑睘閰嶇疆
+ saveRouteProcessOutputs(routeProcess, createReqVO);
// 3. 鏇存柊宸ュ簭閾�
rebuildProcessChain(createReqVO.getRouteId());
@@ -93,11 +100,10 @@
// 2. 鏇存柊
MesProRouteProcessDO updateObj = BeanUtils.toBean(updateReqVO, MesProRouteProcessDO.class);
// 绌烘暟缁勪篃瑕佹樉寮忓啓鍏ョ┖涓诧紝鍚﹀垯 MyBatis-Plus 榛樿蹇界暐 null锛岀敤鎴锋竻绌轰骇鍑哄搧鍚庢棫閰嶇疆浠嶄細娈嬬暀銆�
- updateObj.setOutputItemId(CollUtil.isEmpty(updateReqVO.getOutputItemIds()) ? "" :
- updateReqVO.getOutputItemIds().stream()
- .map(String::valueOf)
- .collect(Collectors.joining(",")));
+ updateObj.setOutputItemId(resolveOutputItemId(updateReqVO));
routeProcessMapper.updateById(updateObj);
+ // 2.1 瑕嗙洊浜у嚭褰掑睘閰嶇疆
+ saveRouteProcessOutputs(updateObj, updateReqVO);
// 3. 閲嶅缓宸ュ簭閾�
rebuildProcessChain(updateReqVO.getRouteId());
@@ -111,8 +117,9 @@
// 1.2 宸插惎鐢ㄧ殑宸ヨ壓璺嚎锛屼笉鍏佽鎿嶄綔
routeService.validateRouteNotEnable(routeProcess.getRouteId());
- // 2. 鍒犻櫎
+ // 2. 鍒犻櫎锛堝惈浜у嚭褰掑睘閰嶇疆锛�
routeProcessMapper.deleteById(id);
+ routeProcessOutputMapper.deleteByRouteProcessId(id);
// 3. 閲嶅缓宸ュ簭閾�
rebuildProcessChain(routeProcess.getRouteId());
@@ -211,7 +218,165 @@
return Collections.emptyList();
}
// 2. 杩斿洖璇ュ伐鑹鸿矾绾跨殑宸ュ簭鍒楄〃
- return routeProcessMapper.selectListByRouteId(routeProduct.getRouteId());
+ List<MesProRouteProcessDO> list = routeProcessMapper.selectListByRouteId(routeProduct.getRouteId());
+ // 3. 鎸変骇鍑哄綊灞炶繃婊わ細閫氱敤浜у嚭 + 褰撳墠浜у搧涓撳睘浜у嚭
+ Map<Long, List<MesProRouteProcessOutputDO>> outputMap = routeProcessOutputMapper
+ .selectListByRouteId(routeProduct.getRouteId()).stream()
+ .collect(Collectors.groupingBy(MesProRouteProcessOutputDO::getRouteProcessId));
+ for (MesProRouteProcessDO process : list) {
+ List<MesProRouteProcessOutputDO> outputs = outputMap.get(process.getId());
+ if (CollUtil.isEmpty(outputs)) {
+ // 瀛橀噺鏁版嵁鏈媶鍒嗗綊灞炴椂锛岄��鍥炴棫鐨勨�滃墧闄ゅ悓璺嚎鍏跺畠浜у搧鈥濋�昏緫
+ filterOtherProductOutputs(Collections.singletonList(process), routeProduct);
+ continue;
+ }
+ String filtered = outputs.stream()
+ .filter(output -> output.getProductId() == null || output.getProductId().equals(productId))
+ .map(MesProRouteProcessOutputDO::getItemId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .map(String::valueOf)
+ .collect(Collectors.joining(","));
+ process.setOutputItemId(filtered.isEmpty() ? null : filtered);
+ }
+ return list;
+ }
+
+ @Override
+ public List<Long> getOutputItemIdsByRouteProcessId(Long routeProcessId, Long productId) {
+ List<MesProRouteProcessOutputDO> outputs = routeProcessOutputMapper.selectListByRouteProcessId(routeProcessId);
+ if (CollUtil.isEmpty(outputs)) {
+ // 鏈厤缃骇鍑哄綊灞烇紙瀛橀噺鏁版嵁锛夎繑鍥� null锛屼究浜庤皟鐢ㄦ柟鍥為��鑱氬悎浜у嚭
+ return null;
+ }
+ return outputs.stream()
+ .filter(output -> output.getProductId() == null || output.getProductId().equals(productId))
+ .map(MesProRouteProcessOutputDO::getItemId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ }
+
+ @Override
+ public List<MesProRouteProcessOutputDO> getRouteProcessOutputListByRouteProcessIds(Collection<Long> routeProcessIds) {
+ if (CollUtil.isEmpty(routeProcessIds)) {
+ return Collections.emptyList();
+ }
+ return routeProcessOutputMapper.selectListByRouteProcessIds(routeProcessIds);
+ }
+
+ /**
+ * 璁$畻宸ュ簭浜у嚭鐗╂枡鐨勮仛鍚堜覆锛堥�楀彿鍒嗛殧锛屽幓閲嶏級
+ *
+ * 浼樺厛浣跨敤浜у嚭褰掑睘閰嶇疆锛坥utputs锛夛紝鏈紶鏃跺吋瀹� outputItemIds銆�
+ */
+ private String resolveOutputItemId(MesProRouteProcessSaveReqVO reqVO) {
+ List<Long> itemIds;
+ if (CollUtil.isNotEmpty(reqVO.getOutputs())) {
+ itemIds = reqVO.getOutputs().stream()
+ .filter(Objects::nonNull)
+ .sorted(Comparator.comparing(MesProRouteProcessSaveReqVO.OutputItem::getSort,
+ Comparator.nullsLast(Comparator.naturalOrder())))
+ .map(MesProRouteProcessSaveReqVO.OutputItem::getItemId)
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ } else if (CollUtil.isNotEmpty(reqVO.getOutputItemIds())) {
+ itemIds = reqVO.getOutputItemIds().stream()
+ .filter(Objects::nonNull)
+ .distinct()
+ .collect(Collectors.toList());
+ } else {
+ itemIds = Collections.emptyList();
+ }
+ return itemIds.stream().map(String::valueOf).collect(Collectors.joining(","));
+ }
+
+ /**
+ * 瑕嗙洊淇濆瓨宸ュ簭浜у嚭褰掑睘閰嶇疆
+ */
+ private void saveRouteProcessOutputs(MesProRouteProcessDO routeProcess,
+ MesProRouteProcessSaveReqVO reqVO) {
+ routeProcessOutputMapper.deleteByRouteProcessId(routeProcess.getId());
+ if (CollUtil.isEmpty(reqVO.getOutputs()) && CollUtil.isEmpty(reqVO.getOutputItemIds())) {
+ return;
+ }
+ Set<Long> routeProductIds = routeProductService.getRouteProductListByRouteId(routeProcess.getRouteId())
+ .stream().map(MesProRouteProductDO::getItemId).filter(Objects::nonNull).collect(Collectors.toSet());
+ List<MesProRouteProcessOutputDO> outputs = new ArrayList<>();
+ Set<String> keys = new HashSet<>();
+ int index = 0;
+ if (CollUtil.isNotEmpty(reqVO.getOutputs())) {
+ for (MesProRouteProcessSaveReqVO.OutputItem output : reqVO.getOutputs()) {
+ if (output == null || output.getItemId() == null) {
+ continue;
+ }
+ index++;
+ if (!keys.add(output.getProductId() + "_" + output.getItemId())) {
+ continue;
+ }
+ outputs.add(buildOutput(routeProcess, output.getProductId(), output.getItemId(),
+ output.getSort() != null ? output.getSort() : index, output.getRemark()));
+ }
+ } else {
+ // 鍏煎鍙紶 outputItemIds 鐨勮皟鐢ㄦ柟锛氫骇鍑烘槸璺嚎浜у搧鏃跺綊灞炲埌鑷韩锛屽惁鍒欒涓洪�氱敤
+ for (Long itemId : reqVO.getOutputItemIds()) {
+ if (itemId == null) {
+ continue;
+ }
+ index++;
+ Long productId = routeProductIds.contains(itemId) ? itemId : null;
+ if (!keys.add(productId + "_" + itemId)) {
+ continue;
+ }
+ outputs.add(buildOutput(routeProcess, productId, itemId, index, null));
+ }
+ }
+ if (CollUtil.isNotEmpty(outputs)) {
+ routeProcessOutputMapper.insertBatch(outputs);
+ }
+ }
+
+ private MesProRouteProcessOutputDO buildOutput(MesProRouteProcessDO routeProcess, Long productId,
+ Long itemId, Integer sort, String remark) {
+ return MesProRouteProcessOutputDO.builder()
+ .routeProcessId(routeProcess.getId())
+ .routeId(routeProcess.getRouteId())
+ .processId(routeProcess.getProcessId())
+ .productId(productId)
+ .itemId(itemId)
+ .sort(sort)
+ .remark(remark)
+ .build();
+ }
+
+ /**
+ * 杩囨护浜у嚭鐗╂枡锛氬墧闄ゅ悓涓�宸ヨ壓璺嚎涓嬪叾瀹冧骇鍝佺殑浜у嚭锛屽彧淇濈暀褰撳墠浜у搧鐨勪骇鍑哄拰鍗婃垚鍝佷骇鍑�
+ */
+ private void filterOtherProductOutputs(List<MesProRouteProcessDO> list, MesProRouteProductDO routeProduct) {
+ if (CollUtil.isEmpty(list) || routeProduct.getItemId() == null) {
+ return;
+ }
+ Set<Long> otherProductIds = routeProductService.getRouteProductListByRouteId(routeProduct.getRouteId())
+ .stream()
+ .map(MesProRouteProductDO::getItemId)
+ .filter(itemId -> itemId != null && !itemId.equals(routeProduct.getItemId()))
+ .collect(Collectors.toSet());
+ if (otherProductIds.isEmpty()) {
+ return;
+ }
+ for (MesProRouteProcessDO process : list) {
+ String outputItemId = process.getOutputItemId();
+ if (outputItemId == null || outputItemId.isBlank()) {
+ continue;
+ }
+ String filtered = Arrays.stream(outputItemId.split(","))
+ .map(String::trim)
+ .filter(s -> !s.isEmpty())
+ .filter(s -> !otherProductIds.contains(NumberUtil.parseLong(s, -1L)))
+ .collect(Collectors.joining(","));
+ process.setOutputItemId(filtered.isEmpty() ? null : filtered);
+ }
}
@Override
@@ -236,6 +401,7 @@
@Override
public void deleteRouteProcessByRouteId(Long routeId) {
routeProcessMapper.deleteByRouteId(routeId);
+ routeProcessOutputMapper.deleteByRouteId(routeId);
}
}
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteServiceImpl.java
index 8b6392d..ca68206 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/route/MesProRouteServiceImpl.java
@@ -13,6 +13,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.MesProRouteSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessOutputDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
@@ -35,6 +36,7 @@
import java.util.Set;
import java.util.Comparator;
import java.util.Arrays;
+import java.util.Objects;
import java.util.stream.Collectors;
import java.util.concurrent.atomic.AtomicInteger;
@@ -209,6 +211,20 @@
throw exception(PRO_ROUTE_MIDDLE_OUTPUT_INVALID, process.getProcessId());
}
}
+ // 4. 鏈亾宸ュ簭鎴愬搧浜у嚭蹇呴』鎸変骇鍝佸綊灞烇紝閬垮厤鈥滈�氱敤鈥濅骇鍑轰覆鍒板叾瀹冧骇鍝佺殑宸ュ崟
+ List<MesProRouteProcessOutputDO> lastOutputs = routeProcessService
+ .getRouteProcessOutputListByRouteProcessIds(Collections.singletonList(lastProcess.getId()));
+ if (CollUtil.isNotEmpty(lastOutputs)) {
+ boolean attributionInvalid = lastOutputs.stream().anyMatch(output ->
+ output.getProductId() == null || !output.getProductId().equals(output.getItemId()));
+ Set<Long> attributedProducts = lastOutputs.stream()
+ .map(MesProRouteProcessOutputDO::getProductId)
+ .filter(Objects::nonNull)
+ .collect(Collectors.toSet());
+ if (attributionInvalid || !attributedProducts.containsAll(finishedItemIds)) {
+ throw exception(PRO_ROUTE_LAST_OUTPUT_ATTRIBUTION_REQUIRED, lastProcess.getProcessId());
+ }
+ }
}
private Set<Long> parseOutputItemIds(String value) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskService.java
index de731f9..2ae3b02 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskService.java
@@ -75,6 +75,13 @@
PageResult<MesProTaskDO> getPendingFeedbackPage(MesProTaskPageReqVO pageReqVO);
/**
+ * 鎸夊伐浣滅珯缁熻寰呮姤宸ヤ换鍔℃暟
+ *
+ * @return 宸ヤ綔绔欑紪鍙� -> 寰呮姤宸ヤ换鍔℃暟
+ */
+ Map<Long, Long> getPendingFeedbackCountByWorkstation();
+
+ /**
* 鏍规嵁宸ュ崟缂栧彿鍒楄〃锛屾壒閲忚幏寰楃敓浜т换鍔″垪琛�
*
* @param workOrderIds 宸ュ崟缂栧彿鍒楄〃
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
index 1b7464f..018b633 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java
@@ -45,7 +45,9 @@
import java.time.LocalDateTime;
import java.util.Collection;
import java.util.Collections;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -127,11 +129,7 @@
if (itemId == null) {
MesProRouteProcessDO routeProcess = routeProcessService
.getRouteProcessByRouteIdAndProcessId(createReqVO.getRouteId(), createReqVO.getProcessId());
- if (routeProcess != null && routeProcess.getOutputItemId() != null) {
- itemId = Long.valueOf(routeProcess.getOutputItemId().split(",")[0].trim());
- } else {
- itemId = workOrder.getProductId();
- }
+ itemId = resolveTaskItemId(routeProcess, workOrder.getProductId());
}
MesMdItemDO item = itemService.validateItemExists(itemId);
@@ -256,6 +254,30 @@
return routeProcesses;
}
+ /**
+ * 浠诲姟浜у嚭鐗╂枡锛氫紭鍏堝彇宸ュ簭鍦ㄥ綋鍓嶄骇鍝佷笅鐨勪骇鍑猴紙鎸夊綊灞炶繃婊わ級锛屾病鏈変骇鍑烘椂鍙栧伐鍗曟垚鍝�
+ */
+ private Long resolveTaskItemId(MesProRouteProcessDO routeProcess, Long productId) {
+ if (routeProcess == null) {
+ return productId;
+ }
+ if (routeProcess.getId() != null) {
+ // 宸ヨ壓璺嚎妯℃澘锛氭寜浜у嚭褰掑睘杩囨护鍑哄綋鍓嶄骇鍝佺殑浜у嚭
+ List<Long> outputIds = routeProcessService
+ .getOutputItemIdsByRouteProcessId(routeProcess.getId(), productId);
+ if (outputIds != null) {
+ // 鏈夊綊灞為厤缃細璇ヤ骇鍝佹棤浜у嚭鏃跺彇宸ュ崟鎴愬搧锛沶ull 琛ㄧず瀛橀噺鏃犲綊灞炴暟鎹紝缁х画璧拌仛鍚堝厹搴�
+ return CollUtil.isNotEmpty(outputIds) ? outputIds.get(0) : productId;
+ }
+ }
+ // 宸ュ崟宸ュ簭蹇収 / 瀛橀噺鏃犲綊灞炴暟鎹細浜у嚭宸叉寜浜у搧杩囨护锛屽彇绗竴涓�
+ String outputItemId = routeProcess.getOutputItemId();
+ if (outputItemId != null && !outputItemId.isBlank()) {
+ return Long.valueOf(outputItemId.split(",")[0].trim());
+ }
+ return productId;
+ }
+
@Override
public void deleteTask(Long id) {
// 1. 鏍¢獙瀛樺湪涓旈潪缁堟��
@@ -286,6 +308,20 @@
@Override
public PageResult<MesProTaskDO> getPendingFeedbackPage(MesProTaskPageReqVO pageReqVO) {
return taskMapper.selectPendingFeedbackPage(pageReqVO);
+ }
+
+ @Override
+ public Map<Long, Long> getPendingFeedbackCountByWorkstation() {
+ List<Map<String, Object>> rows = taskMapper.selectPendingFeedbackCountByWorkstation();
+ Map<Long, Long> result = new HashMap<>(rows.size());
+ for (Map<String, Object> row : rows) {
+ Object workstationId = row.get("workstation_id");
+ Object count = row.get("pending_count");
+ if (workstationId instanceof Number && count instanceof Number) {
+ result.put(((Number) workstationId).longValue(), ((Number) count).longValue());
+ }
+ }
+ return result;
}
@Override
@@ -443,7 +479,7 @@
List<Long> taskIds = new java.util.ArrayList<>();
for (MesProRouteProcessDO rp : routeProcesses) {
cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO proc = procMap.get(rp.getProcessId());
- Long itemId = rp.getOutputItemId() != null ? Long.valueOf(rp.getOutputItemId().split(",")[0].trim()) : workOrder.getProductId();
+ Long itemId = resolveTaskItemId(rp, workOrder.getProductId());
cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO item = itemService.validateItemExists(itemId);
MesProTaskDO task = new MesProTaskDO()
.setWorkOrderId(workOrder.getId())
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessService.java
index d1d3ef0..1cfd1e9 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessService.java
@@ -62,6 +62,15 @@
List<MesProWorkOrderProcessDO> getWorkOrderProcessListByWorkOrderId(Long workOrderId);
/**
+ * 鏍规嵁宸ュ崟缂栧彿 + 宸ュ簭缂栧彿鑾峰緱宸ュ崟宸ュ簭
+ *
+ * @param workOrderId 宸ュ崟缂栧彿
+ * @param processId 宸ュ簭缂栧彿
+ * @return 宸ュ崟宸ュ簭
+ */
+ MesProWorkOrderProcessDO getWorkOrderProcessByWorkOrderIdAndProcessId(Long workOrderId, Long processId);
+
+ /**
* 鏍规嵁宸ュ崟缂栧彿鑾峰緱鏈�鍚庝竴閬撳伐搴�
*
* @param workOrderId 宸ュ崟缂栧彿
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java
index 073b4e6..a30d110 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/workorder/MesProWorkOrderProcessServiceImpl.java
@@ -7,12 +7,15 @@
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.workorder.vo.process.MesProWorkOrderProcessSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProcessDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderBomDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderProcessDO;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderBomMapper;
import cn.iocoder.yudao.module.mes.dal.mysql.pro.workorder.MesProWorkOrderProcessMapper;
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProcessService;
+import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteProductService;
+import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseAreaService;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
@@ -48,6 +51,10 @@
private MesProProcessService processService;
@Resource
private MesProRouteProcessService routeProcessService;
+ @Resource
+ private MesProRouteProductService routeProductService;
+ @Resource
+ private MesWmWarehouseAreaService warehouseAreaService;
@Resource
@Lazy
private MesProWorkOrderBomService workOrderBomService;
@@ -89,6 +96,9 @@
.collect(Collectors.joining(",")));
}
workOrderProcessMapper.updateById(updateObj);
+ // 鎶ュ伐浠撳簱鍏佽缃┖锛屽崟鐙洿鏂�
+ workOrderProcessMapper.updateWarehouseById(updateReqVO.getId(), updateReqVO.getWarehouseId(),
+ updateReqVO.getLocationId(), updateReqVO.getAreaId());
// 3. 閲嶅缓宸ュ簭閾�
rebuildProcessChain(updateReqVO.getWorkOrderId());
@@ -122,6 +132,11 @@
}
@Override
+ public MesProWorkOrderProcessDO getWorkOrderProcessByWorkOrderIdAndProcessId(Long workOrderId, Long processId) {
+ return workOrderProcessMapper.selectByWorkOrderIdAndProcessId(workOrderId, processId);
+ }
+
+ @Override
public MesProWorkOrderProcessDO getLastWorkOrderProcessByWorkOrderId(Long workOrderId) {
return workOrderProcessMapper.selectLastByWorkOrderId(workOrderId);
}
@@ -146,6 +161,8 @@
if (CollUtil.isEmpty(routeProcessList)) {
return Collections.emptyList();
}
+ // 宸ヨ壓璺嚎浜у搧涓婇厤缃殑鎶ュ伐浠撳簱浣滀负宸ュ簭榛樿鍊硷紝涓嬪崟鏃跺彲鍐嶄慨鏀�
+ MesProRouteProductDO routeProduct = routeProductService.getRouteProductByItemId(productId);
// 杞崲涓哄伐鍗曞伐搴� DO锛堜笉璁剧疆 workOrderId锛屽墠绔繚瀛樻椂鍐嶈缃級
List<MesProWorkOrderProcessDO> processList = new ArrayList<>(routeProcessList.size());
for (MesProRouteProcessDO routeProcess : routeProcessList) {
@@ -161,6 +178,9 @@
.checkFlag(routeProcess.getCheckFlag())
.backflushFlag(routeProcess.getBackflushFlag())
.outputItemId(routeProcess.getOutputItemId())
+ .warehouseId(routeProduct != null ? routeProduct.getWarehouseId() : null)
+ .locationId(routeProduct != null ? routeProduct.getLocationId() : null)
+ .areaId(routeProduct != null ? routeProduct.getAreaId() : null)
.remark(routeProcess.getRemark())
.build());
}
@@ -212,6 +232,9 @@
updateObj.setOutputItemId(item.getOutputItemIds().stream().map(String::valueOf).collect(Collectors.joining(",")));
}
workOrderProcessMapper.updateById(updateObj);
+ // 鎶ュ伐浠撳簱鍏佽缃┖锛屽崟鐙洿鏂�
+ workOrderProcessMapper.updateWarehouseById(item.getId(), item.getWarehouseId(),
+ item.getLocationId(), item.getAreaId());
}
}
@@ -277,7 +300,12 @@
throw exception(PRO_WORK_ORDER_PROCESS_DUPLICATE);
}
}
- // 4. 鏍¢獙鍏抽敭宸ュ簭鍞竴
+ // 4. 鏍¢獙鎶ュ伐浠撳簱灞傜骇锛堜粨搴�/搴撳尯/搴撲綅鍚屾椂濉啓鏃舵牎楠屽綊灞炲叧绯伙級
+ if (reqVO.getWarehouseId() != null && reqVO.getLocationId() != null && reqVO.getAreaId() != null) {
+ warehouseAreaService.validateWarehouseAreaExists(reqVO.getWarehouseId(),
+ reqVO.getLocationId(), reqVO.getAreaId());
+ }
+ // 5. 鏍¢獙鍏抽敭宸ュ簭鍞竴
if (Boolean.TRUE.equals(reqVO.getKeyFlag())) {
for (MesProWorkOrderProcessDO process : list) {
if (reqVO.getId() != null && reqVO.getId().equals(process.getId())) {
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
index 8a33ace..42d30cb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImpl.java
@@ -182,8 +182,9 @@
Long batchId = batch != null ? batch.getId() : null;
String batchCode = batch != null ? batch.getCode() : null;
- // 1.5 浼樺厛浣跨敤宸ヨ壓璺嚎浜у搧缁戝畾鐨勬姤宸ヤ粨搴擄紱鍘嗗彶鏁版嵁鏈厤缃椂鍥為��铏氭嫙绾胯竟搴撱��
- WarehouseTarget outputTarget = resolveOutputTarget(feedback.getItemId());
+ // 1.5 浼樺厛浣跨敤宸ュ崟宸ュ簭閰嶇疆鐨勬姤宸ヤ粨搴擄紙涓嬪崟鏃跺彲缂栬緫锛夛紝鍏舵宸ヨ壓璺嚎浜у搧锛屾渶鍚庡洖閫�铏氭嫙绾胯竟搴�
+ WarehouseTarget outputTarget = resolveOutputTarget(feedback.getWorkOrderId(),
+ feedback.getProcessId(), feedback.getItemId());
// 3. 鏍规嵁鏄惁闇�瑕佹楠屽垎鏀鐞�
if (checkFlag) {
@@ -275,7 +276,8 @@
}
// 2. 閫氳繃 sourceLineId 鐩存帴瀹氫綅寰呮楠岃
MesWmProductProduceLineDO pendingLine = productProduceLineService.validateProductProduceLineExists(sourceLineId);
- WarehouseTarget outputTarget = resolveOutputTarget(pendingLine.getItemId());
+ WarehouseTarget outputTarget = resolveOutputTarget(produce.getWorkOrderId(),
+ produce.getProcessId(), pendingLine.getItemId());
// 3A. 鎯呭喌涓�锛氬瓨鍦ㄤ笉鍚堟牸鍝佹暟閲忥紝闇�瑕佹媶鍒嗚
if (unqualifiedQty != null && unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
@@ -322,7 +324,20 @@
finishProductProduce(produce.getId());
}
- private WarehouseTarget resolveOutputTarget(Long itemId) {
+ private WarehouseTarget resolveOutputTarget(Long workOrderId, Long processId, Long itemId) {
+ // 1. 宸ュ崟宸ュ簭閰嶇疆锛堜笅鍗曟椂鍙紪杈戯級
+ if (workOrderId != null && processId != null) {
+ MesProWorkOrderProcessDO workOrderProcess = workOrderProcessService
+ .getWorkOrderProcessByWorkOrderIdAndProcessId(workOrderId, processId);
+ if (workOrderProcess != null && workOrderProcess.getWarehouseId() != null
+ && workOrderProcess.getLocationId() != null && workOrderProcess.getAreaId() != null) {
+ areaService.validateWarehouseAreaExists(workOrderProcess.getWarehouseId(),
+ workOrderProcess.getLocationId(), workOrderProcess.getAreaId());
+ return new WarehouseTarget(workOrderProcess.getWarehouseId(),
+ workOrderProcess.getLocationId(), workOrderProcess.getAreaId());
+ }
+ }
+ // 2. 宸ヨ壓璺嚎浜у搧閰嶇疆
MesProRouteProductDO routeProduct = itemId != null
? routeProductService.getRouteProductByItemId(itemId) : null;
if (routeProduct != null && routeProduct.getWarehouseId() != null
--
Gitblit v1.9.3