From c760462578e831c6e90ac2f6c27918e228eb05be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Wed, 16 Apr 2025 16:48:54 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=80=80=E6=96=99?= =?UTF-8?q?=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../management/data/MaterialShipRequest.java | 11 ++++- .../idm/service/impl/ToSAPServiceImpl.java | 43 ++++++++++++++++--- .../controller/ProduceReturnController.java | 6 ++- .../idm/controller/SAPToWMSController.java | 5 ++- .../com/cim/idm/dao/ProduceReturnDao.java | 2 +- .../idm/service/IProduceReturnService.java | 2 +- .../Impl/ProduceReturnServiceImpl.java | 4 +- .../com/cim/idm/dao/ProduceReturnDao.xml | 3 +- 8 files changed, 63 insertions(+), 13 deletions(-) diff --git a/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java b/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java index 782d028..9afdb76 100644 --- a/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java +++ b/zi-wms-data/src/main/java/com/cim/idm/wmspackage/materialshiprequest/management/data/MaterialShipRequest.java @@ -69,8 +69,9 @@ public class MaterialShipRequest extends FieldAccessor implements DataInfo>>>" + sendData); - String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl, "", sendData.toJSONString()); + String sendDatas = sendData.toJSONString(); + String sapreturn = toSAPMessageUtil.sendHttpPost(toSAPMessageUtil.materialChangeLocationUrl, "", sendDatas); org.json.JSONObject receiveJsonObject = new org.json.JSONObject(sapreturn); org.json.JSONObject returnJsonObject = (org.json.JSONObject) receiveJsonObject.get("RETURN"); rcode = returnJsonObject.get("STATUS").toString(); @@ -2485,6 +2497,7 @@ public class ToSAPServiceImpl { erplog.setEventName("MES物料消耗261"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -2645,6 +2658,7 @@ public class ToSAPServiceImpl { erplog.setEventName("成本中心领料出库201"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -2804,6 +2818,7 @@ public class ToSAPServiceImpl { erplog.setEventName("研发（内部订单）领料出库Z61"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -2940,6 +2955,7 @@ public class ToSAPServiceImpl { erplog.setEventName("销售出库"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -3078,6 +3094,7 @@ public class ToSAPServiceImpl { erplog.setEventName("调拨出库(NLCC)"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -3212,6 +3229,7 @@ public class ToSAPServiceImpl { erplog.setEventName("调拨出库(NLCC)"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -3346,6 +3364,7 @@ public class ToSAPServiceImpl { erplog.setEventName("调拨出库(NLCC)"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -3502,6 +3521,7 @@ public class ToSAPServiceImpl { erplog.setId(uuid.toString()); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -3629,6 +3649,7 @@ public class ToSAPServiceImpl { erplog.setEventName("盘点"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -3795,6 +3816,7 @@ public class ToSAPServiceImpl { erplog.setId(uuid.toString()); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -3958,6 +3980,7 @@ public class ToSAPServiceImpl { erplog.setId(uuid.toString()); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -4107,6 +4130,7 @@ public class ToSAPServiceImpl { erplog.setId(uuid.toString()); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -4270,6 +4294,7 @@ public class ToSAPServiceImpl { erplog.setId(uuid.toString()); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -4418,6 +4443,7 @@ public class ToSAPServiceImpl { erplog.setId(uuid.toString()); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -4552,6 +4578,7 @@ public class ToSAPServiceImpl { erplog.setId(uuid.toString()); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -4674,6 +4701,7 @@ public class ToSAPServiceImpl { erplog.setId(uuid.toString()); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData.toJSONString()); erplog.setSendMsg2(sendData.toJSONString()); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); @@ -4698,20 +4726,20 @@ public class ToSAPServiceImpl { */ public String ReturnStockInNew(String siteName, String eventUser, String shipRequestName, String commitDate, String opCode) throws Exception { String sql="SELECT T.RECEIVEREQUESTNAME ," + SystemPropHelper.CR+ - " T.PRODUCTORDER," +SystemPropHelper.CR+ + " D.REQUESTNAME PRODUCTORDER," +SystemPropHelper.CR+ " T.ERPFACTORY, " + SystemPropHelper.CR+ " T.ERPLOCATION, " + SystemPropHelper.CR+ " T.MATERIALSPECNAME, " + SystemPropHelper.CR+ " T.UNIT, " + SystemPropHelper.CR+ " T.PACKINGGRADE," + SystemPropHelper.CR+ " SUM(T.MATERIALQUANTITY) AS MATERIALQUANTITY" + SystemPropHelper.CR+ - " FROM MATERIALPACKING T " + SystemPropHelper.CR+ + " FROM MATERIALPACKING T LEFT JOIN BS_MES_SHIPPED D ON D.LOTNAME = T.MATERIALPACKINGNAME" + SystemPropHelper.CR+ " WHERE 1 = 1 " + SystemPropHelper.CR+ " AND T.receiveActNo = :SHIPREQUESTNAME" + SystemPropHelper.CR+ " AND T.SITENAME = :SITENAME " + SystemPropHelper.CR+ " AND T.STOCKSTATE = 'Created' " + SystemPropHelper.CR+ - "GROUP BY T.RECEIVEREQUESTNAME, T.PRODUCTORDER, T.ERPFACTORY,T.ERPLOCATION, " + SystemPropHelper.CR+ - " T.MATERIALSPECNAME,T.UNIT,PACKINGGRADE "; + "GROUP BY T.RECEIVEREQUESTNAME, D.REQUESTNAME, T.ERPFACTORY,T.ERPLOCATION, " + SystemPropHelper.CR+ + " T.MATERIALSPECNAME,T.UNIT,T.PACKINGGRADE "; Map hashMap = new HashMap(); hashMap.put("SITENAME", siteName); // hashMap.put("SHIPREQUESTNAME", shipRequestName); @@ -4746,6 +4774,7 @@ public class ToSAPServiceImpl { erplog.setEventName("ReturnStockIn"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(shipRequestName); + erplog.setSendMsg(makeReturnStockIn); erplog.setSendMsg2(makeReturnStockIn); erplog.setSendMsg(makeReturnStockIn); erplog.setReturnMsg2(sapreturn); @@ -4884,6 +4913,7 @@ public class ToSAPServiceImpl { erplog.setEventName("PurStockIn"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(shipRequestName); + erplog.setSendMsg(moveLibraryInfo); erplog.setSendMsg2(moveLibraryInfo); erplog.setSendMsg(moveLibraryInfo); erplog.setReturnMsg2(sapreturn); @@ -4956,6 +4986,7 @@ public class ToSAPServiceImpl { erplog.setEventName("PurStockIn"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(shipRequestName); + erplog.setSendMsg(moveLibraryInfo); erplog.setSendMsg2(moveLibraryInfo); erplog.setSendMsg(moveLibraryInfo); erplog.setReturnMsg2(sapreturn); @@ -5130,6 +5161,7 @@ public class ToSAPServiceImpl { erplog.setEventName("iqcResultFeekback"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData); erplog.setSendMsg2(sendData); erplog.setSendMsg(sendData); erplog.setReturnMsg2(sapreturn); @@ -5228,6 +5260,7 @@ public class ToSAPServiceImpl { erplog.setEventName("QMSResultFeekback"); erplog.setInterfaceTime(TimeStampUtil.getCurrentTime(TimeStampUtil.FORMAT_DEFAULT)); erplog.setMessageId(UUID.randomUUID().toString()); + erplog.setSendMsg(sendData); erplog.setSendMsg2(sendData); erplog.setReturnMsg2(sapreturn); erplog.setResultCode(rcode); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java index 7fc27e0..9380b25 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/ProduceReturnController.java @@ -201,8 +201,12 @@ public class ProduceReturnController { public AjaxResult getShipCode(@RequestBody JSONObject in ){ MaterialPacking materialPacking = JSON.toJavaObject(in, MaterialPacking.class); String materialPackingName = materialPacking.getMaterialPackingName(); + String erpLocation = materialPacking.getErpLocation(); + String erpFactory = materialPacking.getErpFactory(); + String locationName = materialPacking.getLocationName(); + String materialSpecName = materialPacking.getMaterialSpecName(); // 查看标签 - List> list2 = produceReturnService.getMaterialPacking(materialPackingName); + List> list2 = produceReturnService.getMaterialPacking(materialPackingName, erpLocation, erpFactory, locationName); // 判断条码是否存在且状态是在库 if (list2.size() > 1) { throw new GlobalException("条码不止一个！"); 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 e8f5f7f..74fc38e 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 @@ -999,6 +999,7 @@ public class SAPToWMSController { String createDate = MapUtils.getString(data, "CRDAT"); // 创建日期 String createTime = MapUtils.getString(data, "CRTIM"); // 创建时间 String moveState = MapUtils.getString(data, "BWART"); //移动类型 BWART + String areaName = MapUtils.getString(data, "AREANAME"); //车间 String sqlCheck =" SELECT * FROM materialshiprequest m WHERE shiprequestname =:SHIPREQUESTNAME "; Map selectMap= new HashMap(); selectMap.put("SHIPREQUESTNAME", shipRequestName); @@ -1017,6 +1018,7 @@ public class SAPToWMSController { bindMap.put("createUser", createUser); bindMap.put("createTime", createDate+" "+createTime); bindMap.put("erpFactory", erpFactory); + bindMap.put("areaName", areaName); createInfo.setUserColumns(bindMap); EventInfo eventInfo = new EventInfo(); @@ -1043,7 +1045,8 @@ public class SAPToWMSController { bindMap.put("createUser", createUser); bindMap.put("createTime", createTime); bindMap.put("erpFactory", erpFactory); - + bindMap.put("areaName", areaName); + info.setUserColumns(bindMap); EventInfo eventInfo = new EventInfo(); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/dao/ProduceReturnDao.java b/zi-wms-pda/src/main/java/com/cim/idm/dao/ProduceReturnDao.java index eef1d5c..3c5d9b7 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/dao/ProduceReturnDao.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/dao/ProduceReturnDao.java @@ -18,7 +18,7 @@ public interface ProduceReturnDao { * @return 物料数据 */ @MapKey("materialPacking") - List> getMaterialPacking(@Param("name") String materialPackingName); + List> getMaterialPacking(@Param("name") String materialPackingName, @Param("erpLocation") String erpLocation, @Param("erpFactory") String erpFactory, @Param("locationName") String locationName); /** * 获取 mes-ship 表 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/IProduceReturnService.java b/zi-wms-pda/src/main/java/com/cim/idm/service/IProduceReturnService.java index 34fabd7..e916c1e 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/IProduceReturnService.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/IProduceReturnService.java @@ -11,7 +11,7 @@ public interface IProduceReturnService { * @param materialPackingName 码 * @return 物料数据 */ - List> getMaterialPacking(String materialPackingName); + List> getMaterialPacking(String materialPackingName, String erpLocation, String erpFactory, String locationName); /** * 获取 mes-ship 表 diff --git a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProduceReturnServiceImpl.java b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProduceReturnServiceImpl.java index 0281c91..c48126f 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProduceReturnServiceImpl.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/service/Impl/ProduceReturnServiceImpl.java @@ -15,8 +15,8 @@ public class ProduceReturnServiceImpl implements IProduceReturnService { private ProduceReturnDao produceReturnDao; @Override - public List> getMaterialPacking(String materialPackingName) { - return produceReturnDao.getMaterialPacking(materialPackingName); + public List> getMaterialPacking(String materialPackingName, String erpLocation, String erpFactory, String locationName) { + return produceReturnDao.getMaterialPacking(materialPackingName, erpLocation, erpFactory, locationName); } @Override diff --git a/zi-wms-pda/src/main/resources/com/cim/idm/dao/ProduceReturnDao.xml b/zi-wms-pda/src/main/resources/com/cim/idm/dao/ProduceReturnDao.xml index d34aa3f..e6156a0 100644 --- a/zi-wms-pda/src/main/resources/com/cim/idm/dao/ProduceReturnDao.xml +++ b/zi-wms-pda/src/main/resources/com/cim/idm/dao/ProduceReturnDao.xml @@ -5,7 +5,8 @@