From 6fa82a1ad7c3ae061ef499f0d0806a16846e122b Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 10 十一月 2026 16:55:02 +0800
Subject: [PATCH] feat(mes): 来料检验与不合格退货闭环优化

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeLineServiceImpl.java |   24 ++++++++++++++++++------
 1 files changed, 18 insertions(+), 6 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 3f1ae8b..73162d1 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
@@ -8,13 +8,14 @@
 import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.line.MesWmArrivalNoticeLineSaveReqVO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.arrivalnotice.MesWmArrivalNoticeLineMapper;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import java.math.BigDecimal;
+import java.util.Collection;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -34,7 +35,7 @@
     @Lazy
     private MesWmArrivalNoticeService arrivalNoticeService;
     @Resource
-    private MesMdItemService itemService;
+    private MesMdmItemService mdmItemService;
 
     @Override
     public Long createArrivalNoticeLine(MesWmArrivalNoticeLineSaveReqVO createReqVO) {
@@ -66,7 +67,7 @@
         // 鏍¢獙鐖跺崟鎹瓨鍦ㄤ笖涓鸿崏绋跨姸鎬�
         arrivalNoticeService.validateArrivalNoticeExistsAndDraft(reqVO.getNoticeId());
         // 鏍¢獙鐗╂枡瀛樺湪
-        itemService.validateItemExistsAndEnable(reqVO.getItemId());
+        mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
     }
 
     /**
@@ -107,17 +108,22 @@
     }
 
     @Override
+    public List<MesWmArrivalNoticeLineDO> getArrivalNoticeLineListByNoticeIds(Collection<Long> noticeIds) {
+        return arrivalNoticeLineMapper.selectListByNoticeIds(noticeIds);
+    }
+
+    @Override
     public void deleteArrivalNoticeLineByNoticeId(Long noticeId) {
         arrivalNoticeLineMapper.deleteByNoticeId(noticeId);
     }
 
     @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 +152,10 @@
         arrivalNoticeLineMapper.insert(line);
     }
 
+    @Override
+    public void updateArrivalNoticeLineIqcId(Long lineId, Long iqcId) {
+        arrivalNoticeLineMapper.updateById(new MesWmArrivalNoticeLineDO()
+                .setId(lineId).setIqcId(iqcId));
+    }
+
 }

--
Gitblit v1.9.3