From c314edf509f689e20d8671ae03bf6e793544ffac Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Fri, 11 Jul 2025 15:49:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E6=80=9D=E7=BB=B4=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E8=A1=A8=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/impl/so/m30/APISaleOrderMaitainImpl.java  | 15 +++++++++++++--
 .../nccloud/openapi/so/m30/SaleOrderResource.java |  8 --------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java b/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java
index 43afa28..8159071 100644
--- a/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java
+++ b/so/src/private/nccloud/api/impl/so/m30/APISaleOrderMaitainImpl.java
@@ -1285,12 +1285,23 @@ public class APISaleOrderMaitainImpl implements IAPISaleOrderMaitain {
      */
     @Override
     public void updateBipFlagSo(Map<String, Object> paramMap) throws Exception {
+        String csaleorderbid = (String) paramMap.get("csaleorderbid");
+        Map<String, Object> soMap = getSaleOrderInfo(csaleorderbid);
+        if (soMap == null) {
+            return;
+        }
+        // 修改销售订单表 vdef8 MES工艺路线
+        if (paramMap.containsKey("vdef8")) {
+            String orderSql = "update so_saleorder set vdef8 = '[vdef8]' where csaleorderid = '[csaleorderid]'";
+            orderSql = orderSql.replace("[vdef8]", paramMap.getOrDefault("vdef8", "") + "");
+            orderSql = orderSql.replace("[csaleorderid]", soMap.getOrDefault("csaleorderid", "") + "");
+            int num1 = getDao().executeUpdate(orderSql);
+            NCCForUAPLogger.debug("updateDef-num1:" + num1);
+        }
         // 如果不包含BOM配置完成时间、工艺配置完成时间，则不同步
         if (!paramMap.containsKey("vbdef16") && !paramMap.containsKey("vbdef17")) {
             return;
         }
-        String csaleorderbid = (String) paramMap.get("csaleorderbid");
-        Map<String, Object> soMap = getSaleOrderInfo(csaleorderbid);
         // 如果没有存合同销售订单信息则不回写
         if (soMap.get("vbdef11") == null || soMap.get("vdef9") == null) {
             return;
diff --git a/so/src/public/nccloud/openapi/so/m30/SaleOrderResource.java b/so/src/public/nccloud/openapi/so/m30/SaleOrderResource.java
index 611b2a9..f22a9f7 100644
--- a/so/src/public/nccloud/openapi/so/m30/SaleOrderResource.java
+++ b/so/src/public/nccloud/openapi/so/m30/SaleOrderResource.java
@@ -504,14 +504,6 @@ public class SaleOrderResource extends NCCPubRestResource {
             BaseDAO baseDAO = new BaseDAO();
             // 修改销售订单子表
             int num = baseDAO.executeUpdate(sql.toString(), parameter);
-            // 修改销售订单表 vdef8 MES工艺路线
-            if (paramMap.containsKey("csaleorderid") && paramMap.containsKey("vdef8")) {
-                String orderSql = "update so_saleorder set vdef8 = '[vdef8]' where csaleorderid = '[csaleorderid]'";
-                orderSql = orderSql.replace("[vdef8]", paramMap.getOrDefault("vdef8", "") + "");
-                orderSql = orderSql.replace("[csaleorderid]", paramMap.getOrDefault("csaleorderid", "") + "");
-                int num1 = baseDAO.executeUpdate(orderSql);
-                NCCForUAPLogger.debug("updateDef-num1:" + num1);
-            }
             if (num > 0) {
                 // 回写合同平台的对应字段
                 NCLocator.getInstance().lookup(IAPISaleOrderMaitain.class).updateBipFlagSo(paramMap);