diff --git a/hd/nladmin-system/src/main/java/org/nl/hand/alx/service/impl/LXHandServicelmpl.java b/hd/nladmin-system/src/main/java/org/nl/hand/alx/service/impl/LXHandServicelmpl.java index 351744b..e46538e 100644 --- a/hd/nladmin-system/src/main/java/org/nl/hand/alx/service/impl/LXHandServicelmpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/hand/alx/service/impl/LXHandServicelmpl.java @@ -207,24 +207,24 @@ public class LXHandServicelmpl implements LXHandService{ } //判断起点有货,终点为空 - 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"; }