From bd072e45244c2ca2482a3954f367552d2a040f88 Mon Sep 17 00:00:00 2001
From: lihao <Lglh@10086>
Date: Tue, 6 Jan 2026 09:06:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E6=8E=A8=E9=80=81=E9=AB=98?=
 =?UTF-8?q?=E5=8E=8Bmes=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pickm/service/SyncGyMesPickmUtil.java     | 36 +++++++++++--------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java b/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java
index 9afd49ea..e7ea0142 100644
--- a/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java
+++ b/mmpac/src/public/nccloud/web/mmpac/pickm/service/SyncGyMesPickmUtil.java
@@ -213,6 +213,11 @@ public class SyncGyMesPickmUtil {
         if (useVOs.isEmpty()) {
             return;
         }
+
+//            // 创建子项数组
+        JSONArray contentArray = new JSONArray();
+
+        JSONObject singleObj = new JSONObject();
         for (AggPickmVO vo : useVOs) {
             PickmHeadVO pickmHeadVO = vo.getParentVO();
             PickmItemVO[] itemVOS = (PickmItemVO[]) vo.getChildrenVO();
@@ -227,35 +232,36 @@ public class SyncGyMesPickmUtil {
             if (checkBillType(billType, configParams)) {
                 continue;
             }
-            JSONObject singleObj = new JSONObject();
-            // 创建子项数组
-            JSONArray contentArray = new JSONArray();
+//            20260104 改成新接口
+//            "quantityPerSet": "单套数量（单位用量）",
+//                    "totalQuantity": "总数量（计划出库主数量）",
+//                    "reservedQuantity": "预留数量",
+//                    "cumulativePendingQuantity": "累计待发数量",
+//                    "cumulativeIssuedQuantity": "累计出库数量"
 
-            singleObj.put("materialPreparationPlanNumber", pickmHeadVO.getVbillcode());// 备料计划单号
-            singleObj.put("bipId", pickmHeadVO.getCpickmid());// 主键ID
-            singleObj.put("bipProcessProductionOrderId", pickmHeadVO.getVsourcemocode()); // 流程生产订单号
-            singleObj.put("bipProcessProductionOrderRowNum", pickmHeadVO.getVsourcemorowcode()); // 来源单据号行号
             // 创建子项数组
             for (PickmItemVO item : itemVOS) {
                 JSONObject itemObj = new JSONObject();
                 itemObj.put("bipChildId", item.getCpickm_bid()); // 子项主键ID
-                itemObj.put("bchkitemforwr", item.getBchkitemforwr().booleanValue() ? "Y" : "N"); // 完工齐套检查
                 itemObj.put("quantityPerSet", item.getNunituseastnum() != null ? item.getNunituseastnum().doubleValue() : null); // 单套数量（单位用量）
+                itemObj.put("totalQuantity", item.getNplanoutnum() != null ? item.getNplanoutnum().doubleValue() : null); // 总数量（计划出库主数量）
+
                 itemObj.put("reservedQuantity", item.getNatpastnum() != null ? item.getNatpastnum().doubleValue() : null); // 预留数量
                 itemObj.put("cumulativePendingQuantity", item.getNshouldastnum() != null ? item.getNshouldastnum().doubleValue() : null); // 累计待发数量
                 itemObj.put("cumulativeIssuedQuantity", item.getNaccoutastnum() != null ? item.getNaccoutastnum().doubleValue() : null); // 累计出库数量
-                itemObj.put("totalQuantity", item.getNplanoutnum() != null ? item.getNplanoutnum().doubleValue() : null); // 总数量（计划出库主数量）
                 contentArray.add(itemObj); // 将子项添加到数组
             }
+
+        }
+        if(contentArray.size() > 0) {
             singleObj.put("itemList", contentArray); // 将子项数组添加到主对象
             jsonArray.add(singleObj);
             list.put("list", jsonArray);
+            if (!list.isEmpty()) {
+                logger.error("gyMes-Pickm-领料修改备料计划开始同步高压MES");
+                pushDataAsync(list);
+            }
         }
-        if (!list.isEmpty()) {
-            logger.error("gyMes-Pickm-领料修改备料计划开始同步高压MES");
-            pushDataAsync(list);
-        }
-
     }
 
     /**
@@ -309,7 +315,7 @@ public class SyncGyMesPickmUtil {
         // 异步调用线程池
         final ExecutorService asyncExecutor = Executors.newFixedThreadPool(1);
         String baseUrl = configParams.get("mesBaseUrl");
-        String requestUrl = baseUrl + configParams.get("materialRequirementsUpdate");
+        String requestUrl = baseUrl + configParams.get("mRUpdateBatch");
         logger.error("gyMes-Pickm-url = " + requestUrl);
         // 提交异步任务，立即返回，不等待结果
         CompletableFuture.runAsync(() -> {