diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java index 96ed1de..3f0fd48 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_package_pallet_manipulator/LnshPackagePalletManipulatorDeviceDriver.java @@ -815,7 +815,6 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { - this.writing(this.mode); ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No); if (this.mode == 4) { dto.setOrder_status("0"); @@ -823,10 +822,11 @@ public class LnshPackagePalletManipulatorDeviceDriver extends AbstractOpcDeviceD dto.setOrder_status("2"); } produceshiftorderService.update(dto); + this.writing(this.mode); + this.setRequireSucess(true); } } - this.setRequireSucess(true); return true; } } diff --git a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java index 3e01c4c..b32c0f3 100644 --- a/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java +++ b/acs/hd/nladmin-system/src/main/java/org/nl/acs/device_driver/lnsh/lnsh_split_manipulator/LnshSplitManipulatorDeviceDriver.java @@ -853,7 +853,6 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im if (ObjectUtil.isNotEmpty(result)) { JSONObject jsonObject = JSONObject.parseObject(result.body()); if (result.getStatus() == 200 && StrUtil.equals(jsonObject.getString("status"),"200")) { - this.writing(this.mode); ProduceshiftorderDto dto = produceshiftorderService.findByCode(order_No); if (this.mode == 4) { dto.setOrder_status("0"); @@ -861,10 +860,10 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im dto.setOrder_status("2"); } produceshiftorderService.update(dto); + this.writing(this.mode); + this.setRequireSucess(true); } } - - this.setRequireSucess(true); return true; } } @@ -926,8 +925,8 @@ public class LnshSplitManipulatorDeviceDriver extends AbstractOpcDeviceDriver im this.writing(this.mode); this.writing("to_material",material_code); + this.setRequireSucess(true); } - requireSucess = true; return true; } }