From 6b8585fc452ecdcaa82d86fab79a9f27bb442851 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 09:13:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_南通_苏珩' into dev_南通_苏珩
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java | 37 ++++---------------------------------
1 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
index d1460c8..4b2f21b 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java
@@ -93,35 +93,7 @@
}
productSalesLineMapper.updateById(updateObj);
- // 妫�鏌ユ槸鍚﹂渶瑕佸垱寤� OQC 妫�楠屽崟锛氫粠涓嶉渶瑕佹楠屽彉涓洪渶瑕佹楠�
- if (Boolean.TRUE.equals(updateReqVO.getOqcCheckFlag())
- && !Boolean.TRUE.equals(oldLine.getOqcCheckFlag())) {
- // 鑾峰彇鍑哄簱鍗曚俊鎭�
- MesWmProductSalesDO sales = productSalesService.getProductSales(updateReqVO.getSalesId());
- if (sales == null) {
- log.warn("[updateProductSalesLine] 鍑哄簱鍗曚笉瀛樺湪锛宻alesId={}", updateReqVO.getSalesId());
- return;
- }
-
- // 鏋勫缓鍑哄簱鏄庣粏 DO
- MesWmProductSalesLineDO line = new MesWmProductSalesLineDO();
- line.setId(updateReqVO.getId());
- line.setItemId(updateReqVO.getItemId());
- line.setSaleOrderItemId(updateObj.getSaleOrderItemId() != null
- ? updateObj.getSaleOrderItemId() : oldLine.getSaleOrderItemId());
- line.setBatchCode(updateReqVO.getBatchCode());
- line.setQuantity(updateReqVO.getQuantity());
-
- // 鍒涘缓 OQC 妫�楠屽崟锛岃寮傚父鎶涘嚭
- Long oqcId = oqcService.createOqcFromProductSales(
- sales.getId(), line, sales.getCode(), sales.getClientId());
-
- // 鏇存柊鍑哄簱鏄庣粏鐨� oqcId 鍜岃川閲忕姸鎬�
- productSalesLineMapper.updateById(new MesWmProductSalesLineDO()
- .setId(updateReqVO.getId())
- .setOqcId(oqcId)
- .setQualityStatus(MesWmQualityStatusEnum.PENDING.getStatus()));
- }
+ // 鎻愪氦鍑哄簱鍗曞悗鐢辫川妫�浜哄憳閫夋嫨宸插畬鎴愮殑鍑哄巶妫�楠屽崟銆�
}
@Override
@@ -269,19 +241,18 @@
Long salesId = currentLine.getSalesId();
List<MesWmProductSalesLineDO> allLines = productSalesLineMapper.selectListBySalesId(salesId);
- // 2.1 妫�鏌ユ槸鍚︽湁涓嶅悎鏍艰 鈫� 鍙栨秷鍑哄簱鍗�
+ // 涓嶅悎鏍艰鐣欏緟鍚庣画澶勭疆锛屼笉鑳藉洜涓烘楠岀粨鏋滆嚜鍔ㄥ彇娑堟暣寮犲嚭搴撳崟銆�
boolean hasNg = CollectionUtils.anyMatch(allLines,
line -> Boolean.TRUE.equals(line.getOqcCheckFlag())
&& Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.FAIL.getStatus()));
if (hasNg) {
- log.info("[updateProductSalesLineWhenOqcFinish][閿�鍞嚭搴撳崟({}) 瀛樺湪璐ㄦ涓嶅悎鏍艰锛屽彇娑堝嚭搴撳崟]", salesId);
- productSalesService.cancelProductSales(salesId);
+ log.info("[updateProductSalesLineWhenOqcFinish][閿�鍞嚭搴撳崟({}) 瀛樺湪璐ㄦ涓嶅悎鏍艰锛岀瓑寰呭悗缁缃甝", salesId);
return;
}
// 2.2 妫�鏌ユ槸鍚︽墍鏈� OQC 琛岄兘宸插畬鎴愶紝鑷姩娴佽浆 CONFIRMED 鈫� APPROVING
boolean hasUnchecked = CollectionUtils.anyMatch(allLines,
- line -> Boolean.TRUE.equals(line.getOqcCheckFlag()) && line.getOqcId() == null);
+ line -> Boolean.TRUE.equals(line.getOqcCheckFlag()) && !Objects.equals(line.getQualityStatus(), MesWmQualityStatusEnum.PASS.getStatus()));
if (!hasUnchecked) {
log.info("[updateProductSalesLineWhenOqcFinish][閿�鍞嚭搴撳崟({}) 鎵�鏈� OQC 琛屾楠屽畬鎴愶紝娴佽浆鍒板緟鎷ｈ揣]", salesId);
productSalesService.confirmProductSales(salesId);
--
Gitblit v1.9.3