From 80d3104698b7e53e9b8c29c7cd99e290c60ff208 Mon Sep 17 00:00:00 2001
From: 18110972313 <780768673@qq.com>
Date: Tue, 6 May 2025 18:46:19 +0800
Subject: [PATCH] =?UTF-8?q?update=20meswms=5Fmaterialconsume=5Frequest?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=B0=86MES?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8WMS=E6=8E=A5=E5=8F=A3=E6=97=B6=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92=E7=9A=84payMentDate=E5=AD=97=E6=AE=B5=E6=94=BE?=
 =?UTF-8?q?=E5=9C=A8WMS=E7=BB=99SAP=E8=BF=87=E8=B4=A6=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E8=BF=87=E8=B4=A6=E6=97=A5=E6=9C=9F=E5=AD=97=E6=AE=B5=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/cim/idm/service/impl/ToSAPServiceImpl.java     | 10 ++++++++--
 .../com/cim/idm/service/Impl/MESToWMSServiceImpl.java  |  5 +++--
 2 files changed, 11 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 d70b7d1..34b62f0 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
@@ -2550,7 +2550,7 @@ public class ToSAPServiceImpl {
     }
     
     //MES上报工单消耗数据-261工单投料
-    public String mesMaterialConsume( String user ) throws Exception {
+    public String mesMaterialConsume( String user, String payMentDate) throws Exception {
 
         String rcode;
         String undoId = "";
@@ -2581,8 +2581,14 @@ public class ToSAPServiceImpl {
              */
             body.put("ITEM", itemArray);
             body.put("ITEMID", uniqueID);
+            String budatData = "";
+            if(StringUtils.isNotEmpty(payMentDate)){
+                budatData = payMentDate;
+            }else {
+                budatData = TimeStampUtil.getCurrentTime("yyyyMMdd");
+            }
             //过账日期
-            body.put("BUDAT", TimeStampUtil.getCurrentTime("yyyyMMdd"));
+            body.put("BUDAT", budatData);
             //凭证日期
             body.put("BLDAT", TimeStampUtil.getCurrentTime("yyyyMMdd"));
             //凭证抬头文本
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 e531143..b590cff 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
@@ -81,7 +81,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
          * 3. 过账
          * 4. 更新MATERIALPACKINGMDC表库存
          */
-
+        String payMentDate = "";
         for (int i = 0; i < in.size(); i++) {
             JSONObject jb = in.getJSONObject(i);
             String materialSpecName = jb.get("materialSpecName").toString();
@@ -89,6 +89,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
             String  wo = jb.get("requestName") == null ? "" : jb.get("requestName").toString(); // 工单
             String flag = jb.get("flag") == null ? "" : jb.get("flag").toString();
             String charge = jb.get("CHARGE") == null ? "" : jb.get("CHARGE").toString();
+            payMentDate = jb.get("payMentDate").toString();
             //判空
             if (StringUtils.isBlank(materialSpecName) || StringUtils.isBlank(qty)) {
                 result = AjaxResult.me().setSuccess(false).setErrorCode(500).setMessage("料号或数量不能为空");
@@ -135,7 +136,7 @@ public class MESToWMSServiceImpl implements MESToWMSService {
 
         }
         // 将工单的物料消耗数据传给SAP
-        String undoId = toSAPService.mesMaterialConsume("MES");
+        String undoId = toSAPService.mesMaterialConsume("MES",payMentDate);
         result = AjaxResult.me().setSuccess(true).setErrorCode(200).setMessage("执行成功");
         loginfo.setResultCode("0");
         loginfo.setReturnMsg(JSONObject.toJSONString(result));