From 4f69d3036142c89b7c05f560a57e521b2bde050b Mon Sep 17 00:00:00 2001 From: gengby <858962040@qq.com> Date: Wed, 27 Jul 2022 14:08:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/InstructionServiceImpl.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index 0f8430e..ba925ec 100644 --- a/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -765,6 +765,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu jo.put("hasGoodStatus", "0"); jo.put("material_type", ""); jo.put("batch", ""); + jo.put("islock", "0"); deviceService.changeDeviceStatus(jo); JSONObject jo1 = new JSONObject(); @@ -773,6 +774,7 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu jo1.put("material_type", dto.getMaterial()); jo1.put("batch", dto.getBatch()); jo1.put("vehicle_code", dto.getVehicle_code()); + jo.put("islock", "0"); deviceService.changeDeviceStatus(jo1); LampThreecolorDeviceDriver lampThreecolorDeviceDriver; @@ -944,6 +946,14 @@ public class InstructionServiceImpl implements InstructionService, ApplicationAu } } 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()); - }