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

更新音飞点位状态

Browse Source
This commit is contained in:
USER-20220102CG\noblelift
2022-08-09 16:41:11 +08:00
parent 51a2fed110
commit f6a90bd5ee
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
hd/nladmin-system/src/main/java/org/nl/hand/anjyf/service/impl/NjyfHandServiceImpl.java
View File

@@ -109,6 +109,8 @@ public class NjyfHandServiceImpl implements NjyfHandService {
StandardStorageDeviceDriver standardStorageDeviceDriver;
jo.put("device_code",device_code);
jo.put("device_name",device_code);
jo.put("status","1");
jo.put("allow_update", "1");
jo.put("input_material", "1");
resultArr.add(jo);
@@ -247,24 +249,24 @@ public class NjyfHandServiceImpl implements NjyfHandService {
// return resultJson;
// }
//判断起点有货，终点为空
if (ObjectUtil.isEmpty(startDevice.getMaterial_type()) || Integer.parseInt(startDevice.getMaterial_type()) == 0) {
resultJson.put("code", "0");
resultJson.put("desc", "起点必须有货");
resultJson.put("result", "");
return resultJson;
}
if (!ObjectUtil.isEmpty(nextDevice.getMaterial_type()) && !StrUtil.equals(nextDevice.getMaterial_type(), "0")) {
resultJson.put("code", "0");
resultJson.put("desc", "终点必须为空");
resultJson.put("result", "");
return resultJson;
}
if(Boolean.parseBoolean(startDevice.getIslock()) || Boolean.parseBoolean(nextDevice.getIslock())){
resultJson.put("code", "0");
resultJson.put("desc", "起点或终点设备已被锁定");
resultJson.put("result", "");
return resultJson;
}
// if (ObjectUtil.isEmpty(startDevice.getMaterial_type()) || Integer.parseInt(startDevice.getMaterial_type()) == 0) {
// resultJson.put("code", "0");
// resultJson.put("desc", "起点必须有货");
// resultJson.put("result", "");
// return resultJson;
// }
// if (!ObjectUtil.isEmpty(nextDevice.getMaterial_type()) && !StrUtil.equals(nextDevice.getMaterial_type(), "0")) {
// resultJson.put("code", "0");
// resultJson.put("desc", "终点必须为空");
// resultJson.put("result", "");
// return resultJson;
// }
// if(Boolean.parseBoolean(startDevice.getIslock()) || Boolean.parseBoolean(nextDevice.getIslock())){
// resultJson.put("code", "0");
// resultJson.put("desc", "起点或终点设备已被锁定");
// resultJson.put("result", "");
// return resultJson;
// }
if (StrUtil.isEmpty(priority)) {
priority = "1";
}