From fd1efdba56dbf07943b82c971694579af034fc5a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 03 十一月 2026 20:10:12 +0800
Subject: [PATCH] feat: 新增废料管理并完善合同导出

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 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 590df99..d1460c8 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
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.mes.service.wm.productsales;
 
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
+import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ObjUtil;
@@ -35,7 +36,7 @@
 /**
  * MES 閿�鍞嚭搴撳崟琛� Service 瀹炵幇绫�
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
  */
 @Service
 @Validated
@@ -60,14 +61,19 @@
     @Resource
     @Lazy
     private MesQcOqcService oqcService;
+    @Resource
+    private ErpSaleOrderApi saleOrderApi;
 
     @Override
     public Long createProductSalesLine(MesWmProductSalesLineSaveReqVO createReqVO) {
         // 鏍￠獙鏁版嵁
-        validateLineSaveData(createReqVO);
+        MesWmSalesNoticeLineDO noticeLine = validateLineSaveData(createReqVO);
 
         // 鏂板
         MesWmProductSalesLineDO line = BeanUtils.toBean(createReqVO, MesWmProductSalesLineDO.class);
+        if (noticeLine != null) {
+            line.setSaleOrderItemId(noticeLine.getSaleOrderItemId());
+        }
         productSalesLineMapper.insert(line);
         return line.getId();
     }
@@ -78,10 +84,13 @@
         MesWmProductSalesLineDO oldLine = validateProductSalesLineExists(updateReqVO.getId());
         // 鏍￠獙鏁版嵁
         updateReqVO.setSalesId(oldLine.getSalesId());
-        validateLineSaveData(updateReqVO);
+        MesWmSalesNoticeLineDO noticeLine = validateLineSaveData(updateReqVO);
 
         // 鏇存柊
         MesWmProductSalesLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductSalesLineDO.class);
+        if (noticeLine != null) {
+            updateObj.setSaleOrderItemId(noticeLine.getSaleOrderItemId());
+        }
         productSalesLineMapper.updateById(updateObj);
 
         // 妫�鏌ユ槸鍚﹂渶瑕佸垱寤� OQC 妫�楠屽崟锛氫粠涓嶉渶瑕佹楠屽彉涓洪渶瑕佹楠�
@@ -98,6 +107,8 @@
             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());
 
@@ -181,15 +192,26 @@
     /**
      * 鏍￠獙淇濆瓨鏃剁殑鍏宠仈鏁版嵁
      */
-    private void validateLineSaveData(MesWmProductSalesLineSaveReqVO reqVO) {
+    private MesWmSalesNoticeLineDO validateLineSaveData(MesWmProductSalesLineSaveReqVO reqVO) {
         // 鏍￠獙涓诲崟瀛樺湪涓斾负鑽夌鐘舵��
         MesWmProductSalesDO sales = productSalesService.validateProductSalesExistsAndDraft(reqVO.getSalesId());
         // 鏍￠獙鐗╂枡瀛樺湪
         mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
         // 鏍￠獙鍏宠仈鍙戣揣閫氱煡鍗曡锛堝瓨鍦ㄦ�� + 褰掑睘 + 瀛楁涓�鑷存�э級
-        validateSalesNoticeLine(sales, reqVO);
+        MesWmSalesNoticeLineDO noticeLine = validateSalesNoticeLine(sales, reqVO);
+        if (noticeLine == null && sales.getSaleOrderId() != null) {
+            if (reqVO.getSaleOrderItemId() == null) {
+                throw exception(WM_SALES_NOTICE_SALE_ORDER_ITEM_EMPTY);
+            }
+            var item = saleOrderApi.getSaleOrderItem(reqVO.getSaleOrderItemId()).getCheckedData();
+            if (item == null || !Objects.equals(item.getOrderId(), sales.getSaleOrderId())
+                    || !Objects.equals(item.getProductId(), reqVO.getItemId())) {
+                throw exception(WM_SALES_NOTICE_LINE_SALE_ITEM_MISMATCH);
+            }
+        }
         // 鏍规嵁 batchCode 瑙ｆ瀽 batchId
         fillBatchId(reqVO);
+        return noticeLine;
     }
 
     /**
@@ -198,7 +220,7 @@
      * @param sales 鍑哄簱鍗�
      * @param reqVO 鍑哄簱琛岃姹�
      */
-    private void validateSalesNoticeLine(MesWmProductSalesDO sales, MesWmProductSalesLineSaveReqVO reqVO) {
+    private MesWmSalesNoticeLineDO validateSalesNoticeLine(MesWmProductSalesDO sales, MesWmProductSalesLineSaveReqVO reqVO) {
         Long noticeLineId = reqVO.getNoticeLineId();
         // 鎯呭喌涓�锛氬鏋滃嚭搴撳崟鍏宠仈浜嗗彂璐ч�氱煡鍗曪紝鍒欏繀椤诲叧鑱斿彂璐ч�氱煡鍗曡
         if (sales.getNoticeId() != null) {
@@ -220,13 +242,14 @@
                     && ObjUtil.notEqual(reqVO.getBatchCode(), noticeLine.getBatchCode())) {
                 throw exception(WM_PRODUCT_SALES_LINE_NOTICE_LINE_BATCH_MISMATCH);
             }
-            return;
+            return noticeLine;
         }
 
         // 鎯呭喌浜岋細濡傛灉鍑哄簱鍗曟病鏈夊叧鑱斿彂璐ч�氱煡鍗曪紝鍒欎笉鍏佽鍏宠仈鍙戣揣閫氱煡鍗曡
         if (noticeLineId != null) {
             throw exception(WM_PRODUCT_SALES_LINE_SALES_NOTICE_LINE_NOT_ALLOWED);
         }
+        return null;
     }
 
     @Override

--
Gitblit v1.9.3