fix: 现场联调

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

@@ -648,7 +648,7 @@ public class BeltConveyorDeviceDriver extends AbstractOpcDeviceDriver implements
                         }
                     }else {
                         //下一个设备不是输送线指令
-                        this.setNotCreateInstMessage("下一个设备不是输送线指令");
+                        this.setNotCreateInstMessage("universal_notCreateInstMessage6");
                         return false;
                     }
                     Instruction instdto = new Instruction();

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

@@ -288,7 +288,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                 applyIn(StorageTypeEnum.BOX_IN.getType());
                 List list1 = new ArrayList();
                 Map map = new HashMap();
-                map.put("code", "mode");
+                map.put("code", "to_command");
                 map.put("value", 6);
                 list1.add(map);
                 this.writing(list1);
@@ -299,7 +299,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                 applyIn(StorageTypeEnum.STORAGE.getType());
                 List list1 = new ArrayList();
                 Map map = new HashMap();
-                map.put("code", "mode");
+                map.put("code", "to_command");
                 map.put("value", 7);
                 list1.add(map);
                 this.writing(list1);
@@ -476,10 +476,26 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
             return false;
         } else {
             this.instruction_require_time = date;
-            //判断是否存在起点相同 任务状态就绪的任务
+            //根据补码查找任务
-            TaskDto taskdto = taskserver.findByStartCodeAndReady(device_code);
+            if (StrUtil.isNotBlank(hand_barcode)) {
+                TaskDto taskdto = taskserver.findByVehicleCodeCodeAndReady(hand_barcode);
                 if (!ObjectUtil.isEmpty(taskdto)) {
+                    if (creatInstruction(taskdto)) return false;
+                }
+            }else {
+                if (StrUtil.isNotBlank(barcode)) {
+                    //根据载具号查找任务
+                    TaskDto taskdto = taskserver.findByVehicleCodeCodeAndReady(barcode);
+                    if (!ObjectUtil.isEmpty(taskdto)) {
+                        if (creatInstruction(taskdto)) return false;
+                    }
+                }
+            }
+            return true;
+        }
+    }
 
+    private boolean creatInstruction(TaskDto taskdto) {
         String taskid = taskdto.getTask_id();
         String taskcode = taskdto.getTask_code();
         String vehiclecode = taskdto.getVehicle_code();
@@ -496,7 +512,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
 
             List<RouteLineDto> shortPathsList = routeLineService.getShortPathLines(taskdto.getStart_device_code(), taskdto.getNext_device_code(), route_plan_code);
             if (CollectionUtil.isEmpty(shortPathsList)){
-                        return false;
+                return true;
             }
             RouteLineDto routeLineDto = shortPathsList.get(0);
             String path = routeLineDto.getPath();
@@ -510,7 +526,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
             TaskDto dto = taskserver.findByCodeAndExcute(taskdto.getNext_device_code(), taskdto.getStart_device_code());
             if (ObjectUtil.isNotEmpty(dto)){
                 requireSucess = false;
-                        return false;
+                return true;
             }
 
 
@@ -518,14 +534,14 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
         }else {
 
 
-                    packageInstrcutData(instdto, taskdto, taskid, taskcode, vehiclecode, priority,taskdto.getStart_device_code(),taskdto.getNext_device_code(),containerType);
+            packageInstrcutData(instdto, taskdto, taskid, taskcode, vehiclecode, priority, taskdto.getStart_device_code(), taskdto.getNext_device_code(),containerType);
         }
         try {
             instructionService.create(instdto);
         } catch (Exception e) {
             e.printStackTrace();
             log.error("指令创建失败!", e.getMessage());
-                    return false;
+            return true;
         }
         Device nextdevice = deviceAppservice.findDeviceByCode(instdto.getNext_device_code());
 
@@ -584,13 +600,11 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
             }
             if (ObjectUtil.isEmpty(taskserver.findByCode(taskdto.getTask_code()))) {
                 requireSucess = false;
-                        return false;
-                    }
-                }
-            }
                 return true;
             }
         }
+        return false;
+    }
 
     /**
      * 获取任务信息

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -1043,7 +1043,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
         jo.put("stopReceiveTask", this.stopReceiveTask);
         jo.put("requireSucess", requireSucess);
         jo.put("driver_type", "standard_stacker");
-       jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));
+        jo.put("notCreateInstMessage",  notCreateInstMessage);
         return jo;
     }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/oven_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -1128,7 +1128,7 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
         jo.put("isError", this.getIserror());
         jo.put("message", message);
         jo.put("notCreateTaskMessage", notCreateTaskMessage);
-       jo.put("notCreateInstMessage", LangProcess.msg(notCreateInstMessage));
+       jo.put("notCreateInstMessage", notCreateInstMessage);
         jo.put("feedMessage", feedMessage);
         jo.put("requireActionSucess", requireActionSucess);
         jo.put("driver_type", "siemens_conveyor");

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/ContainerTypeEnum.java

@@ -0,0 +1,20 @@
+package org.nl.acs.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum ContainerTypeEnum {
+    SMALL("1", "小托盘"),
+
+    BIG("2", "大托盘");
+    /**
+     * 索引
+     */
+    private String type;
+    /**
+     * 编码
+     */
+    private String value;
+}

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

@@ -46,6 +46,7 @@ universal_notCreateInstMessage2=\u5149\u7535\u65E0\u8D27,\u65E0\u6CD5\u751F\u621
 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!
+universal_notCreateInstMessage6=\u4E0B\u4E00\u4E2A\u8BBE\u5907\u4E0D\u662F\u8F93\u9001\u7EBF\u6307\u4EE4!
 
 
 

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

@@ -45,3 +45,4 @@ universal_notCreateInstMessage2=Photoelectric no goods, can not generate command
 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!
+universal_notCreateInstMessage6=The next device is not a conveyor line directive!

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

@@ -45,3 +45,4 @@ universal_notCreateInstMessage2=Photo-electric tidak tersedia dan tidak dapat me
 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!
+universal_notCreateInstMessage6=Perangkat berikutnya bukan arahan jalur konveyor!

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

@@ -45,4 +45,5 @@ universal_notCreateInstMessage2=\u5149\u7535\u65E0\u8D27,\u65E0\u6CD5\u751F\u621
 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!
+universal_notCreateInstMessage6=\u4E0B\u4E00\u4E2A\u8BBE\u5907\u4E0D\u662F\u8F93\u9001\u7EBF\u6307\u4EE4!