From 497b954355691e636ee8d91be972c14fac7efa3c Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Sat, 24 May 2025 17:51:42 +0800
Subject: [PATCH] =?UTF-8?q?update=20MES=E7=89=A9=E6=96=99=E6=B6=88?=
 =?UTF-8?q?=E8=80=97=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=8C=B9=E9=85=8D=E5=B7=A5=E5=8D=95=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java | 4 ++--
 .../java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
index 36d5f80..27a67ff 100644
--- a/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
+++ b/zi-wms-inf/src/main/java/com/cim/idm/service/impl/ToSAPServiceImpl.java
@@ -2716,7 +2716,7 @@ public class ToSAPServiceImpl {
     }
     
     //MES上报工单消耗数据-261工单投料
-    public String mesMaterialConsume( String user, String payMentDate, EventInfo eventInfo) throws Exception {
+    public String mesMaterialConsume( String user, String payMentDate, EventInfo eventInfo, String aufnr) throws Exception {
 
         String rcode;
         String undoId = "";
@@ -2799,7 +2799,7 @@ public class ToSAPServiceImpl {
                     //item.put("ZLLITEM", maps.get(i).get("RESERVEDPROJECTNUMB"));
                     item.put("ZLLITEM", maps.get(i).get("SHIPREQUESTDETAILNAME"));
                     //AUFNR 订单号
-                    item.put("AUFNR", maps.get(i).get("WO"));
+                    item.put("AUFNR", aufnr);
                     String materialPackingName = maps.get(i).get("MATERIALPACKINGNAME") == null ? "" : maps.get(i).get("MATERIALPACKINGNAME").toString();
                     if (StringUtils.isNotEmpty(materialPackingName)){
                         materialPackingNameList.add(materialPackingName);
diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java
index 0bf5b5e..1448e87 100644
--- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java
+++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/MESToWMSServiceImpl.java
@@ -68,7 +68,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
         loginfo.setEventName("materialConsume_Request");
         String siteName = System.getProperty("company", "SDK");
         EventInfo eventInfo = new com.cim.idm.wmsextend.generic.util.EventInfoUtil().makeEventInfo("MES消耗UNDOID", "MES", "MES消耗UNDOID", "", "");
-
+        String aufnr = "";
         List<String> boxIdList = new ArrayList<>();
         List<String> qtyList = new ArrayList<>();
         List<MaterialPackingKey> mpList = new ArrayList<>();
@@ -118,6 +118,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
             }
             //调用存储MES_CONSUME
             String procedureName = "MES_CONSUME";
+            aufnr = wo;
             // 调用存储过程返回参数
 //            IDMFrameServiceProxy.getSqlTemplate().getJdbcTemplate().execute(procedureName);
             Map<String, Object> bindMap = new HashMap<String, Object>() {
@@ -145,7 +146,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
 
         }
         // 将工单的物料消耗数据传给SAP
-        String undoId = toSAPService.mesMaterialConsume("MES",payMentDate, eventInfo);
+        String undoId = toSAPService.mesMaterialConsume("MES",payMentDate, eventInfo,aufnr);
         result = AjaxResult.me().setSuccess(true).setErrorCode(200).setMessage("执行成功").setResultObj(undoId);
         loginfo.setResultCode("0");
         loginfo.setReturnMsg(JSONObject.toJSONString(result));