From 7591ba21194595cc8d9a1293dfdbfa945bc9948f Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 17 八月 2026 16:36:54 +0800
Subject: [PATCH] Merge branch 'dev_business' of http://114.132.189.42:9002/r/mom-pro2-after into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java
index c71717e..ea14127 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java
@@ -112,12 +112,12 @@
}
@Override
- public void updateArrivalNoticeLineWhenIqcFinish(Long lineId, Long iqcId, BigDecimal qualifiedQuantity) {
+ public void updateArrivalNoticeLineWhenIqcFinish(Long lineId, Long iqcId, Integer checkResult, BigDecimal qualifiedQuantity) {
// 鏍￠獙琛屽瓨鍦�
validateArrivalNoticeLineExists(lineId);
- // 鏇存柊
+ // 鏇存柊锛氱粦瀹� iqcId + 璐ㄦ缁撴灉 + 鍚堟牸鏁伴噺
arrivalNoticeLineMapper.updateById(new MesWmArrivalNoticeLineDO()
- .setId(lineId).setIqcId(iqcId).setQualifiedQuantity(qualifiedQuantity));
+ .setId(lineId).setIqcId(iqcId).setIqcCheckResult(checkResult).setQualifiedQuantity(qualifiedQuantity));
}
@Override
@@ -146,4 +146,10 @@
arrivalNoticeLineMapper.insert(line);
}
+ @Override
+ public void updateArrivalNoticeLineIqcId(Long lineId, Long iqcId) {
+ arrivalNoticeLineMapper.updateById(new MesWmArrivalNoticeLineDO()
+ .setId(lineId).setIqcId(iqcId));
+ }
+
}
--
Gitblit v1.9.3