10539622/2025-03-JS-SDK-svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

add:增加现场仓

Browse Source
This commit is contained in:
郭飞 2025-04-07 16:19:42 +08:00
parent 49b9e19090
commit f2f04b2c30
3 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zi-wms-inf/src/main/java/com/cim/idm/util/ToSAPMessageUtil.java
View File

@ -84,16 +84,16 @@ public class ToSAPMessageUtil {
// public static String DNUrl = "http://172.22.10.53:51000/RESTAdapter/sd023/api"; // 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 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 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 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 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 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 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 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 materilUndoUrl = "http://218.93.237.50:51000/RESTAdapter/mm068/api";
public static String userName = ""; public static String userName = "";
public static String sd023(String user, Map<String,?> bodyData, List<Map<String,Object>> itemsData) { public static String sd023(String user, Map<String,?> bodyData, List<Map<String,Object>> itemsData) {

9
zi-wms-pda/src/main/java/com/cim/idm/controller/CacheWareController.java
View File

@ -66,10 +66,11 @@ public class CacheWareController {
String userid = (String)params.get("USERID"); String userid = (String)params.get("USERID");
String materialspecname = (String)params.get("MATERIALSPECNAME"); String materialspecname = (String)params.get("MATERIALSPECNAME");
String makedatet = (String) params.get("MAKEDATE"); String makedatet = (String) params.get("MAKEDATE");
// @TODO 原代码异常：Timestamp makedate = Timestamp.valueOf(makedatet); Timestamp makedate = Timestamp.valueOf(makedatet);
Timestamp makedate = Timestamp.from( // @TODO 原代码异常：Timestamp makedate = Timestamp.valueOf(makedatet);
LocalDateTime.parse(makedatet, DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSSZ")) // Timestamp makedate = Timestamp.from(
.atZone(ZoneOffset.UTC).toInstant()); // 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"); String is_sure = (String)params.get("IS_SURE");
Map<String, Object> bindMap = new HashMap<String, Object>(); Map<String, Object> bindMap = new HashMap<String, Object>();

36
zi-wms-pda/src/main/java/com/cim/idm/controller/LabelController.java
View File

@ -508,10 +508,10 @@ public class LabelController {
return AjaxResult.me().setSuccess(true).setMessage("业助更新成功"); return AjaxResult.me().setSuccess(true).setMessage("业助更新成功");
} }
@RequestMapping(value = "/checkMaterialPack", method = RequestMethod.POST) @RequestMapping(value = "/checkMaterialPack", method = RequestMethod.POST)
public BaseResponse<Map<String, Object>> checkMaterial(@RequestBody Map<String,Object> param){ public BaseResponse<Map<String, Object>> checkMaterial(@RequestBody Map<String,Object> param){
String siteName = (String)param.get("SITENAME"); String siteName = (String)param.get("SITENAME");
String materialpackingname = (String)param.get("MATERIALPACKINGNAME"); String materialpackingname = (String)param.get("MATERIALPACKINGNAME");
String materialspecname = (String)param.get("MATERIALSPECNAME"); String materialspecname = (String)param.get("MATERIALSPECNAME");
@ -520,26 +520,26 @@ public class LabelController {
String customno = (String)param.get("CUSTOMNO"); String customno = (String)param.get("CUSTOMNO");
String user = (String)param.get("user"); String user = (String)param.get("user");
String is_check = (String)param.get("IS_CHECK"); String is_check = (String)param.get("IS_CHECK");
SetSpecEventInfo info = new SetSpecEventInfo(); SetSpecEventInfo info = new SetSpecEventInfo();
Map<String, Object> bindMap = new HashMap<String, Object>(); Map<String, Object> bindMap = new HashMap<String, Object>();
bindMap.put("MATERIALPACKINGNAME", materialpackingname); bindMap.put("MATERIALPACKINGNAME", materialpackingname);
bindMap.put("MATERIALSPECNAME", materialspecname); bindMap.put("MATERIALSPECNAME", materialspecname);
bindMap.put("CHARGE", charge); bindMap.put("CHARGE", charge);
bindMap.put("IS_CHECK", is_check); bindMap.put("IS_CHECK", is_check);
String uptSql = "UPDATE\r\n" + String uptSql = "UPDATE\r\n" +
" MATERIALPACKINGCHECK mk\r\n" + " MATERIALPACKINGCHECK mk\r\n" +
"SET\r\n" + "SET\r\n" +
" mk.IS_CHECK = :IS_CHECK \r\n" + " mk.IS_CHECK = :IS_CHECK \r\n" +
"WHERE \r\n" + "WHERE \r\n" +
" mk.MATERIALPACKINGNAME = :MATERIALPACKINGNAME\r\n" + " mk.MATERIALPACKINGNAME = :MATERIALPACKINGNAME\r\n" +
" AND mk.MATERIALSPECNAME = :MATERIALSPECNAME\r\n" + " AND mk.MATERIALSPECNAME = :MATERIALSPECNAME\r\n" +
" AND mk.CHARGE = :CHARGE"; " AND (mk.CHARGE = :CHARGE OR :CHARGE IS NULL)";
IDMFrameServiceProxy.getSqlTemplate().update(uptSql, bindMap); IDMFrameServiceProxy.getSqlTemplate().update(uptSql, bindMap);
Map<String, Object> bindMap2 = new HashMap<String, Object>(); Map<String, Object> bindMap2 = new HashMap<String, Object>();
bindMap2.put("MATERIALPACKINGNAME", materialpackingname); bindMap2.put("MATERIALPACKINGNAME", materialpackingname);
// bindMap2.put("CHARGE", charge); // bindMap2.put("CHARGE", charge);
@ -550,10 +550,10 @@ public class LabelController {
MaterialPackingKey mk = new MaterialPackingKey(siteName,materialpackingname); MaterialPackingKey mk = new MaterialPackingKey(siteName,materialpackingname);
EventInfo makeEventInfo = new EventInfoUtil().makeEventInfo("UpdateCareerAssistance", user, "UpdateCareerAssistance"); EventInfo makeEventInfo = new EventInfoUtil().makeEventInfo("UpdateCareerAssistance", user, "UpdateCareerAssistance");
MaterialPackingServiceProxy.getMaterialPackingService().setEvent(mk, makeEventInfo, setEventInfo); MaterialPackingServiceProxy.getMaterialPackingService().setEvent(mk, makeEventInfo, setEventInfo);
BaseResponse returnOK = RespGenerator.returnOK(param); BaseResponse returnOK = RespGenerator.returnOK(param);
return returnOK; return returnOK;
} }
/** /**