From 87733eb3623593da247c051593d64b8ff9e1d3a4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 19:00:39 +0800
Subject: [PATCH] feat(crm,mes): 扩展客户字段与重构批次号生成逻辑

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java |   37 +++----------------------------------
 1 files changed, 3 insertions(+), 34 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..5a1dfe1 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
@@ -17,7 +17,6 @@
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeLineDO;
 import cn.iocoder.yudao.module.mes.service.wm.salesnotice.MesWmSalesNoticeLineService;
-import cn.iocoder.yudao.module.mes.service.qc.oqc.MesQcOqcService;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Lazy;
@@ -35,7 +34,7 @@
 /**
  * MES 閿�鍞嚭搴撳崟琛� Service 瀹炵幇绫�
  *
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠$悊鍛�
  */
 @Service
 @Validated
@@ -57,9 +56,6 @@
     @Resource
     @Lazy
     private MesWmSalesNoticeLineService salesNoticeLineService;
-    @Resource
-    @Lazy
-    private MesQcOqcService oqcService;
 
     @Override
     public Long createProductSalesLine(MesWmProductSalesLineSaveReqVO createReqVO) {
@@ -83,34 +79,6 @@
         // 鏇存柊
         MesWmProductSalesLineDO updateObj = BeanUtils.toBean(updateReqVO, MesWmProductSalesLineDO.class);
         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.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
@@ -182,6 +150,8 @@
      * 鏍¢獙淇濆瓨鏃剁殑鍏宠仈鏁版嵁
      */
     private void validateLineSaveData(MesWmProductSalesLineSaveReqVO reqVO) {
+        // 鍑哄簱娴侀�氬叧闂嚭璐ц川妫�锛氶攢鍞嚭搴撹缁熶竴鎸夊厤妫�澶勭悊銆�
+        reqVO.setOqcCheckFlag(Boolean.FALSE);
         // 鏍¢獙涓诲崟瀛樺湪涓斾负鑽夌鐘舵��
         MesWmProductSalesDO sales = productSalesService.validateProductSalesExistsAndDraft(reqVO.getSalesId());
         // 鏍¢獙鐗╂枡瀛樺湪
@@ -208,7 +178,6 @@
             MesWmSalesNoticeLineDO noticeLine = salesNoticeLineService.validateSalesNoticeLineExists(
                     noticeLineId, sales.getNoticeId());
             // 鏍¢獙鍏抽敭瀛楁涓�鑷存�э細鐗╂枡銆佹暟閲忋�佹壒娆″彿
-            // 娉細OQC 妫�楠屾爣璇嗗厑璁稿湪鍑哄簱鏃剁嫭绔嬭缃紝涓嶅己鍒朵笌閫氱煡鍗曚竴鑷�
             if (ObjUtil.notEqual(reqVO.getItemId(), noticeLine.getItemId())) {
                 throw exception(WM_PRODUCT_SALES_LINE_NOTICE_LINE_ITEM_MISMATCH);
             }

--
Gitblit v1.9.3