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

更新

Browse Source
This commit is contained in:
loujf
2022-12-29 15:38:54 +08:00
parent e9abf08ab4
commit 789a2878de
6 changed files with 80 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wms/hd/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/WmsToJnServiceImpl.java
View File

@@ -75,6 +75,9 @@ public class WmsToJnServiceImpl implements WmsToJnService {
String ITEMCODE = dayScheduleObj.getString("ITEMCODE");
//压机编号
String SBDM = dayScheduleObj.getString("SBDM");
if (StrUtil.isEmpty(SBDM)) {
throw new BadRequestException("压机编号为空！");
}
JSONObject materialObj = material_table.query("material_code ='" + ITEMCODE + "'").uniqueResult(0);
if (ObjectUtil.isEmpty(materialObj)) {
this.synchroMaterial(new JSONObject());

20
wms/hd/nladmin-system/src/main/java/org/nl/wms/sch/manage/buss/CallMaterialTask.java
View File

@@ -340,11 +340,11 @@ public class CallMaterialTask extends AbstractAcsTask {
if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00") && ObjectUtil.isEmpty(task1) && ObjectUtil.isEmpty(task2)) {
JSONObject jo = new JSONObject();
JSONArray arr = new JSONArray();
jo.put("device_code", "FJJXS1");
jo.put("code", "to_feedback");
jo.put("value", "10");
arr.add(jo);
wmsToAcsService.action(arr);
// jo.put("device_code", "FJJXS1");
// jo.put("code", "to_feedback");
// jo.put("value", "10");
// arr.add(jo);
// wmsToAcsService.action(arr);
}
}
if (StrUtil.equals(next_point_code, "FJJXSSLW301") || StrUtil.equals(next_point_code, "FJJXSSLW301")) {
@@ -353,11 +353,11 @@ public class CallMaterialTask extends AbstractAcsTask {
if (StrUtil.equals(point_status01, "00") && StrUtil.equals(point_status02, "00")) {
JSONObject jo = new JSONObject();
JSONArray arr = new JSONArray();
jo.put("device_code", "FJJXS3");
jo.put("code", "to_feedback");
jo.put("value", "10");
arr.add(jo);
wmsToAcsService.action(arr);
// jo.put("device_code", "FJJXS3");
// jo.put("code", "to_feedback");
// jo.put("value", "10");
// arr.add(jo);
// wmsToAcsService.action(arr);
}
}