From 9a778c95e43ce970d3d2bba4215f9c6c81493af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Thu, 8 May 2025 19:04:44 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E8=BF=87?= =?UTF-8?q?=E8=B4=A6=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cim/idm/service/impl/ToSAPServiceImpl.java | 16 ++++++++-------- .../controller/AllocateStockInController.java | 2 +- .../cim/idm/controller/SAPToWMSController.java | 7 +++++-- .../com/cim/idm/model/BarcodeListByInvoice.java | 2 ++ .../cim/idm/service/AllocateStockInService.java | 2 +- .../service/Impl/AllocateStockInServiceImpl.java | 4 ++-- .../cim/idm/service/Impl/InvoiceServiceImpl.java | 2 +- .../service/Impl/ReturnStockIntoServiceImpl.java | 2 +- .../idm/service/Impl/TransferInServiceImpl.java | 4 ++-- 9 files changed, 23 insertions(+), 18 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 a8fb215..f339b41 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 @@ -1110,7 +1110,7 @@ public class ToSAPServiceImpl { } //调拨入库（对于SAP,不同组织间调拨相当于采购入库，移动类型 101） - public String makeAlloctionStockIn(List> queryForList, String user) throws JsonMappingException, JsonProcessingException { + public String makeAlloctionStockIn(List> queryForList, String user, String commitDate) throws JsonMappingException, JsonProcessingException { if (queryForList == null || queryForList.size() < 1) { return ""; @@ -1178,12 +1178,12 @@ public class ToSAPServiceImpl { item.put("UMMAT_KDPOS", mm.get("SENDSALESORDERDETAILNO")); itemData.add(item); } - String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData,TimeStampUtil.getCurrentTime("yyyyMMdd")); + String sendData = ToSAPMessageUtil.mm067(user, bodyData, itemData,commitDate); return sendData; } - public String AlloctionStockIn(String shipRequestName, String siteName, String eventUser,String erpLocation) throws Exception { + public String AlloctionStockIn(String shipRequestName, String siteName, String eventUser,String erpLocation,String commitDate) throws Exception { String sql=" SELECT m.SHIPREQUESTNAME ,\r\n" + " m3.SHIPREQUESTDETAILNAME ,\r\n" + " m.MATERIALSPECNAME ,\r\n" + @@ -1218,7 +1218,7 @@ public class ToSAPServiceImpl { hashMap.put("ERPLOCATION", erpLocation); List> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql.toString(), hashMap); - String makeAlloctionStockIn = makeAlloctionStockIn(queryForList, eventUser); + String makeAlloctionStockIn = makeAlloctionStockIn(queryForList, eventUser,commitDate); String sapreturn = ""; String rcode = ""; String rmsg = ""; @@ -1882,7 +1882,7 @@ public class ToSAPServiceImpl { // billCode = PurStockIn(receiveRequestName, siteName, eventUser, reActo, args/* ,overReceiveControls */); break; case "NLCC" : //调拨入库 - billCode = AlloctionStockIn(receiveRequestName, siteName, eventUser,""); + billCode = AlloctionStockIn(receiveRequestName, siteName, eventUser,"",""); break; default : break; @@ -5101,7 +5101,7 @@ public class ToSAPServiceImpl { hashMap.put("SHIPREQUESTNAME", opCode); List> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql.toString(), hashMap); //根据不同的类型进行处理 - String makeReturnStockIn = makeReturnStockIn(queryForList, eventUser); + String makeReturnStockIn = makeReturnStockIn(queryForList, eventUser,commitDate); String sapreturn = ""; String rcode = ""; @@ -5145,7 +5145,7 @@ public class ToSAPServiceImpl { } - public String makeReturnStockIn(List> list, String eventUser) throws JsonMappingException, JsonProcessingException { + public String makeReturnStockIn(List> list, String eventUser, String commitDate) throws JsonMappingException, JsonProcessingException { if (list == null || list.size() < 1) { return ""; } @@ -5204,7 +5204,7 @@ public class ToSAPServiceImpl { itemsData.add(item); } - String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemsData,TimeStampUtil.getCurrentTime("yyyyMMdd")); + String sendData = ToSAPMessageUtil.mm067(eventUser, bodyData, itemsData,commitDate); return sendData; } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/AllocateStockInController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/AllocateStockInController.java index 4204b0b..78e209f 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/AllocateStockInController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/AllocateStockInController.java @@ -48,7 +48,7 @@ public class AllocateStockInController { allocateStockInService.allocateStockIn(barcodeListByInvoice.getShipRequestName(), barcodeListByInvoice.getSiteName(), barcodeListByInvoice.getUserId(), - barcodeListByInvoice.getErpLocation(),barcodeListByInvoice.getLocationName()); + barcodeListByInvoice.getErpLocation(),barcodeListByInvoice.getLocationName(),barcodeListByInvoice.getCommitDate()); } catch (Exception e) { return RespGenerator.returnError(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 1b6ac1e..c38b909 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 @@ -1405,6 +1405,8 @@ public class SAPToWMSController { BigDecimal bigRequestQuantity2 = new BigDecimal(requestQuantity.trim()); createReceiveInfo.setRequestQuantity(bigRequestQuantity2.doubleValue()); createReceiveInfo.setReceivedQuantity(0); + + bindMapItem.put("materialUnit", unit); createReceiveInfo.setUserColumns(bindMapItem); EventInfo eventReciveInfo = new EventInfo(); eventReciveInfo.setEventUser(createUser); @@ -1481,8 +1483,7 @@ public class SAPToWMSController { eventInfo.setEventName("updateMaterialShipRequest"); - - // 如果是成本退 + // 如果是成本中心退 if("07".equals(shipRequestType) || "03".equals(shipRequestType)) { com.cim.idm.wmspackage.receiverequestdetail.management.info.SetEventInfo setReciveInfo = new com.cim.idm.wmspackage.receiverequestdetail.management.info.SetEventInfo(); MaterialReceiveRequestDetailKey receiveRequestDetailKey = new MaterialReceiveRequestDetailKey(); @@ -1490,6 +1491,8 @@ public class SAPToWMSController { receiveRequestDetailKey.setReceiveRequestDetailName(shipRequestDetailName); receiveRequestDetailKey.setReceiveRequestName(shipRequestName); receiveRequestDetailKey.setSiteName(sitename); + + bindMapItem.put("materialUnit", unit); setReciveInfo.setUserColumns(bindMapItem); ReceiveRequestDetailServiceProxy.getReceiveRequestDetailService().setEvent(receiveRequestDetailKey, eventInfo, setReciveInfo); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/model/BarcodeListByInvoice.java b/zi-wms-pda/src/main/java/com/cim/idm/model/BarcodeListByInvoice.java index 8caa0ad..f1dd56b 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/model/BarcodeListByInvoice.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/model/BarcodeListByInvoice.java @@ -27,6 +27,8 @@ public class BarcodeListByInvoice { private String opType; + private String commitDate; + private List boxList; diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/AllocateStockInService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/AllocateStockInService.java index 02925d5..39381f1 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/AllocateStockInService.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/AllocateStockInService.java @@ -11,5 +11,5 @@ public interface AllocateStockInService { * @return * @throws Exception */ - public String allocateStockIn(String shipRequestName, String siteName, String user,String erpLocation ,String locationName) throws Exception; + public String allocateStockIn(String shipRequestName, String siteName, String user,String erpLocation ,String locationName, String commitDate) throws Exception; } diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/AllocateStockInServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/AllocateStockInServiceImpl.java index e6b4bc6..37d57f9 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/AllocateStockInServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/AllocateStockInServiceImpl.java @@ -40,10 +40,10 @@ public class AllocateStockInServiceImpl implements AllocateStockInService { */ @Override @Transactional - public String allocateStockIn(String shipRequestName, String siteName, String user, String erpLocation,String locationName) throws Exception { + public String allocateStockIn(String shipRequestName, String siteName, String user, String erpLocation,String locationName,String commitDate) throws Exception { log.debug("AllocateStockInServiceImpl.allocateStockIn {} {} {} {}", shipRequestName, siteName, user, erpLocation); //提交SAP过账 - String undoId = toSAPServiceImpl.AlloctionStockIn(shipRequestName, siteName, user, erpLocation); + String undoId = toSAPServiceImpl.AlloctionStockIn(shipRequestName, siteName, user, erpLocation,commitDate); //基于单据获取要操作的Box List boxList = toSapDao.getBoxListByShipRequestName(shipRequestName); //保存物料凭证 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 898ec54..ea2e4a4 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 @@ -569,7 +569,7 @@ public class InvoiceServiceImpl implements InvoiceService { case "06"://成本中心领料 // billCode=toSAPService.orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList); -// billCode=orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList,commitDate); + billCode=orderStockOut(shipRequestName, "SDK", eventUser,materialPackingKeyList,commitDate); //抛送MES数据 untils.sendMaterialInfoToMES_NEW(shipRequestName, "", materialPackingKeyList); //更新MES管芯数据 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 485d882..ffaad40 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, commitDate); if (billCode.length() == 0) { throw new GlobalException("报送ERP失败,请联系IT处理！"); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/TransferInServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/TransferInServiceImpl.java index 6e4eec6..b6d0b80 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/TransferInServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/TransferInServiceImpl.java @@ -225,7 +225,7 @@ public class TransferInServiceImpl implements TransferInService { List> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql, new HashMap ()); for (Map map : queryForList) { String shiprequestName = map.get("SHIPREQUESTNAME").toString(); - String billCode = toSAPServiceImpl.AlloctionStockIn(shiprequestName, "SDK", user, erpLocation); + String billCode = toSAPServiceImpl.AlloctionStockIn(shiprequestName, "SDK", user, erpLocation,commitDate); // String billCode = UUID.randomUUID().toString(); //判断是否获得物料凭证 if (billCode == null || "".equals(billCode)) { @@ -400,7 +400,7 @@ public class TransferInServiceImpl implements TransferInService { List> queryForList = IDMFrameServiceProxy.getSqlTemplate().queryForList(sql, new HashMap ()); for (Map map : queryForList) { String shiprequestName = map.get("SHIPREQUESTNAME").toString(); - String billCode = toSAPServiceImpl.AlloctionStockIn(shiprequestName, "SDK", user, erpLocation); + String billCode = toSAPServiceImpl.AlloctionStockIn(shiprequestName, "SDK", user, erpLocation,commitDate); // String billCode = UUID.randomUUID().toString(); //判断是否获得物料凭证 if (billCode == null || "".equals(billCode)) {