From 197432459e5e49d746e39e5faac11511451c2add Mon Sep 17 00:00:00 2001
From: lihao <Lglh@10086>
Date: Wed, 24 Sep 2025 17:56:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E6=96=99=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/MaterialToGyMesListener.java        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
index 7e0bdf19..08fb504c 100644
--- a/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
+++ b/uapbd/src/private/nccloud/api/uapbd/material/listener/MaterialToGyMesListener.java
@@ -187,14 +187,16 @@ public class MaterialToGyMesListener implements IBusinessListener {
              */
         }
         if (!dataArr.isEmpty()) {
-            pushData(dataArr);
+            JSONObject jsonObj = new JSONObject();
+            jsonObj.put("list", dataArr);
+            pushData(jsonObj);
         }
     }
 
     /**
      * 推送同步数据
      */
-    private void pushData(JSONArray param) throws BusinessException {
+    private void pushData(JSONObject param) throws BusinessException {
         // String jsonString = param.toJSONString();
         // 转json字符串的时候保留null值
         String jsonStr = JSON.toJSONString(param,
@@ -203,7 +205,7 @@ public class MaterialToGyMesListener implements IBusinessListener {
         );
         logger.error("gymes-Material-param = " + jsonStr);
         // NCCForUAPLogger.debug("gymes-Material-param = " + jsonStr);
-        String baseUrl = configParams.get("gymesBaseUrl");
+        String baseUrl = configParams.get("mesBaseUrl");
         String requestUrl = baseUrl + addUrl;
         logger.error("gymes-Material-url = " + requestUrl);
         String result = ThirdPartyPostRequestUtil.sendPostRequest(requestUrl, jsonStr);
@@ -230,8 +232,8 @@ public class MaterialToGyMesListener implements IBusinessListener {
 
     private Map getStockInfo(String pkMaterial) throws BusinessException {
         String sql = " select martype, wholemanaflag, outpriority, pk_stordoc, remain" +
-                "from bd_materialstock" +
-                "where pk_material = '" + pkMaterial + "' ";
+                " from bd_materialstock " +
+                " where pk_material = '" + pkMaterial + "' ";
         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor());
         return map;
     }
@@ -241,8 +243,8 @@ public class MaterialToGyMesListener implements IBusinessListener {
                 " pk_materialprod " +
                 "FROM " +
                 " bd_materialprod a" +
-                "left join org_dept b on a.pk_prodeptdoc = b.pk_dept " +
-                "where a.pk_material = '" + pkMaterial + "' ";
+                " left join org_dept b on a.pk_prodeptdoc = b.pk_dept " +
+                " where a.pk_material = '" + pkMaterial + "' ";
         Map map = (Map) new BaseDAO().executeQuery(sql, new MapProcessor());
         return map;
     }

From c003b14186f929c1245d6c75e1eb9d3061aab067 Mon Sep 17 00:00:00 2001
From: houyi <1398559711@qq.com>
Date: Wed, 24 Sep 2025 18:16:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=AB=98=E5=8E=8B-=E5=A4=87=E6=96=99?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=A1=E6=89=B9=E5=90=8E=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E9=AB=98=E5=8E=8BMES=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java b/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java
index ae4dd414..c1d2b94e 100644
--- a/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java
+++ b/mmpac/src/private/nc/bs/mmpac/pickm/bp/PickmApproveBP.java
@@ -28,7 +28,7 @@ public class PickmApproveBP {
         processer.addAfterRule(pickmstatusFilterRule);
         //备料计划审批后推送高压MES
         IRule<AggPickmVO> pickmHighpressureMesRules = new AfterApproveRuleHighpressureMes();
-        processer.addAfterRule(pickmHighpressureMesRules);
+        processer.addAfterRule(new AfterApproveRuleHighpressureMes());
     }
 
     private void addBeforeRule(CompareAroundProcesser<AggPickmVO> processer) {