opt: 纸管库,套管工位驱动优化

acs/nladmin-system/src/main/java/org/nl/acs/device/device_driver/DriverTypeEnum.java

@@ -55,6 +55,10 @@ public enum DriverTypeEnum {
 
     PAPER_TUBE_DEVICE(22, "paper_tube_conveyor", "纸管库设备", "conveyor"),
 
+    PAPER_TUBE_DEVICE2(26, "paper_tube_conveyor2", "纸管库2", "conveyor"),
+
+    CASING_STATION(27, "casing_station", "套管工位", "conveyor"),
+
     DEVICE_STATUS(23,"device_status","立库设备状态","conveyor"),
 
     INDOOR_MANIPULATOR(24,"indoor_manipulator","内包间-行架机械手","station"),

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/casing_station/CasingStationConveyorDeviceDriver.java

@@ -177,6 +177,7 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
                 param.put("device_type", "1");
                 param.put("product_area", paramService.findByCode("productArea").getValue());
                 acsToWmsService.sendDeviceStatus(param);
+                requireSucess = false;
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess);
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
             }
@@ -287,6 +288,11 @@ public class CasingStationConveyorDeviceDriver extends AbstractOpcDeviceDriver i
             applyPaperActionRequest.setMaterial1(material1);
             applyPaperActionRequest.setMaterial2(material2);
             ApplyPaperActionResponse applyPaperActionResponse = acsToWmsService.applyPaperActionRequest(applyPaperActionRequest);
+            if (ObjectUtil.isNull(applyPaperActionResponse)) {
+                message = "请求失败";
+                requireSucess = false;
+                return;
+            }
             Map map = new HashMap();
             if (applyPaperActionResponse.getstatus() == 200) {
                 map.put("code", "to_command");

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/paper_tube_device2/PaperTubeConveyor2DeviceDriver.java

@@ -293,6 +293,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
                 param.put("device_type", "1");
                 param.put("product_area", paramService.findByCode("productArea").getValue());
                 acsToWmsService.sendDeviceStatus(param);
+                requireSucess = false;
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode + "复位请求标记:" + requireSucess);
                 logServer.deviceExecuteLog(this.device_code, "", "", "信号mode：" + last_mode + "->" + mode);
             }
@@ -572,7 +573,7 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
                         return false;
                     }
                     //判断当前任务号是否存在指令
-                    Instruction inst1 = instructionService.findByTaskcodeAndStatus(taskdto.getTask_code());
+                    //Instruction inst1 = instructionService.findByTaskcodeAndStatus(taskdto.getTask_code());
                     /*if(ObjectUtil.isNotNull(inst1)){
                         Device nextdevice = deviceAppservice.findDeviceByCode(inst1.getNext_device_code());
                         String next_addr = nextdevice.getExtraValue().get("address").toString();
@@ -625,7 +626,9 @@ public class PaperTubeConveyor2DeviceDriver extends AbstractOpcDeviceDriver impl
                         writeStatus(paperArray, map, 2);
                         writeStatus(paperArray, map, 3);
                     }
-                    writeData(taskdto.getNext_device_code(), instdto, map);
+                    Device nextdevice = deviceAppservice.findDeviceByCode(taskdto.getNext_device_code());
+                    String next_addr = nextdevice.getExtraValue().get("address").toString();
+                    writeData(next_addr, instdto, map);
                     this.writing(map);
                     requireSucess = true;
                     return true;

acs/nladmin-ui/src/views/acs/device/config.vue

@@ -100,6 +100,8 @@ import photoelectric_inspection_site from '@/views/acs/device/driver/photoelectr
 import standard_autodoor from '@/views/acs/device/driver/standard_autodoor'
 import lamp_three_color from '@/views/acs/device/driver/lamp_three_color'
 import paper_tube_conveyor from '@/views/acs/device/driver/paper_tube_conveyor'
+import paper_tube_conveyor2 from '@/views/acs/device/driver/paper_tube_conveyor2'
+import casing_station from '@/views/acs/device/driver/casing_station'
 import device_status from '@/views/acs/device/driver/device_status'
 import indoor_manipulator from '@/views/acs/device/driver/indoor_manipulator'
 import plugging_unplugging_machine from '@/views/acs/device/driver/plugging_unplugging_machine'
@@ -134,6 +136,8 @@ export default {
     standard_autodoor,
     lamp_three_color,
     paper_tube_conveyor,
+    paper_tube_conveyor2,
+    casing_station,
     device_status,
     indoor_manipulator,
     plugging_unplugging_machine