From e1590017b716d77f88f075364c55cfbdb480286f Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 10:27:26 +0800
Subject: [PATCH] 诚发五金:生产链路支持无工序/无工艺路线单工序模式
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/mps/MesProMpsServiceImpl.java | 99 ++++++++++++------------
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java | 6 +
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImpl.java | 25 ++---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/pro/task/MesProTaskServiceImpl.java | 51 ++++++------
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationSaveReqVO.java | 3
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java | 5 +
6 files changed, 95 insertions(+), 94 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationSaveReqVO.java
index e0beeaa..2242012 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/vo/MesMdWorkstationSaveReqVO.java
@@ -27,8 +27,7 @@
@NotNull(message = "鎵�鍦ㄨ溅闂翠笉鑳戒负绌�")
private Long workshopId;
- @Schema(description = "宸ュ簭缂栧彿", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
- @NotNull(message = "鎵�灞炲伐搴忎笉鑳戒负绌�")
+ @Schema(description = "宸ュ簭缂栧彿锛堝彲閫夛紝鏈厤缃伐搴忔椂宸ヤ綔绔欎粛鍙甯镐娇鐢級", example = "1")
private Long processId;
@Schema(description = "绾胯竟搴撶紪鍙�", example = "1")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
index c94d823..1aa9a97 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/workorder/MesProWorkOrderController.java
@@ -285,7 +285,10 @@
List<MesProWorkOrderProcessProgressVO> progressList = new ArrayList<>();
- Map<Long, List<MesProTaskDO>> processTaskMap = convertMultiMap(tasks, MesProTaskDO::getProcessId);
+ // 鏈厤缃伐搴忕殑鍗曞伐搴忎换鍔� processId 涓虹┖锛屽垎缁勫墠鍏堣繃婊わ紝閬垮厤 null key 鎶� NPE
+ Map<Long, List<MesProTaskDO>> processTaskMap = convertMultiMap(
+ tasks.stream().filter(task -> task.getProcessId() != null).toList(),
+ MesProTaskDO::getProcessId);
for (MesProWorkOrderProcessDO process : processes) {
List<MesProTaskDO> pTasks = processTaskMap.getOrDefault(process.getProcessId(), Collections.emptyList());
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
index 734cf83..8603384 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/md/workstation/MesMdWorkstationServiceImpl.java
@@ -98,8 +98,10 @@
validateWorkstationNameUnique(id, reqVO.getName());
// 鏍¢獙杞﹂棿瀛樺湪
validateWorkshopExists(reqVO.getWorkshopId());
- // 鏍¢獙宸ュ簭瀛樺湪
- processService.validateProcessExistsAndEnable(reqVO.getProcessId());
+ // 鏍¢獙宸ュ簭瀛樺湪锛堝伐搴忎负鍙�夐」锛屾湭閰嶇疆宸ュ簭鏃跺伐浣滅珯浠嶅彲姝e父浣跨敤锛�
+ if (reqVO.getProcessId() != null) {
+ processService.validateProcessExistsAndEnable(reqVO.getProcessId());
+ }
// 澶勭悊浠撳簱灞傜骇锛堟湭鎸囧畾浠撳簱鏃惰嚜鍔ㄨ缃櫄鎷熺嚎杈瑰簱锛�
handleWarehouseHierarchy(reqVO);
}
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 3cec5b6..3444cc2 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
@@ -311,7 +311,12 @@
// 2.1 鏌ヨ宸ュ簭鐨勫叧閿伐搴忔爣璇� + 妫�楠屾爣璇嗭紙闇�鍦� uncheckQuantity 鏍¢獙涔嬪墠锛屽洜涓鸿川妫�宸ュ簭鍏佽 uncheckQuantity > 0锛�
MesProRouteProcessDO routeProcess = routeProcessService.getRouteProcessByRouteIdAndProcessId(
feedback.getRouteId(), feedback.getProcessId());
- boolean keyFlag = routeProcess != null && Boolean.TRUE.equals(routeProcess.getKeyFlag());
+ // 鏈厤缃伐鑹鸿矾绾垮伐搴忔椂锛岃涓哄崟宸ュ簭鐢熶骇锛屾寜鏈�鍚庝竴閬撳伐搴忔洿鏂板伐鍗曚骇閲�
+ boolean noProcessChain = routeProcess == null
+ && CollUtil.isEmpty(workOrderProcessService.getWorkOrderProcessListByWorkOrderId(feedback.getWorkOrderId()));
+ boolean keyFlag = routeProcess != null
+ ? Boolean.TRUE.equals(routeProcess.getKeyFlag())
+ : noProcessChain;
boolean checkFlag = routeProcess != null && Boolean.TRUE.equals(routeProcess.getCheckFlag());
// 2.2 闈炶川妫�宸ュ簭锛氬悎鏍煎搧/涓嶈壇鍝佹暟閲忕敱璐ㄦ纭畾锛涙湰宸ュ簭涓嶇粡杩囪川妫�锛屾姤宸ユ湭濉啓鏃堕粯璁ゅ叏閮ㄤ负鍚堟牸鍝�
if (!checkFlag
@@ -422,7 +427,9 @@
// 3. 鏇存柊璁㈠崟鐨勫凡鐢熶骇鏁伴噺
// 鏂板閫昏緫锛氬彧鏈夊湪璇ョ瑪璁㈠崟鏈�鍚庝竴涓伐搴忔墠鏇存柊鐢熶骇璁㈠崟鐨勫凡鐢熶骇鏁伴噺
MesProWorkOrderProcessDO lastProcess = workOrderProcessService.getLastWorkOrderProcessByWorkOrderId(feedback.getWorkOrderId());
- if (lastProcess != null && ObjUtil.equal(lastProcess.getProcessId(), feedback.getProcessId())) {
+ // 鏈厤缃伐搴忛摼璺殑鍗曞伐搴忓伐鍗曪紝鎶ュ伐鍗宠涓哄畬鎴愭渶鍚庝竴閬撳伐搴�
+ boolean noProcessChain = lastProcess == null && feedback.getRouteId() == null;
+ if (noProcessChain || (lastProcess != null && ObjUtil.equal(lastProcess.getProcessId(), feedback.getProcessId()))) {
workOrderService.updateProducedQuantity(feedback.getWorkOrderId(),
feedback.getFeedbackQuantity());
// 4. 鏇存柊 MPS 鐨勫凡鐢熶骇鏁伴噺锛堝鏋滄槸閿�鍞鍗曟潵婧愶級
@@ -508,12 +515,7 @@
reqVO.setItemId(task.getItemId());
reqVO.setWorkstationId(task.getWorkstationId());
- // 3. 鏍¢獙宸ヨ壓璺嚎 + 宸ュ簭閰嶇疆鏈夋晥
- MesProRouteProcessDO routeProcess = routeProcessService.getRouteProcessByRouteIdAndProcessId(
- task.getRouteId(), task.getProcessId());
- if (routeProcess == null) {
- throw exception(PRO_FEEDBACK_ROUTE_PROCESS_INVALID);
- }
+ // 3. 鏈厤缃伐鑹鸿矾绾�/宸ュ簭鏃舵寜鍗曞伐搴忔姤宸ュ鐞嗭紝涓嶅啀寮哄埗鏍¢獙璺嚎宸ュ簭閰嶇疆
// 4.1 鏍¢獙鏁伴噺锛氭棤璁烘槸鍚﹂渶瑕佹楠岋紝鎶ュ伐鍙渶濉姤宸ユ暟閲忥紝涓斿繀椤� > 0
// 鍚堟牸鍝�/涓嶈壇鍝佹暟閲忕敱璐ㄦ纭畾锛堥潪璐ㄦ宸ュ簭鍦ㄥ鎵规椂榛樿鍏ㄩ儴涓哄悎鏍煎搧锛�
if (reqVO.getFeedbackQuantity() == null
@@ -603,12 +605,7 @@
// 1.1 椤哄簭鎶ュ伐鏍¢獙锛氬悓涓�鐢熶骇宸ュ崟鍐咃紝涓婁竴閬撳伐搴忓繀椤诲凡鎶ュ伐瀹屾垚锛屽惁鍒欎笉鍏佽鎶ュ伐
validatePreviousProcessFinished(task);
- // 2. 鏍¢獙宸ヨ壓璺嚎宸ュ簭閰嶇疆
- MesProRouteProcessDO routeProcess = routeProcessService.getRouteProcessByRouteIdAndProcessId(
- task.getRouteId(), task.getProcessId());
- if (routeProcess == null) {
- throw exception(PRO_FEEDBACK_ROUTE_PROCESS_INVALID);
- }
+ // 2. 鏈厤缃伐鑹鸿矾绾�/宸ュ簭鏃舵寜鍗曞伐搴忔姤宸ュ鐞嗭紝涓嶅啀寮哄埗鏍¢獙璺嚎宸ュ簭閰嶇疆
// 3. 鏍¢獙鏁伴噺锛氬彧濉姤宸ユ暟閲忥紝涓斿繀椤� > 0锛堝悎鏍煎搧/涓嶈壇鍝佹暟閲忕敱璐ㄦ纭畾锛�
if (reqVO.getFeedbackQuantity() == null
|| reqVO.getFeedbackQuantity().compareTo(BigDecimal.ZERO) <= 0) {
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 1326d89..af3ad0d 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
@@ -676,19 +676,12 @@
* 鏍规嵁 MPS 鍒涘缓鐢熶骇宸ュ崟
*/
private Long createWorkOrderFromMps(MesProMpsDO mps, BigDecimal quantity) {
- // 1. 鏍¢獙浜у搧鏄惁瀛樺湪宸ヨ壓璺嚎
+ // 1. 鏌ユ壘浜у搧宸ヨ壓璺嚎锛涙湭閰嶇疆鏃朵笉闃绘柇锛屾寜鍗曞伐搴忕敓浜у鐞�
MesProRouteProductDO routeProduct = routeProductService.getRouteProductByItemId(mps.getProductId());
- if (routeProduct == null) {
- throw exception(PRO_ROUTE_NOT_EXISTS);
- }
- Long routeId = routeProduct.getRouteId();
-
- // 2. 鏍¢獙宸ヨ壓璺嚎鏄惁鏈夊伐搴忥紙鎸変骇鍝佽繃婊ゅ叾瀹冧骇鍝佺殑浜у嚭鐗╂枡锛�
- List<MesProRouteProcessDO> routeProcesses = routeProcessService
- .getRouteProcessListByProductId(mps.getProductId());
- if (CollUtil.isEmpty(routeProcesses)) {
- throw exception(PRO_ROUTE_ENABLE_NO_PROCESS);
- }
+ Long routeId = routeProduct != null ? routeProduct.getRouteId() : null;
+ List<MesProRouteProcessDO> routeProcesses = routeProduct != null
+ ? routeProcessService.getRouteProcessListByProductId(mps.getProductId())
+ : Collections.emptyList();
// 3. 鍒涘缓鐢熶骇宸ュ崟
MesProWorkOrderSaveReqVO workOrderReq = new MesProWorkOrderSaveReqVO();
@@ -705,46 +698,50 @@
Long workOrderId = workOrderService.createWorkOrder(workOrderReq);
- // 4. 鏇存柊宸ュ崟宸ヨ壓璺嚎
- workOrderMapper.updateById(new MesProWorkOrderDO().setId(workOrderId).setRouteId(routeId));
-
- // 5. 淇濆瓨宸ュ崟宸ュ簭锛堜粠宸ヨ壓璺嚎宸ュ簭甯﹀叆锛屽惈鎶曟枡BOM锛�
- Map<Long, List<MesProRouteProductBomDO>> bomMap = routeProcessService.getRouteProcessBomMapByProductId(mps.getProductId());
- List<MesProWorkOrderProcessSaveReqVO> processList = new ArrayList<>();
- for (MesProRouteProcessDO rp : routeProcesses) {
- MesProWorkOrderProcessSaveReqVO process = new MesProWorkOrderProcessSaveReqVO();
- process.setWorkOrderId(workOrderId);
- process.setProcessId(rp.getProcessId());
- process.setSort(rp.getSort());
- process.setKeyFlag(rp.getKeyFlag());
- process.setCheckFlag(rp.getCheckFlag());
- process.setBackflushFlag(rp.getBackflushFlag());
- if (rp.getOutputItemId() != null && !rp.getOutputItemId().isBlank()) {
- process.setOutputItemIds(Arrays.stream(rp.getOutputItemId().split(","))
- .map(String::trim).filter(s -> !s.isEmpty())
- .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)) {
- List<MesProWorkOrderProcessSaveReqVO.BomItem> bomItems = new ArrayList<>();
- for (MesProRouteProductBomDO bomDO : routeBomItems) {
- MesProWorkOrderProcessSaveReqVO.BomItem bomItem = new MesProWorkOrderProcessSaveReqVO.BomItem();
- bomItem.setItemId(bomDO.getItemId());
- bomItem.setQuantity(bomDO.getQuantity());
- bomItem.setRemark(bomDO.getRemark());
- bomItems.add(bomItem);
- }
- process.setBomItems(bomItems);
- }
- processList.add(process);
+ // 4. 鏇存柊宸ュ崟宸ヨ壓璺嚎锛堟湭閰嶇疆璺嚎鏃朵繚鎸佷负绌猴紝鎸夊崟宸ュ簭鐢熶骇锛�
+ if (routeId != null) {
+ workOrderMapper.updateById(new MesProWorkOrderDO().setId(workOrderId).setRouteId(routeId));
}
- workOrderProcessService.batchSaveWorkOrderProcess(processList);
+
+ // 5. 淇濆瓨宸ュ崟宸ュ簭锛堜粎閰嶇疆浜嗗伐鑹鸿矾绾垮伐搴忔椂甯﹀叆锛屽惈鎶曟枡BOM锛�
+ if (CollUtil.isNotEmpty(routeProcesses)) {
+ Map<Long, List<MesProRouteProductBomDO>> bomMap = routeProcessService.getRouteProcessBomMapByProductId(mps.getProductId());
+ List<MesProWorkOrderProcessSaveReqVO> processList = new ArrayList<>();
+ for (MesProRouteProcessDO rp : routeProcesses) {
+ MesProWorkOrderProcessSaveReqVO process = new MesProWorkOrderProcessSaveReqVO();
+ process.setWorkOrderId(workOrderId);
+ process.setProcessId(rp.getProcessId());
+ process.setSort(rp.getSort());
+ process.setKeyFlag(rp.getKeyFlag());
+ process.setCheckFlag(rp.getCheckFlag());
+ process.setBackflushFlag(rp.getBackflushFlag());
+ if (rp.getOutputItemId() != null && !rp.getOutputItemId().isBlank()) {
+ process.setOutputItemIds(Arrays.stream(rp.getOutputItemId().split(","))
+ .map(String::trim).filter(s -> !s.isEmpty())
+ .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)) {
+ List<MesProWorkOrderProcessSaveReqVO.BomItem> bomItems = new ArrayList<>();
+ for (MesProRouteProductBomDO bomDO : routeBomItems) {
+ MesProWorkOrderProcessSaveReqVO.BomItem bomItem = new MesProWorkOrderProcessSaveReqVO.BomItem();
+ bomItem.setItemId(bomDO.getItemId());
+ bomItem.setQuantity(bomDO.getQuantity());
+ bomItem.setRemark(bomDO.getRemark());
+ bomItems.add(bomItem);
+ }
+ process.setBomItems(bomItems);
+ }
+ processList.add(process);
+ }
+ workOrderProcessService.batchSaveWorkOrderProcess(processList);
+ }
// 6. 宸ュ崟鐩存帴纭涓哄凡纭鐘舵��
workOrderService.confirmWorkOrder(workOrderId);
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 bc9586d..c31ce78 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
@@ -138,19 +138,18 @@
scheduleGuard.lock();
// 1. 鏍¢獙鍏宠仈鏁版嵁瀛樺湪
MesProWorkOrderDO workOrder = workOrderService.validateWorkOrderConfirmed(createReqVO.getWorkOrderId());
- var station = workstationService.validateWorkstationExistsAndEnable(createReqVO.getWorkstationId());
- if (!java.util.Objects.equals(station.getProcessId(), createReqVO.getProcessId())) {
- throw exception(cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_TASK_SCHEDULE_INVALID, "宸ヤ綔绔欎笌宸ュ簭涓嶅尮閰�");
- }
- routeService.validateRouteExists(createReqVO.getRouteId());
- processService.validateProcessExistsAndEnable(createReqVO.getProcessId());
+ workstationService.validateWorkstationExistsAndEnable(createReqVO.getWorkstationId());
// 2. 鑷姩纭畾 itemId锛氫紭鍏堝墠绔紶鍏� 鈫� 宸ヨ壓璺嚎宸ュ簭鐨勪骇鍑轰骇鍝� 鈫� 宸ュ崟鎴愬搧
+ // 鏈厤缃伐搴�/宸ヨ壓璺嚎鏃讹紝浠诲姟鐩存帴鎸夊伐鍗曟垚鍝佷骇鍑�
Long itemId = createReqVO.getItemId();
- if (itemId == null) {
+ if (itemId == null && createReqVO.getRouteId() != null && createReqVO.getProcessId() != null) {
MesProRouteProcessDO routeProcess = routeProcessService
.getRouteProcessByRouteIdAndProcessId(createReqVO.getRouteId(), createReqVO.getProcessId());
itemId = resolveTaskItemId(routeProcess, workOrder.getProductId());
+ }
+ if (itemId == null) {
+ itemId = workOrder.getProductId();
}
MesMdItemDO item = itemService.validateItemExists(itemId);
@@ -204,12 +203,6 @@
if (updateReqVO.getWorkstationId() != null) {
workstationService.validateWorkstationExists(updateReqVO.getWorkstationId());
}
- if (updateReqVO.getRouteId() != null) {
- routeService.validateRouteExists(updateReqVO.getRouteId());
- }
- if (updateReqVO.getProcessId() != null) {
- processService.validateProcessExistsAndEnable(updateReqVO.getProcessId());
- }
MesMdItemDO item;
if (updateReqVO.getItemId() != null) {
item = itemService.validateItemExists(updateReqVO.getItemId());
@@ -225,10 +218,6 @@
.setQuantity(quantity)
.setStartTime(updateReqVO.getStartTime() != null ? updateReqVO.getStartTime() : task.getStartTime())
.setEndTime(updateReqVO.getEndTime() != null ? updateReqVO.getEndTime() : task.getEndTime());
- var station = workstationService.validateWorkstationExistsAndEnable(candidate.getWorkstationId());
- if (!java.util.Objects.equals(station.getProcessId(), candidate.getProcessId())) {
- throw exception(cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_TASK_SCHEDULE_INVALID, "宸ヤ綔绔欎笌宸ュ簭涓嶅尮閰�");
- }
scheduleGuard.validate(workOrderService.validateWorkOrderConfirmed(candidate.getWorkOrderId()), candidate, task.getId());
// 2. 鏇存柊
@@ -249,13 +238,24 @@
private void synchronizeScheduledQuantity(MesProWorkOrderDO order, Long routeId) {
List<MesProRouteProcessDO> required = buildRouteProcessList(routeId, order.getId());
List<MesProTaskDO> tasks = taskMapper.selectListByWorkOrderId(order.getId());
- BigDecimal scheduled = order.getQuantity();
- for (var process : required) {
- BigDecimal amount = tasks.stream().filter(task -> java.util.Objects.equals(task.getProcessId(), process.getProcessId())
- && !java.util.Objects.equals(task.getStatus(), MesProTaskStatusEnum.CANCELED.getStatus()))
+ BigDecimal orderQuantity = order.getQuantity() == null ? BigDecimal.ZERO : order.getQuantity();
+ BigDecimal scheduled;
+ if (CollUtil.isEmpty(required)) {
+ // 鏈厤缃伐搴�/宸ヨ壓璺嚎锛氭暣寮犲伐鍗曞彧鏈変竴涓敓浜ф楠わ紝宸叉帓浜ч噺鎸変换鍔℃暟閲忓悎璁�
+ scheduled = tasks.stream()
+ .filter(task -> !java.util.Objects.equals(task.getStatus(), MesProTaskStatusEnum.CANCELED.getStatus()))
.map(task -> task.getQuantity() == null ? BigDecimal.ZERO : task.getQuantity())
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- scheduled = scheduled.min(amount);
+ .reduce(BigDecimal.ZERO, BigDecimal::add)
+ .min(orderQuantity);
+ } else {
+ scheduled = orderQuantity;
+ for (var process : required) {
+ BigDecimal amount = tasks.stream().filter(task -> java.util.Objects.equals(task.getProcessId(), process.getProcessId())
+ && !java.util.Objects.equals(task.getStatus(), MesProTaskStatusEnum.CANCELED.getStatus()))
+ .map(task -> task.getQuantity() == null ? BigDecimal.ZERO : task.getQuantity())
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ scheduled = scheduled.min(amount);
+ }
}
scheduleWorkOrderMapper.updateById(new MesProWorkOrderDO().setId(order.getId()).setQuantityScheduled(scheduled));
}
@@ -340,7 +340,10 @@
}
return result;
}
- // 2. 鍥為��鍒板伐鑹鸿矾绾挎ā鏉垮伐搴�
+ // 2. 鍥為��鍒板伐鑹鸿矾绾挎ā鏉垮伐搴忥紱鏈厤缃伐鑹鸿矾绾挎椂瑙嗕负鍗曞伐搴忕敓浜�
+ if (routeId == null) {
+ return new java.util.ArrayList<>();
+ }
List<MesProRouteProcessDO> routeProcesses = routeProcessService.getRouteProcessListByRouteId(routeId);
if (CollUtil.isEmpty(routeProcesses)) {
throw exception(cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.PRO_ROUTE_ENABLE_NO_PROCESS);
--
Gitblit v1.9.3