From b736ee745617efd87822619d858700a0657e2691 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Mon, 19 May 2025 17:36:53 +0800
Subject: [PATCH] =?UTF-8?q?webcad=E6=8B=86=E5=8D=95=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=89=88=E7=BC=96=E5=8F=B7=E3=80=81?=
 =?UTF-8?q?=E6=88=BF=E9=97=B4=E6=9D=BF=E4=BB=B6/=E5=BC=82=E5=BD=A2?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E7=BD=AE=E4=BA=8E=E5=AF=BC=E5=85=A5=E9=98=88?=
 =?UTF-8?q?=E5=80=BC=E5=88=A4=E6=96=AD=E5=90=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../factory/WebCadOrderImportAsyncFactory.java      |  6 +++---
 .../factory/WebCadOrderImportFactory.java           | 13 +++++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
index 9d1ab44a4..a01252674 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
@@ -755,9 +755,6 @@ public class WebCadOrderImportAsyncFactory {
         plateDO.setCreateTime(now);
         plateDO.setUpdateTime(now);
 
-        // 生成自定义板编号
-        generateCustomPlateNo(plateDO, block.getCustBlockNo());
-
         //批量保存板件
         // 达到板件数量阈值，停止入库，更新全局参数停止后续入库
         currentPlateNum += 1;
@@ -765,6 +762,9 @@ public class WebCadOrderImportAsyncFactory {
             plateNumReachThreshold = true;
             return;
         }
+        // 生成自定义板编号
+        generateCustomPlateNo(plateDO, block.getCustBlockNo());
+
         // 更新房间下板件和异形的数量
         orderBodyDO.setPlateNum(orderBodyDO.getPlateNum() + 1);
         orderBodyDO.setUnregularNum(orderBodyDO.getUnregularNum() + BooleanUtil.toInt(isSpecialShape));
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
index a3b0e4e3c..70275c909 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
@@ -578,9 +578,6 @@ public class WebCadOrderImportFactory {
         // 是否排孔
         boolean isRawHole = (block.getFrontHoleCount() + block.getBackHoleCount()) > 0;
 
-        orderBodyDO.setPlateNum(orderBodyDO.getPlateNum() + 1);
-        orderBodyDO.setUnregularNum(orderBodyDO.getUnregularNum() + BooleanUtil.toInt(isSpecialShape));
-
         // 柜体长宽深
         orderBodyDO.setWidth(block.getCabinetWidth());
         orderBodyDO.setHeight(block.getCabinetHeight());
@@ -657,9 +654,6 @@ public class WebCadOrderImportFactory {
         plateDO.setCreateTime(now);
         plateDO.setUpdateTime(now);
 
-        // 生成自定义板编号
-        generateCustomPlateNo(plateDO, block.getCustBlockNo());
-
         //批量保存板件
         // 达到板件数量阈值，停止入库，更新全局参数停止后续入库
         currentPlateNum += 1;
@@ -667,6 +661,13 @@ public class WebCadOrderImportFactory {
             plateNumReachThreshold = true;
             return;
         }
+        // 生成自定义板编号
+        generateCustomPlateNo(plateDO, block.getCustBlockNo());
+
+        // 更新房间下板件和异形的数量
+        orderBodyDO.setPlateNum(orderBodyDO.getPlateNum() + 1);
+        orderBodyDO.setUnregularNum(orderBodyDO.getUnregularNum() + BooleanUtil.toInt(isSpecialShape));
+
         plateDOS.add(plateDO);
         orderPlateBatchInsertWithinThreshold(plateDOS, false);