From 979b9d02581400d221442a1bae22e02421e525f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Tue, 1 Apr 2025 16:50:31 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=B4=A8=E6=A3=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../idm/service/impl/ToSAPServiceImpl.java | 4 +++- .../com/cim/idm/util/ToSAPMessageUtil.java | 20 +++++++++++-------- .../idm/controller/MESToWMSController.java | 2 +- .../com/cim/idm/controller/QMSController.java | 11 ++++++++-- 4 files changed, 25 insertions(+), 12 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 5949c5e..55ec298 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 @@ -4815,12 +4815,14 @@ public class ToSAPServiceImpl { .append(" m.UNIT ,").append(SystemPropHelper.CR) .append(" sum(m.MATERIALQUANTITY) MATERIALQUANTITY").append(SystemPropHelper.CR) .append(" FROM MATERIALPACKING m ").append(SystemPropHelper.CR) - .append(" WHERE m.RECEIVEACTNO = :RECEIVEACTNO AND m.SITENAME = :SITENAME ").append(SystemPropHelper.CR) +// .append(" WHERE m.RECEIVEACTNO = :RECEIVEACTNO AND m.SITENAME = :SITENAME ").append(SystemPropHelper.CR) + .append(" WHERE m.MESSAGEID = :RECEIVEACTNO AND m.SITENAME = :SITENAME").append(SystemPropHelper.CR) .append(" AND m.MATERIALSPECNAME = :MATERIALSPECNAME ").append(SystemPropHelper.CR) .append(" AND ( m.PACKINGGRADE IS NULL or m.PACKINGGRADE <> :pqcResult ) ").append(SystemPropHelper.CR) .append("GROUP BY m.MATERIALSPECNAME ,m.ERPFACTORY ,m.ERPLOCATION ,m.PACKINGGRADE,m.UNIT "); Map hashMap = new HashMap(); +// hashMap.put("RECEIVEACTNO", receiveActNumber); hashMap.put("RECEIVEACTNO", receiveActNumber); hashMap.put("MATERIALSPECNAME", materialCode); hashMap.put("SITENAME", siteName); 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 4028f5b..f02a292 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 @@ -79,17 +79,21 @@ public class ToSAPMessageUtil { // SDK // 获取接口返回token public static String authStr = ""; - public static String baseUrl = "http://172.22.10.53:51000/RESTAdapter/OAuthServer"; -// public static String baseUrl = "http://172.22.10.53:8101/RESTAdapter/OAuthServer"; + // public static String baseUrl = "http://172.22.10.53:8101/RESTAdapter/OAuthServer"; // public static String baseUrl = "http://172.22.10.53:8003/RESTAdapter/OAuthServer"; // public static String DNUrl = "http://172.22.10.53:51000/RESTAdapter/sd023/api"; - // DN回传接口 - public static String DNUrl = "http://172.22.10.53:51000/RESTAdapter/sd023/api"; - // 货物移动接口 - public static String materialChangeLocationUrl = "http://172.22.10.53:51000/RESTAdapter/mm067/api"; - // 物料凭证冲销接口 - public static String materilUndoUrl = "http://172.22.10.53:51000/RESTAdapter/mm068/api"; +// 内网地址 +// public static String baseUrl = "http://172.22.10.53:51000/RESTAdapter/OAuthServer"; // 内网 +// public static String DNUrl = "http://172.22.10.53:51000/RESTAdapter/sd023/api";// 内网 // DN回传接口 +// public static String materialChangeLocationUrl = "http://172.22.10.53:51000/RESTAdapter/mm067/api"; // 货物移动接口 +// public static String materilUndoUrl = "http://172.22.10.53:51000/RESTAdapter/mm068/api"; // 物料凭证冲销接口 + + // 外网地址 + public static String baseUrl = "http://218.93.237.50:51000/RESTAdapter/OAuthServer"; + public static String DNUrl = "http://218.93.237.50:51000/RESTAdapter/sd023/api"; + public static String materialChangeLocationUrl = "http://218.93.237.50:51000/RESTAdapter/mm067/api"; + public static String materilUndoUrl = "http://218.93.237.50:51000/RESTAdapter/mm068/api"; public static String userName = ""; public static String sd023(String user, Map bodyData, List> itemsData) { diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/MESToWMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/MESToWMSController.java index 8848f05..8d4517e 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/MESToWMSController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/MESToWMSController.java @@ -35,7 +35,7 @@ public class MESToWMSController { } } - @ApiOperation(value = "物料出库请求") + @ApiOperation(value = "二次确认物料出库请求") @RequestMapping(value = "/meswms_materialout_request", method = RequestMethod.POST) public AjaxResult materialOutByMES(@RequestBody JSONArray in) { log.info("Received material out request: {}", in.toJSONString()); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java index 23b022a..50f531d 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/QMSController.java @@ -272,7 +272,7 @@ public class QMSController { loginfo.setInterfaceTime(ConvertUtil.getCurrTime("yyyy-MM-dd HH:mm:ss")); loginfo.setSendMsg(in.toJSONString()); loginfo.setEventName("pqcSyncdata2"); - + String siteName = "SDK"; SetEventInfo setEventInfo = new SetEventInfo(); EventInfo makeEventInfo = new EventInfoUtil().makeEventInfo("iqcSyncdata", "", "iqcSyncdata"); @@ -343,7 +343,7 @@ public class QMSController { setEventInfo.setUserColumns(bindMap); //eventInfo.setEventTime(Timestamp.valueOf(pqcResultDate)); eventInfo.setEventUser(user); - if ("0".equals(tpType)) {//到货单 + if ("0".equals(tpType)) {//采购到货单, 领料退库，产成品入库 // 获取JSON数组 JSONArray jsonArray = jb.getJSONArray("lotList"); // arrayName为JSON数组的键名 @@ -361,6 +361,8 @@ public class QMSController { } else { mpList.add(new MaterialPackingKey(queryForList.get(0).get("SITENAME").toString(), queryForList.get(0).get("MATERIALPACKINGNAME").toString())); +// MaterialPackingServiceProxy.getMaterialPackingService().setEvent(new MaterialPackingKey(queryForList.get(j).get("SITENAME").toString(), +// queryForList.get(j).get("MATERIALPACKINGNAME").toString()), makeEventInfo, setEventInfo); success ++; } } @@ -377,12 +379,17 @@ public class QMSController { for (int j = 0; j < queryForList.size(); j++) { mpList.add(new MaterialPackingKey(queryForList.get(j).get("SITENAME").toString(), queryForList.get(j).get("MATERIALPACKINGNAME").toString())); +// MaterialPackingServiceProxy.getMaterialPackingService().setEvent(new MaterialPackingKey(queryForList.get(j).get("SITENAME").toString(), +// queryForList.get(j).get("MATERIALPACKINGNAME").toString()), makeEventInfo, setEventInfo); success ++; } } } else { throw new CustomException("Common","无单据信息和批次信息"); } + // 将订单的质检结果传给SAP + String undoId = toSAPService.iqcResultFeekback(siteName,commonNumber,materialCode,pqcResult,pqcResultDate,user, + exceptionHandling,specialState); } else if ("6".equals(tpType)) {//投放计划单