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 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<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 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<String, Object> bindMap = new HashMap<String, Object>();

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

@ -536,7 +536,7 @@ public class LabelController {
"WHERE \r\n" +
" mk.MATERIALPACKINGNAME = :MATERIALPACKINGNAME\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);
@ -552,7 +552,7 @@ public class LabelController {
MaterialPackingServiceProxy.getMaterialPackingService().setEvent(mk, makeEventInfo, setEventInfo);
BaseResponse returnOK = RespGenerator.returnOK(param);
return returnOK;
return returnOK;
}