From 6405c8492d32c23012849122b04913c532c0864c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=97=AD=E6=98=8E=5C73939?= <739390650@QQ.COM> Date: Tue, 21 Oct 2025 17:42:55 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E5=AF=8C=E4=BD=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../agv/ndctwo/AgvNdcTwoDeviceDriver.java | 4 --- .../BeltConveyorDeviceDriver.java | 25 ++++++++++--------- .../service/impl/InstructionServiceImpl.java | 23 ++++++++++++++--- .../impl/BmVehicleRfidServiceImpl.java | 2 +- 4 files changed, 34 insertions(+), 20 deletions(-) diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java index 4683e7c..4b9c42b 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/agv/ndctwo/AgvNdcTwoDeviceDriver.java @@ -488,10 +488,6 @@ public class AgvNdcTwoDeviceDriver extends AbstractDeviceDriver implements Devic map3.put("code", "to_task"); map3.put("value", inst.getInstruction_code()); list.add(map3); - Map map4 = new HashMap(); - map4.put("code", "to_barcode"); - map4.put("value", inst.getVehicle_code()); - list.add(map4); beltConveyorDeviceDriver.writing(list); data = ndcAgvService.sendAgvOneModeInst(phase, index, 0); } else { diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java index acf8625..d726940 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java @@ -169,7 +169,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements String to_taskNum = null; String last_to_taskNum = null; - Integer outbound_task_num = null; + Integer outbound_task_num = 0; //子卷条码 String material_barcode = null; @@ -322,7 +322,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements break; case 6: // 更新出库任务数 - if (move == 1 && !requireSucess) { + if (move == 0 && !requireSucess) { synchronized(this) { // 添加同步锁 if (!requireSucess) { // 双重检查锁定 try { @@ -331,12 +331,6 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements updateAndSyncOutboundTaskNum(-1, true, true); Integer result = this.outbound_task_num; - // 更新task的出库完成数 - TaskDto taskDto = new TaskDto(); - taskDto.setTask_id(instruction.getTask_id()); - taskDto.setOutbound_complete_flag(true); - taskserver.updateById(taskDto); - List list1 = new ArrayList(); Map map = new HashMap(); map.put("code", "to_command"); @@ -349,7 +343,11 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements Map map3 = new HashMap(); map3.put("code", "to_target");//下发出库楼层 map3.put("value", "0"); - list1.add(map); + list1.add(map3); + Map map4 = new HashMap(); + map4.put("code", "to_task");//下发出库楼层 + map4.put("value", "0"); + list1.add(map4); this.writing(list1); // 只有成功后才设置标记 @@ -549,10 +547,13 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements return true; } - public synchronized Integer updateOutboundTaskNum(Integer num,Boolean addFlag) throws Exception { - if(addFlag) { + public synchronized Integer updateOutboundTaskNum(Integer num, Boolean addFlag) throws Exception { + if (addFlag) { this.outbound_task_num = this.outbound_task_num + num; - } else{ + if (this.outbound_task_num < 0) { + return 0; + } + } else { this.outbound_task_num = num; } return this.outbound_task_num; diff --git a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java index a936b1f..0dd5611 100644 --- a/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java +++ b/acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java @@ -459,10 +459,8 @@ public class InstructionServiceImpl extends CommonServiceImpl().set("rfid", null).eq("device_code", params.getReader_name())); } return true;