From 856254fb07b5be370aec0996a92cd5ad5067e9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Tue, 6 May 2025 19:54:03 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BA=A7=E6=88=90=E5=93=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=97=A5=E6=9C=9F=E8=BF=87=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/service/impl/ToSAPServiceImpl.java | 20 +++++++++++-------- .../MaterialReceiveActController.java | 4 ++-- .../cim/idm/controller/NoChargeStockIn.java | 2 +- 3 files changed, 15 insertions(+), 11 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 b8283a8..09c90ab 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 @@ -32,7 +32,7 @@ public class ToSAPServiceImpl { public String PurStockIn(String receiveRequestName, String siteName, String user, - Map args) throws Exception { + Map args,String commitDate) throws Exception { String rcode; String undoId = ""; @@ -118,7 +118,7 @@ public class ToSAPServiceImpl { } - String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData, TimeStampUtil.getCurrentTime("yyyyMMdd")); + String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData, commitDate); String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl,"",sendData); org.json.JSONObject receiveJsonObject = new org.json.JSONObject(sapreturn); @@ -1407,10 +1407,15 @@ public class ToSAPServiceImpl { */ //交货单号 body.put("VBELN", shipRequestName); + + SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = inputFormat.parse(commitDate); + String outputDate = outputFormat.format(date); //实际过账日期 - body.put("WADAT_IST", TimeStampUtil.getCurrentTime("yyyyMMdd"));//yyyyMMddhhmmss + body.put("WADAT_IST", outputDate);//yyyyMMddhhmmss //发送日期 - body.put("Z_SENDDATE", TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("Z_SENDDATE", outputDate); //操作类型（过账） body.put("Z_OPTION", "1"); @@ -1684,10 +1689,9 @@ public class ToSAPServiceImpl { return sendData.toJSONString(); } - public String PurStockIn(String receiveRequestName, String siteName, String eventUser, String receiveActno, - Map args/* , List> overReceiveControls */) { + public String PurStockIn(String receiveRequestName, String siteName, String eventUser, String receiveActno, Map args,String commitDate) { try { - return PurStockIn(receiveRequestName, siteName, eventUser, args/* ,overReceiveControls */); + return PurStockIn(receiveRequestName, siteName, eventUser, args,commitDate); } catch (Exception e) { log.error(e.getMessage(),e); return ""; @@ -1875,7 +1879,7 @@ public class ToSAPServiceImpl { case "Z006" : //股份- 泗洪STO case "Z007" : //股份泗洪-分子公司STO Map args = new HashMap<>(); - billCode = PurStockIn(receiveRequestName, siteName, eventUser, reActo, args/* ,overReceiveControls */); +// billCode = PurStockIn(receiveRequestName, siteName, eventUser, reActo, args/* ,overReceiveControls */); break; case "NLCC" : //调拨入库 billCode = AlloctionStockIn(receiveRequestName, siteName, eventUser,""); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java index 8dc5e9a..bdc6597 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MaterialReceiveActController.java @@ -526,7 +526,7 @@ public class MaterialReceiveActController { // 采购订单 if (ReceiveTypeEnums.isPurchase(request.getReceiveRequestType())) { Map args = new HashMap<>(); - undoId = toSAPServiceImpl.PurStockIn(receiveRequestName, siteName, user, args); + undoId = toSAPServiceImpl.PurStockIn(receiveRequestName, siteName, user, args, commitDate); }else if( ReceiveTypeEnums.isSaleReturn(request.getReceiveRequestType())) { undoId = toSAPServiceImpl.SaleReturn(receiveRequestName, siteName, user, commitDate, opCode); } @@ -585,7 +585,7 @@ public class MaterialReceiveActController { case "Z004" : //固定资产、在建工程采购订单 Map args = new HashMap<>(); billCode = toSAPServiceImpl.PurStockIn(receiveRequestName, siteName, eventUser, - args/* ,overReceiveControls */); + args,commitDate); break; case "Z005" : //服务费用采购订单 case "Z006" : //股份 - 泗洪STO diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/NoChargeStockIn.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/NoChargeStockIn.java index c23dbb4..dcc10ac 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/NoChargeStockIn.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/NoChargeStockIn.java @@ -255,7 +255,7 @@ public class NoChargeStockIn { // 采购订单 if (ReceiveTypeEnums.isPurchase(request.getReceiveRequestType())) { Map args = new HashMap<>(); - billcode = toSAPServiceImpl.PurStockIn(request.getReceiveRequestName(), siteName, user, args); + billcode = toSAPServiceImpl.PurStockIn(request.getReceiveRequestName(), siteName, user, args,commitDate); } // @TODO 其他类型 if (billcode == null || "".equals(billcode)) {