From 185435aad75f0f5aa08c86f61dfd32c512026d29 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期三, 04 十一月 2026 19:50:41 +0800
Subject: [PATCH] fix: 出库流通关闭出货质检

---
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java                      |    2 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java                                    |    6 ++----
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImpl.java                |    3 ++-
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java                  |    2 ++
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java                        |    6 +-----
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineSaveReqVO.java |    2 +-
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java   |    3 +--
 7 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineSaveReqVO.java
index 67e7c3b..fa1befb 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/productsales/vo/line/MesWmProductSalesLineSaveReqVO.java
@@ -34,7 +34,7 @@
     @Schema(description = "鎵规鍙�", example = "B20260301001")
     private String batchCode;
 
-    @Schema(description = "鏄惁鍑哄巶妫�楠�", example = "true")
+    @Schema(description = "鏄惁鍑哄巶妫�楠岋紙鍑哄簱娴侀�氬綋鍓嶅浐瀹氫负 false锛�", example = "false")
     private Boolean oqcCheckFlag;
 
     @Schema(description = "澶囨敞", example = "澶囨敞")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java
index d6ba341..8e1175e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/salesnotice/vo/line/MesWmSalesNoticeLineSaveReqVO.java
@@ -33,8 +33,7 @@
     @DecimalMin(value = "0.01", message = "鍙戣揣鏁伴噺蹇呴』澶т簬 0")
     private BigDecimal quantity;
 
-    @Schema(description = "鏄惁妫�楠�", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
-    @NotNull(message = "鏄惁妫�楠屼笉鑳戒负绌�")
+    @Schema(description = "鏄惁妫�楠岋紙鍙戣揣閫氱煡鍗曞綋鍓嶅浐瀹氫负 false锛�", example = "false")
     private Boolean oqcCheckFlag;
 
     @Schema(description = "澶囨敞", example = "澶囨敞")
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java
index 173359d..dd0c9a3 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/enums/wm/MesWmProductSalesStatusEnum.java
@@ -25,7 +25,7 @@
      */
     PREPARE(MesOrderStatusConstants.PREPARE, "鑽夌"),
     /**
-     * 寰呮娴嬶紙闇�瑕� OQC 妫�楠屾椂锛夛紝瀵规帴 qc 妯″潡鐨� MesQcOqcDO 鍚庣画娴佺▼
+     * 寰呮娴嬶紙鍘嗗彶 OQC 娴佺▼鐘舵�侊紱褰撳墠鍑哄簱娴侀�氬厤妫�锛屼笉鍐嶈繘鍏ヨ鐘舵�侊級
      *
      * 瀵瑰簲 MesWmProductSalesService#submitProductSales 鏂规硶
      */
@@ -33,9 +33,7 @@
     /**
      * 寰呮嫞璐�
      *
-     * 瀵瑰簲鏂规硶锛�
-     * 1. 涓嶉渶瑕� OQC 妫�楠屾椂锛歁esWmProductSalesService#submitProductSales 鏂规硶
-     * 2. 鎴� OQC 妫�楠屽畬鎴愭椂锛歁esWmProductSalesService#confirmProductSales 鏂规硶
+     * 瀵瑰簲 MesWmProductSalesService#submitProductSales 鏂规硶
      */
     APPROVING(MesOrderStatusConstants.APPROVING, "寰呮嫞璐�"),
     /**
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 48ecdb0..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
@@ -150,6 +150,8 @@
      * 鏍¢獙淇濆瓨鏃剁殑鍏宠仈鏁版嵁
      */
     private void validateLineSaveData(MesWmProductSalesLineSaveReqVO reqVO) {
+        // 鍑哄簱娴侀�氬叧闂嚭璐ц川妫�锛氶攢鍞嚭搴撹缁熶竴鎸夊厤妫�澶勭悊銆�
+        reqVO.setOqcCheckFlag(Boolean.FALSE);
         // 鏍¢獙涓诲崟瀛樺湪涓斾负鑽夌鐘舵��
         MesWmProductSalesDO sales = productSalesService.validateProductSalesExistsAndDraft(reqVO.getSalesId());
         // 鏍¢獙鐗╂枡瀛樺湪
@@ -176,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);
             }
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java
index 5242355..a7976e1 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesService.java
@@ -57,11 +57,7 @@
     PageResult<MesWmProductSalesDO> getProductSalesPage(MesWmProductSalesPageReqVO pageReqVO);
 
     /**
-     * 鎻愪氦閿�鍞嚭搴撳崟
-     * <ul>
-     *     <li>鏈� OQC 妫�楠岃锛氳崏绋� 鈫� 寰呮娴�</li>
-     *     <li>鏃� OQC 妫�楠岃锛氳崏绋� 鈫� 寰呮嫞璐�</li>
-     * </ul>
+     * 鎻愪氦閿�鍞嚭搴撳崟锛堝嚭搴撴祦閫氬厤妫�锛氳崏绋� 鈫� 寰呮嫞璐э級
      *
      * @param id 缂栧彿
      */
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
index fed11df..60bf5aa 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeLineServiceImpl.java
@@ -123,6 +123,8 @@
     }
 
     private void validateLineSaveData(MesWmSalesNoticeLineSaveReqVO reqVO) {
+        // 鍙戣揣閫氱煡鍗曞叧闂嚭璐ц川妫�锛氬墠绔棤闇�浼� oqcCheckFlag锛屼繚瀛樻椂缁熶竴鎸夊厤妫�澶勭悊銆�
+        reqVO.setOqcCheckFlag(Boolean.FALSE);
         validateNoticeStatusDraft(reqVO.getNoticeId());
         mdmItemService.validateItemExistsAndEnable(reqVO.getItemId());
 
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
index bb463d1..ed8b615 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java
@@ -308,6 +308,8 @@
             salesLine.setQuantity(noticeLine.getQuantity());
             salesLine.setBatchId(noticeLine.getBatchId());
             salesLine.setBatchCode(noticeLine.getBatchCode());
+            // 鍑哄簱娴侀�氬叧闂嚭璐ц川妫�锛屽巻鍙查�氱煡鍗曞嵆浣挎畫鐣欒川妫�鏍囪瘑涔熶笉鍐嶅悜涓嬫父浼犻�掋��
+            salesLine.setOqcCheckFlag(Boolean.FALSE);
             productSalesLineMapper.insert(salesLine);
         }
 

--
Gitblit v1.9.3