From 6d231e964fbb97fb7a045300c01cbbcc0bf94d02 Mon Sep 17 00:00:00 2001
From: mzr <mengzhaorui@qq.com>
Date: Fri, 12 Sep 2025 12:26:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E9=AB=98=E5=8E=8Bmes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...leGyMes.java => AfterSoSyncRuleGyMes.java} |  4 +-
 .../action/main/ApproveSaleOrderAction.java   |  8 +--
 .../action/main/UpdateSaleOrderAction.java    | 55 +++++++++++++++++++
 3 files changed, 61 insertions(+), 6 deletions(-)
 rename so/src/private/nc/bs/so/m30/rule/approve/{AfterAuditSyncRuleGyMes.java => AfterSoSyncRuleGyMes.java} (98%)
 create mode 100644 so/src/private/nc/impl/so/m30/action/main/UpdateSaleOrderAction.java

diff --git a/so/src/private/nc/bs/so/m30/rule/approve/AfterAuditSyncRuleGyMes.java b/so/src/private/nc/bs/so/m30/rule/approve/AfterSoSyncRuleGyMes.java
similarity index 98%
rename from so/src/private/nc/bs/so/m30/rule/approve/AfterAuditSyncRuleGyMes.java
rename to so/src/private/nc/bs/so/m30/rule/approve/AfterSoSyncRuleGyMes.java
index 24a03cd..bf6b3e1 100644
--- a/so/src/private/nc/bs/so/m30/rule/approve/AfterAuditSyncRuleGyMes.java
+++ b/so/src/private/nc/bs/so/m30/rule/approve/AfterSoSyncRuleGyMes.java
@@ -30,7 +30,7 @@ import java.util.Map;
  *
  * @author mzr
  */
-public class AfterAuditSyncRuleGyMes implements IRule<SaleOrderVO> {
+public class AfterSoSyncRuleGyMes implements IRule<SaleOrderVO> {
     private static final String LOG_INFO_NAME = "gymeslog";
     private static final Log logger = Log.getInstance(LOG_INFO_NAME);
     private static final String reqUrl = "/bip/order/saleOrderAdd";
@@ -167,7 +167,7 @@ public class AfterAuditSyncRuleGyMes implements IRule<SaleOrderVO> {
                 res = defdocVOs[0].getCode().trim();
             }
         } catch (DAOException e) {
-            logger.error("gyMes-SaleOrder-error,getDefList[" + e.getMessage() + "]");
+            logger.error("gyMes-SaleOrder-error,getDefCode[" + e.getMessage() + "]");
         }
         return res;
 
diff --git a/so/src/private/nc/impl/so/m30/action/main/ApproveSaleOrderAction.java b/so/src/private/nc/impl/so/m30/action/main/ApproveSaleOrderAction.java
index 9f29e9a..ab19b73 100644
--- a/so/src/private/nc/impl/so/m30/action/main/ApproveSaleOrderAction.java
+++ b/so/src/private/nc/impl/so/m30/action/main/ApproveSaleOrderAction.java
@@ -166,11 +166,11 @@ public class ApproveSaleOrderAction {
         processer.addAfterRule(new MobAfterApproveMessageRule());
         processer.addAfterRule(new SaleOrderCreateRmBeforeRule());
         // 在审批后推送到MES系统
-        processer.addAfterRule(new AfterApprovingSynchronizeRuleMES());
-
-
+        // processer.addAfterRule(new AfterApprovingSynchronizeRuleMES());
         // 在审批后推送到QMS系统
-        processer.addAfterRule(new AfterApprovingSynchronizeRuleQMS());
+        // processer.addAfterRule(new AfterApprovingSynchronizeRuleQMS());
+        // 在审批后推送到高压MES
+        processer.addAfterRule(new AfterSoSyncRuleGyMes());
     }
 
     private boolean isExistDelivery(String ctranstype) {
diff --git a/so/src/private/nc/impl/so/m30/action/main/UpdateSaleOrderAction.java b/so/src/private/nc/impl/so/m30/action/main/UpdateSaleOrderAction.java
new file mode 100644
index 0000000..1998c5c
--- /dev/null
+++ b/so/src/private/nc/impl/so/m30/action/main/UpdateSaleOrderAction.java
@@ -0,0 +1,55 @@
+package nc.impl.so.m30.action.main;
+
+import nc.bs.so.m30.maintain.UpdateSaleOrderBP;
+import nc.bs.so.m30.plugin.Action30PlugInPoint;
+import nc.bs.so.m30.rule.approve.AfterSoSyncRuleGyMes;
+import nc.bs.so.m30.rule.maintainprocess.CompareDimensionModifyRule;
+import nc.bs.so.m30.rule.maintainprocess.FillupDataWhenUpdateRule;
+import nc.bs.so.m30.rule.maintainprocess.NullRule;
+import nc.impl.pubapp.pattern.rule.IRule;
+import nc.impl.pubapp.pattern.rule.processer.CompareAroundProcesser;
+import nc.vo.pubapp.pattern.log.TimeLog;
+import nc.vo.so.m30.entity.SaleOrderVO;
+
+public class UpdateSaleOrderAction {
+    public SaleOrderVO[] update(SaleOrderVO[] bills, SaleOrderVO[] originBills) {
+        CompareAroundProcesser<SaleOrderVO> processer = new CompareAroundProcesser<SaleOrderVO>(Action30PlugInPoint.UpdateAction);
+
+
+        addBeforeRule(processer);
+        addAfterRule(processer);
+
+        TimeLog.logStart();
+        processer.before(bills, originBills);
+
+        TimeLog.info("调用修改保存前操作插入点");
+
+        TimeLog.logStart();
+        UpdateSaleOrderBP action = new UpdateSaleOrderBP();
+        SaleOrderVO[] vos = action.update(bills, originBills);
+
+        TimeLog.info("调用修改保存BP，进行保存");
+
+        TimeLog.logStart();
+        processer.after(vos, originBills);
+
+        TimeLog.info("调用修改保存后操作插入点");
+        return vos;
+    }
+
+
+    private void addAfterRule(CompareAroundProcesser<SaleOrderVO> processer) {
+        processer.addAfterRule(new NullRule());
+        processer.addAfterRule(new CompareDimensionModifyRule());
+        // 在变更后推送到高压MES
+        processer.addAfterRule(new AfterSoSyncRuleGyMes());
+    }
+
+
+    private void addBeforeRule(CompareAroundProcesser<SaleOrderVO> processer) {
+        IRule<SaleOrderVO> rule = null;
+
+        rule = new FillupDataWhenUpdateRule();
+        processer.addBeforeRule(rule);
+    }
+}
\ No newline at end of file