From b685c0fdc0471976e141ac04383cfeec1d24e6ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Tue, 6 May 2025 19:18:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E8=BF=87=E8=B4=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/service/impl/ToSAPServiceImpl.java | 69 +++++++++++++------ .../com/cim/idm/util/ToSAPMessageUtil.java | 34 +++++++-- .../controller/PurchaseReturnController.java | 3 +- .../idm/controller/SAPToWMSController.java | 20 ++++++ .../ERPLocationMoveNoInvoiceServiceImpl.java | 4 +- .../idm/service/Impl/InvoiceServiceImpl.java | 25 ++++--- .../service/Impl/ProductIntoServiceImpl.java | 6 +- .../Impl/PurchaseReturnServiceImpl.java | 5 +- .../Impl/ReturnStockIntoServiceImpl.java | 2 +- .../idm/service/PurchaseReturnService.java | 2 +- 10 files changed, 124 insertions(+), 46 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 a997258..8e8f126 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 @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.fasterxml.jackson.core.type.TypeReference; +import java.text.SimpleDateFormat; import java.util.*; @Slf4j @Service @@ -116,7 +117,8 @@ public class ToSAPServiceImpl { itemData.add(item); } - String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData); + + String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData, TimeStampUtil.getCurrentTime("yyyyMMdd")); String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl,"",sendData); org.json.JSONObject receiveJsonObject = new org.json.JSONObject(sapreturn); @@ -236,7 +238,7 @@ public class ToSAPServiceImpl { itemData.add(item); } - String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData); + String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData,TimeStampUtil.getCurrentTime("yyyyMMdd")); String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl,"",sendData); org.json.JSONObject receiveJsonObject = new org.json.JSONObject(sapreturn); @@ -520,7 +522,7 @@ public class ToSAPServiceImpl { * @return 返回物料凭证相关的ID * @throws Exception 如果与SAP系统的通信或其他错误发生时抛出异常 */ - public String FGStockInByManulIn( String bodyJson, String user, String RECEIVEACTNO) throws Exception { + public String FGStockInByManulIn( String bodyJson, String user, String RECEIVEACTNO, String commitDate) throws Exception { // 初始化SAP返回信息、结果代码、消息文本和撤销ID String sapreturn = ""; String rcode = ""; @@ -533,7 +535,7 @@ public class ToSAPServiceImpl { new TypeReference>>() {} ); - String makeFGStockIn = makeFGStockIn2(objList, user, RECEIVEACTNO); + String makeFGStockIn = makeFGStockIn2(objList, user, RECEIVEACTNO,commitDate); try { // 发送物料信息到SAP系统 @@ -701,10 +703,10 @@ public class ToSAPServiceImpl { itemsData.add(item); } - String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemsData); + String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemsData,TimeStampUtil.getCurrentTime("yyyyMMdd")); return sendData; } - public String makeFGStockIn2(List> list, String eventUser, String receiveRequestName) throws JsonMappingException, JsonProcessingException { + public String makeFGStockIn2(List> list, String eventUser, String receiveRequestName,String commitDate) throws JsonMappingException, JsonProcessingException { if (list == null || list.size() < 1) { return ""; @@ -753,7 +755,7 @@ public class ToSAPServiceImpl { itemsData.add(item); } - String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemsData); + String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemsData, commitDate); return sendData; } //取消成品入库接口字段。zd.2024.8.29 @@ -802,7 +804,7 @@ public class ToSAPServiceImpl { itemsData.add(item); } - String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemsData); + String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemsData,TimeStampUtil.getCurrentTime("yyyyMMdd")); return sendData; } @@ -1174,7 +1176,7 @@ public class ToSAPServiceImpl { item.put("UMMAT_KDPOS", mm.get("SENDSALESORDERDETAILNO")); itemData.add(item); } - String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData); + String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData,TimeStampUtil.getCurrentTime("yyyyMMdd")); return sendData; } @@ -1309,7 +1311,7 @@ public class ToSAPServiceImpl { itemData.put("INSMK", ""); items.add(itemData); } - String sendData = ToSAPMessageUtil.mm067(user, bodyData, items); + String sendData = ToSAPMessageUtil.mm067(user, bodyData, items,TimeStampUtil.getCurrentTime("yyyyMMdd")); return sendData; } @@ -3816,7 +3818,7 @@ public class ToSAPServiceImpl { } //采购退货（Z008 跨月新单据退货）(Z001~Z007 原单据) - public String OrderStockBackOut(String shipRequestName, String siteName, String user) throws Exception { + public String OrderStockBackOut(String shipRequestName, String siteName, String user, String commitDate) throws Exception { String rcode; String undoId = ""; @@ -3909,10 +3911,14 @@ public class ToSAPServiceImpl { */ body.put("ITEM", itemArray); body.put("ITEMID", uniqueID); + SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = inputFormat.parse(commitDate); + String outputDate = outputFormat.format(date); //过账日期 - body.put("BUDAT", TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("BUDAT", outputDate); //凭证日期 - body.put("BLDAT", TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("BLDAT", outputDate); //凭证抬头文本 body.put("BKTXT", uniqueID); //用户名 @@ -4758,7 +4764,7 @@ public class ToSAPServiceImpl { String aimFactory, String aimERPlocation, String aimLocationName, - String user) throws Exception { + String user, String commitDate) throws Exception { String rcode; String undoId = ""; String rmsg = null; @@ -4772,6 +4778,7 @@ public class ToSAPServiceImpl { .append(" :AIMERPLOCATION AS UMLGO_RECIEVEERPLOCATION, ").append(SystemPropHelper.CR) .append(" MP.MATERIALQUANTITY , ").append(SystemPropHelper.CR) .append(" MP.UNIT, ").append(SystemPropHelper.CR) + .append(" MP.PACKINGGRADE, ").append(SystemPropHelper.CR) .append(" :AIMLOCATIONNAME AS NULL_RECIVELOCAITONNAME ").append(SystemPropHelper.CR) .append(" FROM ").append(SystemPropHelper.CR) .append(" MATERIALPACKING MP ").append(SystemPropHelper.CR) @@ -4816,10 +4823,21 @@ public class ToSAPServiceImpl { */ body.put("ITEM", itemArray); body.put("ITEMID", uniqueID); + + String outputDate = ""; + if(commitDate.isEmpty()) { + outputDate = TimeStampUtil.getCurrentTime("yyyyMMdd"); + }else { + SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = inputFormat.parse(commitDate); + outputDate = outputFormat.format(date); + } + //过账日期 - body.put("BUDAT", TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("BUDAT", outputDate); //凭证日期 - body.put("BLDAT", TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("BLDAT", outputDate); //凭证抬头文本 body.put("BKTXT", uniqueID); //用户名 @@ -4846,6 +4864,15 @@ public class ToSAPServiceImpl { item.put("MEINS", mm.get("UNIT")); //BWART 移动类型 item.put("BWART", "311"); + + String insmk = ""; + if (StringUtils.isEmpty((String)mm.get("PACKINGGRADE"))) { + insmk = "2"; + } +// String insmk = StringUtils.equals(mm.get("OQARESULTSTATE").toString(),"END")?"":"X"; + item.put("INSMK", insmk); + + item.put("BWART", "311"); // //ZLLORDER 自定义领料单号 // item.put("ZLLORDER", mm.get("SHIPREQUESTNAME")); // //ZLLITEM 自定义领料单行号 @@ -5144,7 +5171,7 @@ public class ToSAPServiceImpl { itemsData.add(item); } - String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemsData); + String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemsData,TimeStampUtil.getCurrentTime("yyyyMMdd")); return sendData; } @@ -5352,7 +5379,7 @@ public class ToSAPServiceImpl { //质检批如何判定， 如果是质检批，则 INSMK 值为2 items.add(itemData); } - String sendData = ToSAPMessageUtil.mm067(user, bodyData, items); + String sendData = ToSAPMessageUtil.mm067(user, bodyData, items,TimeStampUtil.getCurrentTime("yyyyMMdd")); return sendData; } @@ -5438,7 +5465,7 @@ public class ToSAPServiceImpl { } - String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData); + String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData,TimeStampUtil.getCurrentTime("yyyyMMdd")); String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl,"",sendData); org.json.JSONObject receiveJsonObject = new org.json.JSONObject(sapreturn); @@ -5537,7 +5564,7 @@ public class ToSAPServiceImpl { } - String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData); + String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData,TimeStampUtil.getCurrentTime("yyyyMMdd")); String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl,"",sendData); org.json.JSONObject receiveJsonObject = new org.json.JSONObject(sapreturn); @@ -5638,7 +5665,7 @@ public class ToSAPServiceImpl { } - String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemData); + String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemData,TimeStampUtil.getCurrentTime("yyyyMMdd")); String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl,"",sendData); org.json.JSONObject receiveJsonObject = new org.json.JSONObject(sapreturn); diff --git a/zi-wms-inf/src/main/java/com/cim/idm/util/ToSAPMessageUtil.java b/zi-wms-inf/src/main/java/com/cim/idm/util/ToSAPMessageUtil.java index b3a49fd..3026be1 100644 --- a/zi-wms-inf/src/main/java/com/cim/idm/util/ToSAPMessageUtil.java +++ b/zi-wms-inf/src/main/java/com/cim/idm/util/ToSAPMessageUtil.java @@ -21,10 +21,9 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.net.HttpURLConnection; import java.net.URL; -import java.util.Base64; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.text.SimpleDateFormat; +import java.util.*; + @Slf4j @Service(value = "ToSAPMessageUtil") public class ToSAPMessageUtil { @@ -169,7 +168,26 @@ public class ToSAPMessageUtil { * @param itemsData * @return JSON消息字符串 */ - public static String mm067(String user, Map bodyData, List> itemsData){ + public static String mm067(String user, Map bodyData, List> itemsData,String commitDate){ + String outputDate = ""; + try { + + if(commitDate.contains("-")) { + SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = inputFormat.parse(commitDate); + outputDate = outputFormat.format(date); + }else { + outputDate = commitDate; + } + } catch (IllegalArgumentException e) { + log.error("commitDate 参数无效: " + e.getMessage(), e); + throw e; + } catch (Exception e) { + log.error("日期解析失败: " + e.getMessage(), e); + throw new RuntimeException("日期解析失败，请检查 commitDate 格式是否为 yyyy-MM-dd", e); + } + try { JSONObject sendData = new JSONObject(true); @@ -224,10 +242,12 @@ public class ToSAPMessageUtil { */ body.put("ITEMID",uniqueID); + + //过账日期 - body.put("BUDAT",TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("BUDAT",outputDate); //凭证日期 - body.put("BLDAT",TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("BLDAT",outputDate); //凭证抬头文本 body.put("BKTXT",StringUtils.isEmpty((String)bodyData.get("BKTXT"))?uniqueID:bodyData.get("BKTXT")); //用户名 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java index 306d987..a15fc9b 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/PurchaseReturnController.java @@ -376,10 +376,11 @@ public class PurchaseReturnController { public AjaxResult completeShipRequest(@RequestBody JSONObject in ){ StockOutDto ms = JSON.toJavaObject(in, StockOutDto.class); String shipRequestName = ms.getShipRequestName(); + String commitDate = ms.getCommitDate(); String siteName = "SDK"; String user = ms.getUser(); try { - purchaseReturnService.completeReceiveRequest(siteName, user, shipRequestName); + purchaseReturnService.completeReceiveRequest(siteName, user, shipRequestName, commitDate); } catch (Exception e) { return AjaxResult.me().setErrorCode(500).setMessage(e.toString()); } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java index cc12493..c0b44f0 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/SAPToWMSController.java @@ -679,6 +679,26 @@ public class SAPToWMSController { String zzywy = MapUtils.getString(item, "ZZYWY"); // 业务员 String zzywzl = MapUtils.getString(item, "ZZYWZL"); // 业务助理 String zzsyb = MapUtils.getString(item, "ZZSYB"); // 事业部 + + // 如果是采购退货的单据，把相关行项对应的批次记录到单独的ORDERCHARGE表 + if("Z008".equals(receiveRequestType)) { + String rtOrdersql ="SELECT * FROM ORDERCHARGE WHERE RECEIVEREQUESTNAME =:receiverequestname"; + Map selectRTMap= new HashMap(); + selectRTMap.put("receiverequestname", receiveRequestName); + List> rtResultList = IDMFrameServiceProxy.getSqlTemplate().queryForList(rtOrdersql, selectRTMap); + if(rtResultList.size() > 0) { + String sql="DELETE FROM ORDERCHARGE WHERE RECEIVEREQUESTNAME=?"; + Object[] obj=new Object[] {receiveRequestName}; + IDMFrameServiceProxy.getSqlTemplate().update(sql, obj); + } +// String[] chargeList = new String[]{}; +// chargeList = zwmscharg.split(";"); + String rtSql="INSERT INTO ORDERCHARGE(RECEIVEREQUESTNAME, RECEIVEREQUESTDETAILNAME, CHARGELIST) VALUES(?,?,?)"; + Object[] obj=new Object[] {receiveRequestName, receiveRequestDetailName, zwmscharg}; + IDMFrameServiceProxy.getSqlTemplate().update(rtSql, obj); + + } + if("X".equals(loekz)) { String sql="DELETE FROM materialreceivedetail WHERE receiverequestname=? AND receiverequestdetailname=?"; Object[] obj=new Object[] {receiveRequestName, receiveRequestDetailName}; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ERPLocationMoveNoInvoiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ERPLocationMoveNoInvoiceServiceImpl.java index 204c205..07ffada 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ERPLocationMoveNoInvoiceServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ERPLocationMoveNoInvoiceServiceImpl.java @@ -72,7 +72,7 @@ public class ERPLocationMoveNoInvoiceServiceImpl implements ERPLocationMoveNoInv arrayList.add(materialPackingKey); } - String billCode = toSAPService.NoSourceChangeLocation(arrayList,aimErpFactory, aimErpLocation, aimLOcationName, user); + String billCode = toSAPService.NoSourceChangeLocation(arrayList,aimErpFactory, aimErpLocation, aimLOcationName, user, ""); List mpKeyList = new ArrayList (); SetEventInfo setEventInfo = new SetEventInfo(); for (MaterialPacking materialPacking : all) { @@ -169,7 +169,7 @@ public class ERPLocationMoveNoInvoiceServiceImpl implements ERPLocationMoveNoInv } String billCode = toSAPService.NoSourceChangeLocation(arrayList,aimErpFactory, - aimErpLocation, aimLOcationName, user ); + aimErpLocation, aimLOcationName, user,timesString ); List mpKeyList = new ArrayList (); SetEventInfo setEventInfo = new SetEventInfo(); for (MaterialPacking materialPacking : all) { diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java index 988bf2e..00fbb97 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/InvoiceServiceImpl.java @@ -555,7 +555,7 @@ public class InvoiceServiceImpl implements InvoiceService { else { - billCode=ProductionStockOut_NEW(shipRequestName, "SDK", eventUser,materialPackingKeyList); + billCode=ProductionStockOut_NEW(shipRequestName, "SDK", eventUser,materialPackingKeyList,commitDate); if (billCode.isEmpty()) { throw new CustomException("SAP过账异常！"); } @@ -595,7 +595,7 @@ public class InvoiceServiceImpl implements InvoiceService { case "ZLF7": case "ZLF8": // billCode=toSAPService.saleStockOut_NEW(shipRequestName, "SDK", eventUser,materialPackingKeyList); - billCode=saleStockOut_NEW(shipRequestName, "SDK", eventUser,materialPackingKeyList); + billCode=saleStockOut_NEW(shipRequestName, "SDK", eventUser,materialPackingKeyList,commitDate); untils.SaveUnDoInfo_ForSap(materialPackingKeyList, billCode, makeEventInfo); break; @@ -2078,7 +2078,7 @@ public class InvoiceServiceImpl implements InvoiceService { } } - public String ProductionStockOut_NEW(String shipRequestName, String siteName, String user,List boxList) throws Exception { + public String ProductionStockOut_NEW(String shipRequestName, String siteName, String user,List boxList,String commitDate) throws Exception { String rcode; String undoId = ""; @@ -2179,10 +2179,14 @@ public class InvoiceServiceImpl implements InvoiceService { */ body.put("ITEM", itemArray); body.put("ITEMID", uniqueID); + SimpleDateFormat inputFormat = new SimpleDateFormat("yyyy-MM-dd"); + SimpleDateFormat outputFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = inputFormat.parse(commitDate); + String outputDate = outputFormat.format(date); //过账日期 - body.put("BUDAT", TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("BUDAT", outputDate); //凭证日期 - body.put("BLDAT", TimeStampUtil.getCurrentTime("yyyyMMdd")); + body.put("BLDAT", outputDate); //凭证抬头文本 body.put("BKTXT", uniqueID); //用户名 @@ -2419,7 +2423,7 @@ public class InvoiceServiceImpl implements InvoiceService { } //重写销售交货单过账。zd.2024.8.14 - public String saleStockOut_NEW(String shipRequestName, String siteName, String user,List boxList) throws Exception { + public String saleStockOut_NEW(String shipRequestName, String siteName, String user,List boxList,String commitDate) throws Exception { String rcode; String undoId = ""; String rmsg = null; @@ -2477,10 +2481,15 @@ public class InvoiceServiceImpl implements InvoiceService { */ //交货单号 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"); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java index 1f3ea84..689e6fb 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProductIntoServiceImpl.java @@ -274,7 +274,7 @@ public class ProductIntoServiceImpl implements FGStockInService { String aimErpLocation = boxList.get(0).getErpLocation(); String aimLOcationName = boxList.get(0).getLocationName(); String billCode = toSAPService.NoSourceChangeLocation(arrayList,aimErpFactory, - aimErpLocation, aimLOcationName, user ); + aimErpLocation, aimLOcationName, user, "" ); } /** @@ -327,7 +327,7 @@ public class ProductIntoServiceImpl implements FGStockInService { String aimErpLocation = boxList.get(0).getErpLocation(); String aimLOcationName = boxList.get(0).getLocationName(); undoID = toSAPService.NoSourceChangeLocation(arrayList,aimErpFactory, - aimErpLocation, aimLOcationName, user ); + aimErpLocation, aimLOcationName, user, commitDate); //更新物料凭证和库存状态 toSapDao.updateLocationStockState(boxList, "Stocked", undoID,aimErpFactory,aimErpLocation,aimLOcationName,user); }else { @@ -336,7 +336,7 @@ public class ProductIntoServiceImpl implements FGStockInService { // String json = JSON.toJSONString(fgStockInInfo); String json = JSON.toJSONString(fgStockInInfo); - undoID = toSAPService.FGStockInByManulIn(json, user,receiveRequestActNo); + undoID = toSAPService.FGStockInByManulIn(json, user,receiveRequestActNo,commitDate); // String pc = "("; // for (MaterialPacking materialPacking : boxList) { diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/PurchaseReturnServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/PurchaseReturnServiceImpl.java index 55ca0cb..81852f1 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/PurchaseReturnServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/PurchaseReturnServiceImpl.java @@ -19,6 +19,7 @@ public class PurchaseReturnServiceImpl implements PurchaseReturnService { @Autowired private PurchaseReturnServiceDao purchaseReturnServiceDao; + @Autowired private ToSapDao toSapDao; @Autowired @@ -87,7 +88,7 @@ public class PurchaseReturnServiceImpl implements PurchaseReturnService { */ @Override @Transactional - public String completeReceiveRequest(String siteName, String user, String receiverequestname) throws Exception { + public String completeReceiveRequest(String siteName, String user, String receiverequestname, String commitDate) throws Exception { //查找需要过账的采购退库信息 List purchaseReturnBoxList = purchaseReturnServiceDao.getPurchaseReturnBoxList(siteName, receiverequestname); //将 MaterialPacking的MaterialPackingName放入一个List中 @@ -97,7 +98,7 @@ public class PurchaseReturnServiceImpl implements PurchaseReturnService { } //过账SAP // String undoId = toSAPServiceImpl.orderStockOut(receiverequestname, siteName, user, purchaseReturnBoxListName); - String undoId = toSAPServiceImpl.OrderStockBackOut(receiverequestname, siteName, user); + String undoId = toSAPServiceImpl.OrderStockBackOut(receiverequestname, siteName, user,commitDate); // String undoId = "111"; //更新库存状态 toSapDao.updateStockState(purchaseReturnBoxList, "StockOut", undoId, user); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ReturnStockIntoServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ReturnStockIntoServiceImpl.java index 0a0d1d1..b2df097 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ReturnStockIntoServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ReturnStockIntoServiceImpl.java @@ -813,7 +813,7 @@ public class ReturnStockIntoServiceImpl implements ReturnStockInService { aimErpLocation = boxList.get(0).getErpLocation(); aimLOcationName = boxList.get(0).getLocationName(); billCode = ToSAPServiceImpl.NoSourceChangeLocation(arrayList,aimErpFactory, - aimErpLocation, aimLOcationName, eventUser ); + aimErpLocation, aimLOcationName, eventUser, ""); if (billCode.length() == 0) { throw new GlobalException("报送ERP失败,请联系IT处理！"); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/PurchaseReturnService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/PurchaseReturnService.java index 11614a6..709e406 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/PurchaseReturnService.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/PurchaseReturnService.java @@ -15,5 +15,5 @@ public interface PurchaseReturnService { public String getPurPackingInfo(String siteName, String user, String receiverequestname) throws Exception; - public String completeReceiveRequest(String siteName, String user, String receiverequestname) throws Exception; + public String completeReceiveRequest(String siteName, String user, String receiverequestname, String commitDate) throws Exception; }