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

更新

Browse Source
This commit is contained in:
gengby
2022-07-27 14:08:48 +08:00
parent a832436f8b
commit 4f69d30361
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java
View File

@@ -765,6 +765,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
jo.put("hasGoodStatus", "0"); jo.put("hasGoodStatus", "0");
jo.put("material_type", ""); jo.put("material_type", "");
jo.put("batch", ""); jo.put("batch", "");
jo.put("islock", "0");
deviceService.changeDeviceStatus(jo); deviceService.changeDeviceStatus(jo);
JSONObject jo1 = new JSONObject(); JSONObject jo1 = new JSONObject();
@@ -773,6 +774,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
jo1.put("material_type", dto.getMaterial()); jo1.put("material_type", dto.getMaterial());
jo1.put("batch", dto.getBatch()); jo1.put("batch", dto.getBatch());
jo1.put("vehicle_code", dto.getVehicle_code()); jo1.put("vehicle_code", dto.getVehicle_code());
jo.put("islock", "0");
deviceService.changeDeviceStatus(jo1); deviceService.changeDeviceStatus(jo1);
LampThreecolorDeviceDriver lampThreecolorDeviceDriver; LampThreecolorDeviceDriver lampThreecolorDeviceDriver;
@@ -944,6 +946,14 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
} }
removeByCodeFromCache(entity.getInstruction_code()); removeByCodeFromCache(entity.getInstruction_code());
JSONObject jo1 = new JSONObject();
jo1.put("device_code",task.getStart_device_code());
jo1.put("islock", "0");
deviceService.changeDeviceStatus(jo1);
JSONObject jo2 = new JSONObject();
jo2.put("device_code",task.getNext_device_code());
jo2.put("islock", "0");
deviceService.changeDeviceStatus(jo2);
} }
} }
@@ -1012,7 +1022,6 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu
} }
} }
removeByCodeFromCache(entity.getInstruction_code()); removeByCodeFromCache(entity.getInstruction_code());
} }