root/wuHanXinRui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-09-02 08:53:16 +08:00
parent f3e5960d6e
commit e308532400
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mes/hd/nladmin-system/src/main/java/org/nl/ext/lk/service/impl/WmsToLkServiceImpl.java
View File

@@ -40,15 +40,15 @@ public class WmsToLkServiceImpl implements WmsToLkService {
JSONObject result = new JSONObject(); JSONObject result = new JSONObject();
JSONObject json = new JSONObject(); JSONObject json = new JSONObject();
json.put("mode", mode); json.put("mode", mode);
json.put("station", station); json.put("station", "101");
// 获取立库url // 获取立库url
String lkUrl = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("LK_URL").getValue(); String lkUrl = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("LK_WCS_URL").getValue();
String url = lkUrl + "/wcs/inStoreApply"; String url = lkUrl + "/wcs/inStoreApply";
log.info("入库申请token："+login.getString("token"));
// 建立与立库的通讯连接 // 建立与立库的通讯连接
String resultMsg = HttpRequest.post(url) String resultMsg = HttpRequest.post(url)
.header("Authorization",login.getString("token"))
.body(String.valueOf(json)) .body(String.valueOf(json))
.execute().body(); .execute().body();
result = JSONObject.parseObject(resultMsg); result = JSONObject.parseObject(resultMsg);
@@ -108,9 +108,10 @@ public class WmsToLkServiceImpl implements WmsToLkService {
String lkUrl = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("LK_URL").getValue(); String lkUrl = SpringContextHolder.getBean(ParamServiceImpl.class).findByCode("LK_URL").getValue();
String url = lkUrl + "/wms/inNoticeOrders"; String url = lkUrl + "/wms/inNoticeOrders";
log.info("入库通知单token："+login.getString("token"));
// 建立与立库的通讯连接 // 建立与立库的通讯连接
String resultMsg = HttpRequest.post(url) String resultMsg = HttpRequest.post(url)
.header("Authorization",login.getString("token")) .header("token",login.getString("token"))
.body(String.valueOf(jsonParam)) .body(String.valueOf(jsonParam))
.execute().body(); .execute().body();
result = JSONObject.parseObject(resultMsg); result = JSONObject.parseObject(resultMsg);
@@ -145,7 +146,7 @@ public class WmsToLkServiceImpl implements WmsToLkService {
// 建立与立库的通讯连接 // 建立与立库的通讯连接
String resultMsg = HttpRequest.post(url) String resultMsg = HttpRequest.post(url)
.header("Authorization",login.getString("token")) .header("token",login.getString("token"))
.body(String.valueOf(jsonParam)) .body(String.valueOf(jsonParam))
.execute().body(); .execute().body();
result = JSONObject.parseObject(resultMsg); result = JSONObject.parseObject(resultMsg);
@@ -209,7 +210,7 @@ public class WmsToLkServiceImpl implements WmsToLkService {
// 建立与立库的通讯连接 // 建立与立库的通讯连接
String resultMsg = HttpRequest.post(url) String resultMsg = HttpRequest.post(url)
.header("Authorization",login.getString("token")) .header("token",login.getString("token"))
.body(String.valueOf(jsonParam)) .body(String.valueOf(jsonParam))
.execute().body(); .execute().body();
result = JSONObject.parseObject(resultMsg); result = JSONObject.parseObject(resultMsg);
@@ -242,7 +243,7 @@ public class WmsToLkServiceImpl implements WmsToLkService {
// 建立与立库的通讯连接 // 建立与立库的通讯连接
String resultMsg = HttpRequest.post(url) String resultMsg = HttpRequest.post(url)
.header("Authorization",login.getString("token")) .header("token",login.getString("token"))
.body(String.valueOf(jsonParam)) .body(String.valueOf(jsonParam))
.execute().body(); .execute().body();
result = JSONObject.parseObject(resultMsg); result = JSONObject.parseObject(resultMsg);

4
mes/hd/nladmin-system/src/main/java/org/nl/pda/st/vehicle/service/impl/EmptyVehicleServiceImpl.java
View File

@@ -593,7 +593,7 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
throw new PdaRequestException("点位不能为空！"); throw new PdaRequestException("点位不能为空！");
} }
/*//1、调用立库入库申请 //1、调用立库入库申请
HashMap<String ,String > map = new HashMap<>(); HashMap<String ,String > map = new HashMap<>();
map.put("mode","1"); map.put("mode","1");
map.put("station",point_code); map.put("station",point_code);
@@ -604,7 +604,7 @@ public class EmptyVehicleServiceImpl implements EmptyVehicleService {
if (!"1".equals(result)) { if (!"1".equals(result)) {
throw new PdaRequestException("入库申请失败:" + ret.getString("message")); throw new PdaRequestException("入库申请失败:" + ret.getString("message"));
} }
}*/ }
//查询产品生产下线组盘表 //查询产品生产下线组盘表
JSONArray rows = WQL.getWO("QPAD_EMPTY_VEHICLE").addParam("flag","4").addParam("vehicle_code",vehicle_code).process().getResultJSONArray(0); JSONArray rows = WQL.getWO("QPAD_EMPTY_VEHICLE").addParam("flag","4").addParam("vehicle_code",vehicle_code).process().getResultJSONArray(0);