From f2f04b2c30ad2664de399ba8d83356423002d296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E9=A3=9E?= Date: Mon, 7 Apr 2025 16:19:42 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E7=8E=B0=E5=9C=BA?= =?UTF-8?q?=E4=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cim/idm/util/ToSAPMessageUtil.java | 16 ++++----- .../idm/controller/CacheWareController.java | 9 ++--- .../cim/idm/controller/LabelController.java | 36 +++++++++---------- 3 files changed, 31 insertions(+), 30 deletions(-) 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 f02a292..f936ce6 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 @@ -84,16 +84,16 @@ public class ToSAPMessageUtil { // public static String DNUrl = "http://172.22.10.53:51000/RESTAdapter/sd023/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://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 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/CacheWareController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java index 0de736b..f11ed1d 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java @@ -66,10 +66,11 @@ public class CacheWareController { String userid = (String)params.get("USERID"); String materialspecname = (String)params.get("MATERIALSPECNAME"); String makedatet = (String) params.get("MAKEDATE"); - // @TODO 原代码异常：Timestamp makedate = Timestamp.valueOf(makedatet); - Timestamp makedate = Timestamp.from( - LocalDateTime.parse(makedatet, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")) - .atZone(ZoneOffset.UTC).toInstant()); + Timestamp makedate = Timestamp.valueOf(makedatet); +// @TODO 原代码异常：Timestamp makedate = Timestamp.valueOf(makedatet); +// Timestamp makedate = Timestamp.from( +// LocalDateTime.parse(makedatet, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")) +// .atZone(ZoneOffset.UTC).toInstant()); String is_sure = (String)params.get("IS_SURE"); Map bindMap = new HashMap(); diff --git a/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java b/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java index 57bc3a6..285882f 100644 --- a/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java +++ b/zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java @@ -508,10 +508,10 @@ public class LabelController { return AjaxResult.me().setSuccess(true).setMessage("业助更新成功"); } - + @RequestMapping(value = "/checkMaterialPack", method = RequestMethod.POST) public BaseResponse> checkMaterial(@RequestBody Map param){ - + String siteName = (String)param.get("SITENAME"); String materialpackingname = (String)param.get("MATERIALPACKINGNAME"); String materialspecname = (String)param.get("MATERIALSPECNAME"); @@ -520,26 +520,26 @@ public class LabelController { String customno = (String)param.get("CUSTOMNO"); String user = (String)param.get("user"); String is_check = (String)param.get("IS_CHECK"); - + SetSpecEventInfo info = new SetSpecEventInfo(); Map bindMap = new HashMap(); - + bindMap.put("MATERIALPACKINGNAME", materialpackingname); bindMap.put("MATERIALSPECNAME", materialspecname); bindMap.put("CHARGE", charge); bindMap.put("IS_CHECK", is_check); - - String uptSql = "UPDATE\r\n" + - " MATERIALPACKINGCHECK mk\r\n" + - "SET\r\n" + - " mk.IS_CHECK = :IS_CHECK \r\n" + - "WHERE \r\n" + - " mk.MATERIALPACKINGNAME = :MATERIALPACKINGNAME\r\n" + - " AND mk.MATERIALSPECNAME = :MATERIALSPECNAME\r\n" + - " AND mk.CHARGE = :CHARGE"; - + + String uptSql = "UPDATE\r\n" + + " MATERIALPACKINGCHECK mk\r\n" + + "SET\r\n" + + " mk.IS_CHECK = :IS_CHECK \r\n" + + "WHERE \r\n" + + " mk.MATERIALPACKINGNAME = :MATERIALPACKINGNAME\r\n" + + " AND mk.MATERIALSPECNAME = :MATERIALSPECNAME\r\n" + + " AND (mk.CHARGE = :CHARGE OR :CHARGE IS NULL)"; + IDMFrameServiceProxy.getSqlTemplate().update(uptSql, bindMap); - + Map bindMap2 = new HashMap(); bindMap2.put("MATERIALPACKINGNAME", materialpackingname); // bindMap2.put("CHARGE", charge); @@ -550,10 +550,10 @@ public class LabelController { MaterialPackingKey mk = new MaterialPackingKey(siteName,materialpackingname); EventInfo makeEventInfo = new EventInfoUtil().makeEventInfo("UpdateCareerAssistance", user, "UpdateCareerAssistance"); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(mk, makeEventInfo, setEventInfo); - + BaseResponse returnOK = RespGenerator.returnOK(param); - return returnOK; - + return returnOK; + } /**