fix: 入库异常口任务校验

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/conveyor/belt_conveyor/BeltConveyorDeviceDriver.java

@@ -603,10 +603,10 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
                     } else {
                         next_point_code = next_device_code;
                     }
-                    //判断是否存在终点到达ddj对接位的指令
+                    //判断是否存在终点到达ddj对接位的指令(包含货架到达ddj对接位的指令、输送线到对接位的指令)
                     Instruction byNextDeviceCodeDDJ = instructionService.findByNextDeviceCodeFromCache(next_device_code);
                     if (ObjectUtil.isNotEmpty(byNextDeviceCodeDDJ)) {
-                        this.setNotCreateInstMessage("存在终点到达ddj对接位的指令");
+                        this.setNotCreateInstMessage("存在相同路线的指令");
                     }
                     //判断下一个输送线点位是否有货
                     BeltConveyorDeviceDriver beltConveyorDeviceDriver;

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java

@@ -20,6 +20,7 @@ import org.nl.acs.device.service.impl.DeviceExtraServiceImpl;
 import org.nl.acs.device_driver.DeviceDriver;
 import org.nl.acs.device_driver.FeedLmsRealFailed;
 import org.nl.acs.device_driver.RouteableDeviceDriver;
+import org.nl.acs.device_driver.conveyor.belt_conveyor.BeltConveyorDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
 import org.nl.acs.device_driver.led.led_screen.LedScreenDeviceDriver;
@@ -486,7 +487,10 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                 Instruction instdto = new Instruction();
                 String interactionJson = taskdto.getInteraction_json();
                 InteractionJsonDTO interactionJsonDTO = JSON.parseObject(interactionJson, InteractionJsonDTO.class);
-                String containerType = interactionJsonDTO.getContainerType();
+                String containerType = "";
+                if (ObjectUtil.isNotEmpty(interactionJsonDTO)) {
+                    containerType  = interactionJsonDTO.getContainerType();
+                }
                 if (TaskTypeEnum.AGV_Task.getIndex().equals(taskdto.getTask_type())){
                     String route_plan_code = taskdto.getRoute_plan_code();
 
@@ -508,6 +512,8 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                         requireSucess = false;
                         return false;
                     }
+
+
                     packageInstrcutData(instdto, taskdto, taskid, taskcode, vehiclecode, priority,start_device_code,next_device_code,containerType);
                 }else {
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -1535,7 +1535,7 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
         Iterator<Instruction> it = instructions.iterator();
         while (it.hasNext()) {
             Instruction inst = it.next();
-            if (StrUtil.equals(devicecode, inst.getNext_device_code())) {
+            if (StrUtil.equals(devicecode, inst.getNext_device_code()) && Integer.parseInt(inst.getInstruction_status())<=Integer.parseInt(InstructionStatusEnum.BUSY.getIndex())) {
                 return inst;
             }
         }

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties

@@ -45,6 +45,8 @@ universal_notCreateInstMessage1=\u672A\u8BBE\u7F6E\u7535\u6C14\u8C03\u5EA6\u53F7
 universal_notCreateInstMessage2=\u5149\u7535\u65E0\u8D27,\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
 universal_notCreateInstMessage3=\u8BBE\u5907\u5F85\u673A\u6216\u4E0D\u5141\u8BB8\u8FDB\u5165
 universal_notCreateInstMessage4=ddj\u5BF9\u63A5\u4F4D\u6709\u8D27,\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
+universal_notCreateInstMessage5=\u5B58\u5728\u76F8\u540C\u8DEF\u7EBF\u7684\u6307\u4EE4!
+
 
 
 

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties

@@ -44,3 +44,4 @@ universal_notCreateInstMessage1=The electrical dispatch number is not set!
 universal_notCreateInstMessage2=Photoelectric no goods, can not generate commands!
 universal_notCreateInstMessage3=The device is in standby mode or is not allowed to enter
 universal_notCreateInstMessage4=ddj interface bit is in stock, cannot generate command!
+universal_notCreateInstMessage5=Instructions with the same route exist!

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties

@@ -44,3 +44,4 @@ universal_notCreateInstMessage1=Nomor pengiriman listrik tidak diatur!
 universal_notCreateInstMessage2=Photo-electric tidak tersedia dan tidak dapat menghasilkan perintah!
 universal_notCreateInstMessage3=Siaga perangkat atau tidak diizinkan masuk
 universal_notCreateInstMessage4=DDJ mendarat di dok, tidak ada perintah yang diberikan!
+universal_notCreateInstMessage5=Ada instruksi tentang rute yang sama!

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties

@@ -44,4 +44,5 @@ universal_notCreateInstMessage1=\u672A\u8BBE\u7F6E\u7535\u6C14\u8C03\u5EA6\u53F7
 universal_notCreateInstMessage2=\u5149\u7535\u65E0\u8D27,\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
 universal_notCreateInstMessage3=\u8BBE\u5907\u5F85\u673A\u6216\u4E0D\u5141\u8BB8\u8FDB\u5165
 universal_notCreateInstMessage4=ddj\u5BF9\u63A5\u4F4D\u6709\u8D27,\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
+universal_notCreateInstMessage5=\u5B58\u5728\u76F8\u540C\u8DEF\u7EBF\u7684\u6307\u4EE4!