From 9be0745c0335520c5c2955c881cb7711791f45b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BD=98=E8=8D=A3=E6=99=9F?=
 <9691125+pan-rongsheng@user.noreply.gitee.com>
Date: Wed, 31 Dec 2025 14:49:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=94=80=E5=94=AE=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=97=B6=E9=BB=98=E8=AE=A4=E9=94=80=E5=94=AE=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=BA=E6=89=A7=E8=A1=8C=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/salesorder/SalesOrderServiceImpl.java         | 8 ++------
 .../module/erp/service/erp/ErpFactoryServiceImpl.java     | 7 ++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java
index 31bbaf8a..3971c4f6 100644
--- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java
+++ b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/service/salesorder/SalesOrderServiceImpl.java
@@ -90,12 +90,8 @@ public class SalesOrderServiceImpl implements SalesOrderService {
         // 插入
         SalesOrderDO salesOrderDO = BeanUtils.toBean(createReqVO, SalesOrderDO.class);
         //订单号
-        //生成订单号
-        if (Objects.equals(createReqVO.getIsPush(), 1)) {
-            salesOrderDO.setStatus(OrderStatusEnum.DRAFT.getCode()); //设置初始状态
-        } else {
-            salesOrderDO.setStatus(OrderStatusEnum.TO_SUBMIT_ERP.getCode());
-        }
+        salesOrderDO.setIsPush(0);
+        salesOrderDO.setStatus(OrderStatusEnum.IN_PROGRESS.getCode());
         String orderNumber = generateOrderNumber(salesOrderDO.getMtrlTp());
         salesOrderDO.setSystemOrderNumber(orderNumber);
         salesOrderMapper.insert(salesOrderDO);
diff --git a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java
index 2c0025fd..ea18cc4d 100644
--- a/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java
+++ b/zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpFactoryServiceImpl.java
@@ -99,7 +99,12 @@ public class ErpFactoryServiceImpl implements ErpFactoryService {
             throw exception(ERP_FACTORY_NOT_ALLOW_UPDATE);
         }
         //不允许修改除了绑定工厂名称、绑定工厂编码和操作以外的信息
-        erpFactoryMapper.updateById(updateObj);
+        ErpFactoryDO erpFactoryDO = new ErpFactoryDO();
+        erpFactoryDO.setId(updateObj.getId());
+        erpFactoryDO.setRelnumber(updateObj.getRelnumber());
+        erpFactoryDO.setRelnumber(updateObj.getRelnumber());
+        erpFactoryDO.setOperationType(updateObj.getOperationType());
+        erpFactoryMapper.updateById(erpFactoryDO);
     }
 
     @Override