fix: 行架对接位添加

acs2/nladmin-system/nlsso-server/pom.xml

@@ -410,7 +410,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcprov-jdk15on</artifactId>
-            <version>1.50</version>
+            <version>1.54</version>
         </dependency>
 
         <!--导出CSV相关-->

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/manipulator_cache/ItemProtocol.java

@@ -0,0 +1,59 @@
+package org.nl.acs.device_driver.manipulator_cache;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.nl.acs.device.device_driver.standard_inspect.ItemDto;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Slf4j
+@Data
+public class ItemProtocol {
+
+
+    //工作模式
+    public static String item_mode = "mode";
+    //动作信号
+    public static String item_action = "action";
+
+    private ManipulatorCacheDeviceDriver driver;
+
+    public ItemProtocol(ManipulatorCacheDeviceDriver driver) {
+        this.driver = driver;
+    }
+
+
+    public int getMode() {
+        return this.getOpcIntegerValue(item_mode);
+    }
+
+    public int getAction() {
+        return this.getOpcIntegerValue(item_action);
+    }
+
+
+    Boolean isonline;
+
+    public int getOpcIntegerValue(String protocol) {
+        Integer value = this.driver.getIntegeregerValue(protocol);
+        if (value == null) {
+            setIsonline(false);
+        } else {
+            setIsonline(true);
+            return value;
+        }
+        return 0;
+    }
+
+    public static List<ItemDto> getReadableItemDtos() {
+        ArrayList<ItemDto> list = new ArrayList<>();
+        list.add(new ItemDto(item_mode, "工作模式", "DB1.B1"));
+        list.add(new ItemDto(item_action, "动作信号", "DB1.B3"));
+
+        return list;
+    }
+
+
+}

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/manipulator_cache/ManipulatorCacheDefination.java

@@ -0,0 +1,49 @@
+package org.nl.acs.device_driver.manipulator_cache;
+
+import org.nl.acs.device.domain.Device;
+import org.nl.acs.device.enums.DeviceType;
+import org.nl.acs.device_driver.DeviceDriver;
+import org.nl.acs.device_driver.DeviceDriverDefination;
+import org.springframework.stereotype.Service;
+
+import java.util.LinkedList;
+import java.util.List;
+
+/**
+ * 扫码器
+ */
+@Service
+public class ManipulatorCacheDefination implements DeviceDriverDefination {
+    @Override
+    public String getDriverCode() {
+        return "manipulator_cache";
+    }
+
+    @Override
+    public String getDriverName() {
+        return "行架对接缓存位";
+    }
+
+    @Override
+    public String getDriverDescription() {
+        return "行架对接缓存位";
+    }
+
+    @Override
+    public DeviceDriver getDriverInstance(Device device) {
+        return (new ManipulatorCacheDeviceDriver()).setDevice(device).setDriverDefination(this);
+
+    }
+
+    @Override
+    public Class<? extends DeviceDriver> getDeviceDriverType() {
+        return ManipulatorCacheDeviceDriver.class;
+    }
+
+    @Override
+    public List<DeviceType> getFitDeviceTypes() {
+        List<DeviceType> types = new LinkedList();
+        types.add(DeviceType.conveyor);
+        return types;
+    }
+}

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/manipulator_cache/ManipulatorCacheDeviceDriver.java

@@ -0,0 +1,113 @@
+package org.nl.acs.device_driver.manipulator_cache;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import org.nl.acs.device.domain.Device;
+
+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.driver.AbstractOpcDeviceDriver;
+import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.instruction.domain.Instruction;
+import org.nl.acs.monitor.DeviceStageMonitor;
+import org.nl.config.language.LangProcess;
+import org.nl.config.thread.ThreadPoolExecutorUtil;
+import org.openscada.opc.lib.da.Server;
+
+import java.util.*;
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * 标准版扫码器
+ */
+@Slf4j
+@Data
+public class ManipulatorCacheDeviceDriver extends AbstractOpcDeviceDriver implements DeviceDriver, ExecutableDeviceDriver, RouteableDeviceDriver, DeviceStageMonitor, FeedLmsRealFailed {
+    private final static ThreadPoolExecutor EXECUTOR = ThreadPoolExecutorUtil.getPoll();
+    protected ItemProtocol itemProtocol = new ItemProtocol(this);
+
+    //当前指令
+    Instruction inst = null;
+
+    private String error_type = "ssx_error_type";
+
+    //工作模式
+    int mode = 0;
+    int last_mode = 0;
+
+    //任务号
+    int action = 0;
+    int last_action = 0;
+
+    @Override
+    public Device getDevice() {
+        return this.device;
+    }
+
+
+    @Override
+    public void execute() {
+        action = this.itemProtocol.getAction();
+        mode = this.itemProtocol.getMode();
+    }
+
+
+
+
+    public boolean exe_business() {
+        return true;
+    }
+
+
+
+
+
+    public void executing(Server server, Map<String, Object> itemMap) {
+        this.control(itemMap);
+    }
+
+    public void writing(int command) {
+        Map<String, Object> itemMap = new HashMap<String, Object>();
+        this.control(itemMap);
+    }
+
+
+    @Override
+    public JSONObject getDeviceStatusName() {
+        JSONObject jo = new JSONObject();
+        String mode = "";
+        String move = "";
+        if (this.getMode() == 0) {
+            mode = LangProcess.msg("universal_off-line");
+        } else if (this.getMode() == 1) {
+            mode = LangProcess.msg("universal_stand-alone");
+        } else if (this.getMode() == 2) {
+            mode = LangProcess.msg("universal_standby");
+        } else if (this.getMode() == 3) {
+            mode = LangProcess.msg("universal_operation");
+        }
+        jo.put("device_name", this.getDevice().getDevice_name());
+        jo.put("mode", mode);
+        jo.put("action", action);
+
+        return jo;
+    }
+
+    @Override
+    public void setDeviceStatus(JSONObject data) {
+
+    }
+
+
+    @Override
+    public JSONObject feedLmsRealFailedInfo() {
+        return null;
+    }
+}

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java

@@ -20,6 +20,7 @@ import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.device_driver.manipulator_cache.ManipulatorCacheDeviceDriver;
 import org.nl.acs.device_driver.one_conveyor.box_subvolumes_conveyor.BoxSubvolumesConveyorDeviceDriver;
 import org.nl.acs.history.ErrorUtil;
 import org.nl.acs.history.service.DeviceErrorLogService;
@@ -359,8 +360,9 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         Map<String, Object> map6 = new HashMap<>();
                         Map<String, Object> map7 = new HashMap<>();
                         Map<String, Object> map8 = new HashMap<>();
+                        Map<String, Object> map9 = new HashMap<>();
                         try {
-                            pushPLC(map1, map2, next_addr, map3, start_addr, map4, instruction.getInstruction_code(), interactionJsonDTO, map5, map6, map7, map8);
+                            pushPLC(map1, map2, next_addr, map3, start_addr, map4, instruction.getInstruction_code(), interactionJsonDTO, map5, map6, map7, map8,map9);
                         } catch (Exception e) {
 
                             logServer.deviceExecuteLog(device_code, "", "", "当前设备:" + device_code + ",下发指令:"
@@ -399,6 +401,15 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             }
                         }
 
+                        ManipulatorCacheDeviceDriver manipulatorCacheDeviceDriver;
+                        if (startDevice.getDeviceDriver() instanceof ManipulatorCacheDeviceDriver) {
+                            manipulatorCacheDeviceDriver = (ManipulatorCacheDeviceDriver) startDevice.getDeviceDriver();
+                            if (manipulatorCacheDeviceDriver.getMode() != 2 && manipulatorCacheDeviceDriver.getMode() !=1) {
+                                notCreateInstMessage = "universal_notCreateInstMessage3";
+                                return false;
+                            }
+                        }
+
                         String taskid = taskDto.getTask_id();
                         String taskcode = taskDto.getTask_code();
                         String start_point_code = taskDto.getStart_point_code();
@@ -427,8 +438,9 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         Map<String, Object> map6 = new HashMap<>();
                         Map<String, Object> map7 = new HashMap<>();
                         Map<String, Object> map8 = new HashMap<>();
+                        Map<String, Object> map9 = new HashMap<>();
                         try {
-                            pushPLC(map1, map2, next_addr, map3, start_addr, map4, instdto.getInstruction_code(), interactionJsonDTO, map5, map6, map7, map8);
+                            pushPLC(map1, map2, next_addr, map3, start_addr, map4, instdto.getInstruction_code(), interactionJsonDTO, map5, map6, map7, map8,map9);
                         } catch (Exception e) {
                             logServer.deviceExecuteLog(device_code, "", "", "当前设备:" + device_code + ",下发指令:"
                                     + instdto.getInstruction_code() + ",指令起点:" + instdto.getStart_device_code()
@@ -446,7 +458,7 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
 
     }
 
-    private void pushPLC(Map<String, Object> map1, Map<String, Object> map2, String next_addr, Map<String, Object> map3, String start_addr, Map<String, Object> map4, String task, InteractionJsonDTO interactionJsonDTO, Map<String, Object> map5, Map<String, Object> map6, Map<String, Object> map7, Map<String, Object> map8) {
+    private void pushPLC(Map<String, Object> map1, Map<String, Object> map2, String next_addr, Map<String, Object> map3, String start_addr, Map<String, Object> map4, String task, InteractionJsonDTO interactionJsonDTO, Map<String, Object> map5, Map<String, Object> map6, Map<String, Object> map7, Map<String, Object> map8,Map<String, Object> map9) {
         List list = new ArrayList();
         map1.put("code", "to_command");
         map1.put("value", 1);
@@ -481,6 +493,12 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 map8.put("value", interactionJsonDTO.getMaxNo());
                 list.add(map8);
             }
+
+            if (ObjectUtil.isNotEmpty(interactionJsonDTO.getBarcode())) {
+                map8.put("code", "to_barcode");
+                map8.put("value", interactionJsonDTO.getBarcode());
+                list.add(map9);
+            }
         }
         this.writing(list);
     }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/InteractionJsonDTO.java

@@ -24,5 +24,8 @@ public class InteractionJsonDTO {
     private String lastOne;
 
 
-
+    /**
+     *子卷号
+     */
+    private String barcode;
 }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/volume_two_manipulator/VolumeTwoManipulatorManipulatorDeviceDriver.java

@@ -19,6 +19,7 @@ import org.nl.acs.device_driver.RouteableDeviceDriver;
 import org.nl.acs.device_driver.conveyor.siemens_conveyor.SiemensConveyorDeviceDriver;
 import org.nl.acs.device_driver.driver.AbstractOpcDeviceDriver;
 import org.nl.acs.device_driver.driver.ExecutableDeviceDriver;
+import org.nl.acs.device_driver.manipulator_cache.ManipulatorCacheDeviceDriver;
 import org.nl.acs.device_driver.one_manipulator.trapped_manipulator.InteractionJsonDTO;
 import org.nl.acs.enums.VolumeTwoTypeEnum;
 import org.nl.acs.history.ErrorUtil;
@@ -397,6 +398,18 @@ public class VolumeTwoManipulatorManipulatorDeviceDriver extends AbstractOpcDevi
                                 return false;
                             }
                         }
+
+                        
+                        ManipulatorCacheDeviceDriver manipulatorCacheDeviceDriver;
+                        if (startDevice.getDeviceDriver() instanceof ManipulatorCacheDeviceDriver) {
+                            manipulatorCacheDeviceDriver = (ManipulatorCacheDeviceDriver) startDevice.getDeviceDriver();
+                            if (manipulatorCacheDeviceDriver.getMode() != 2 && manipulatorCacheDeviceDriver.getMode() !=1) {
+                                notCreateInstMessage = "universal_notCreateInstMessage3";
+                                return false;
+                            }
+                        }
+
+
                         String taskid = taskDto.getTask_id();
                         String taskcode = taskDto.getTask_code();
                         String start_point_code = taskDto.getStart_point_code();

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

@@ -41,6 +41,7 @@ universal_feedMessage11=\u540E\u5DE5\u4F4D\u5149\u7535\u4FE1\u53F7\u4E0D\u5E94\u
 universal_write_erro=\u5199\u5165\u4FE1\u53F7\u5931\u8D25
 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
 
 
 

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

@@ -41,3 +41,4 @@ universal_write_erro=Write signal failure
 universal_notCreateInstMessage=Instructions cannot be created because the task for the associated device is not found
 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

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

@@ -41,3 +41,4 @@ universal_write_erro=Sinyal penulis gagal
 universal_notCreateInstMessage=Misi untuk divais yang diasosiasikan tidak ditemukan, perintah tidak dapat dibuat
 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

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

@@ -41,3 +41,5 @@ universal_write_erro=\u5199\u5165\u4FE1\u53F7\u5931\u8D25
 universal_notCreateInstMessage=\u672A\u627E\u5230\u5173\u8054\u8BBE\u5907\u7684\u4EFB\u52A1\uFF0C\u6307\u4EE4\u65E0\u6CD5\u521B\u5EFA
 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
+

acs2/nladmin-ui/src/views/acs/angle/index.vue

@@ -163,7 +163,7 @@
 <script>
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
-import udOperation from '@crud/UD.operation'
+import udOperation from '@crud/UD.oper ation'
 import pagination from '@crud/Pagination'
 import crudAcsPointAngle from '@/api/acs/angle/acsPointAngle'
 import deviceCrud from '@/api/acs/device/device'