From 501d27a42a13fbf6f810ff437ba35d4a49ab137a Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Tue, 3 Dec 2024 16:13:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=9D=BF=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E5=AF=BC=E5=85=A5=E9=80=82=E9=85=8D=E5=90=8C=E5=8D=95?=
 =?UTF-8?q?=E8=A1=A5=E6=9D=BF=E5=BA=8F=E5=8F=B7=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../customplateno/CustomPlateNoGenerateService.java    |  3 ++-
 .../CustomPlateNoGenerateServiceImpl.java              | 10 +++++-----
 .../executor/service/order/OrderServiceImpl.java       |  4 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateService.java
index 941a70d6d..dc48ea63a 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateService.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateService.java
@@ -17,6 +17,7 @@ public interface CustomPlateNoGenerateService {
      *
      * @param orderDO     生产单号
      * @param plateDOList 板件列表
+     * @param newOrder 是否新单，否：向已有生产单导入新板
      */
-    void generateCustomPlateNo(OrderDO orderDO, List<PlateDO> plateDOList);
+    void generateCustomPlateNo(OrderDO orderDO, List<PlateDO> plateDOList, boolean newOrder);
 }
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateServiceImpl.java
index 50e6a02f0..fbd53bb3d 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/customplateno/CustomPlateNoGenerateServiceImpl.java
@@ -60,7 +60,7 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe
     private static final DateTimeFormatter DAY_FORMATTER = DateTimeFormatter.ofPattern("yyyyMMdd");
 
     @Override
-    public void generateCustomPlateNo(OrderDO orderDO, List<PlateDO> plateDOList) {
+    public void generateCustomPlateNo(OrderDO orderDO, List<PlateDO> plateDOList, boolean newOrder) {
         Long orderId = orderDO.getId();
         // 1、获取生产配置
         CustomPlateNoGenerateConfigVO generateConfig = getGenerateConfig(orderId);
@@ -84,12 +84,12 @@ public class CustomPlateNoGenerateServiceImpl implements CustomPlateNoGenerateSe
 
         // 3、保存生产单序号json、设置生产单所用配置id
         OrderCustomPlateNoSeqVO orderCustomPlateNoSeqVO = generateConfig.getOrderCustomPlateNoSeqVO();
-        if (ObjectUtil.isNotNull(orderDO)) {
-            // 已有生产单更新序号
-            orderMapper.update(new LambdaUpdateWrapper<OrderDO>().eq(OrderDO::getId, orderId).set(OrderDO::getCustomPlatenoSeq, JsonUtils.zipString(JSON.toJSONString(orderCustomPlateNoSeqVO))));
-        } else {
+        if (newOrder) {
             orderDO.setCustomPlatenoSeq(JSON.toJSONString(orderCustomPlateNoSeqVO));
             orderDO.setCustomPlatenoConfigId(orgCustomPlateNoConfigId);
+        } else {
+            // 已有生产单更新序号
+            orderMapper.update(new LambdaUpdateWrapper<OrderDO>().eq(OrderDO::getId, orderId).set(OrderDO::getCustomPlatenoSeq, JsonUtils.zipString(JSON.toJSONString(orderCustomPlateNoSeqVO))));
         }
         // 机构下序号配置同步
         CustomPlateNoSeqDTO orgCustomPlateNoSeqRespDTO = generateConfig.getOrgCustomPlateNoSeqRespDTO();
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
index 17fa56535..e32b7ea43 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
@@ -415,7 +415,7 @@ public class OrderServiceImpl implements OrderService {
         // 配件信息
         List<PartsDO> partsDOS = getPartsGoods(partsDO);
 
-        customPlateNoGenerateService.generateCustomPlateNo(order, plateDO);
+        customPlateNoGenerateService.generateCustomPlateNo(order, plateDO, false);
         orderMapper.insert(order);
         orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, itemDO, goodsDO, plateGoodDOS, partsDOS);
         List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class);
@@ -488,7 +488,7 @@ public class OrderServiceImpl implements OrderService {
             }
         }
 
-        customPlateNoGenerateService.generateCustomPlateNo(orderDO, plateDO);
+        customPlateNoGenerateService.generateCustomPlateNo(orderDO, plateDO, index == 0);
         insertOrder(orderDO, index);
         orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, itemDO, goodsDO, plateGoodDOS, partsDOList);