永湖光栅对接最终版

base_sql/pallet_sql/yonghu_ddl_20230921.sql

@@ -1,4 +1,21 @@
-DELETE FROM `sys_config` WHERE config_id = 10;
-DELETE FROM `sys_config` WHERE config_id = 11;
-INSERT INTO `sys_config` (`config_id`, `config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (10, '入库检测光栅', 'sys.guangshan.no5', 'Y', 'N', 'admin', '2023-10-19 15:16:10', NULL, NULL, '光栅是否开启【参数键值】condig_value(Y开启，N关闭)');
-INSERT INTO `sys_config` (`config_id`, `config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (11, '出库检测光栅', 'sys.guangshan.no6', 'Y', 'N', 'admin', '2023-10-19 15:16:10', NULL, NULL, '光栅是否开启【参数键值】condig_value(Y开启，N关闭)');
+CREATE TABLE if not exists `pallet_match_log`
+(
+    `id`          varchar(255) NOT NULL COMMENT 'id',
+    `pallet_no`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '托盘',
+    `sku`         varchar(255)                                                  DEFAULT NULL COMMENT '物料/产品',
+    `total_qty`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '数量',
+    `order_nos`   varchar(2000)                                                 DEFAULT NULL COMMENT '所扫描出库单（多出库单以，隔开）',
+    `location_id` varchar(255)                                                  DEFAULT NULL COMMENT '库位id',
+    `agv_no`      varchar(255)                                                  DEFAULT NULL COMMENT 'agv车号',
+    `remark`      varchar(255)                                                  DEFAULT NULL COMMENT '备注',
+    `userdefine1` varchar(255)                                                  DEFAULT NULL,
+    `userdefine2` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci       DEFAULT NULL,
+    `userdefine3` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci       DEFAULT NULL,
+    `userdefine4` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci       DEFAULT NULL,
+    `userdefine5` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci       DEFAULT NULL,
+    `create_by`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT '' COMMENT '创建者',
+    `create_time` datetime                                                      DEFAULT NULL COMMENT '创建时间',
+    `update_by`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT '' COMMENT '更新者',
+    `update_time` datetime                                                      DEFAULT NULL COMMENT '更新时间',
+    PRIMARY KEY (`id`)
+    ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='托盘匹配记录';

base_sql/pallet_sql/yonghu_dml_20230921.sql

@@ -1,21 +1,28 @@
-CREATE TABLE if not exists `pallet_match_log`
-(
-    `id`          varchar(255) NOT NULL COMMENT 'id',
-    `pallet_no`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '托盘',
-    `sku`         varchar(255)                                                  DEFAULT NULL COMMENT '物料/产品',
-    `total_qty`   varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '数量',
-    `order_nos`   varchar(2000)                                                 DEFAULT NULL COMMENT '所扫描出库单（多出库单以，隔开）',
-    `location_id` varchar(255)                                                  DEFAULT NULL COMMENT '库位id',
-    `agv_no`      varchar(255)                                                  DEFAULT NULL COMMENT 'agv车号',
-    `remark`      varchar(255)                                                  DEFAULT NULL COMMENT '备注',
-    `userdefine1` varchar(255)                                                  DEFAULT NULL,
-    `userdefine2` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci       DEFAULT NULL,
-    `userdefine3` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci       DEFAULT NULL,
-    `userdefine4` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci       DEFAULT NULL,
-    `userdefine5` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci       DEFAULT NULL,
-    `create_by`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT '' COMMENT '创建者',
-    `create_time` datetime                                                      DEFAULT NULL COMMENT '创建时间',
-    `update_by`   varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci  DEFAULT '' COMMENT '更新者',
-    `update_time` datetime                                                      DEFAULT NULL COMMENT '更新时间',
-    PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci COMMENT='托盘匹配记录';
+DELETE FROM `sys_config` WHERE config_id = 10;
+DELETE FROM `sys_config` WHERE config_id = 11;
+INSERT INTO `sys_config` (`config_id`, `config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (10, '入库检测光栅', 'sys.guangshan.no5', 'Y', 'N', 'admin', '2023-10-19 15:16:10', NULL, NULL, '光栅是否开启【参数键值】condig_value(Y开启，N关闭)');
+INSERT INTO `sys_config` (`config_id`, `config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (11, '出库检测光栅', 'sys.guangshan.no6', 'Y', 'N', 'admin', '2023-10-19 15:16:10', NULL, NULL, '光栅是否开启【参数键值】condig_value(Y开启，N关闭)');
+
+DELETE FROM `ams_hexdefine_detail` WHERE business_type = '76' or business_type = '77';
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('227', '76', 'Header key', '1', NULL, '87CD', '1', '1');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('228', '76', 'Size of header', '1', NULL, '0008', '1', '2');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('229', '76', 'Size of message', '1', NULL, '000B', '1', '3');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('230', '76', 'Funcation code', '1', NULL, '0001', '1', '4');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('231', '76', 'Message type', '1', NULL, '0071', '1', '5');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('232', '76', 'Number of parameters', '1', NULL, '0008', '1', '6');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('233', '76', 'TS Order', '1', NULL, '4C', '1', '7');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('234', '76', 'Priority', '2', NULL, 'priority', '1', '8');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('235', '76', 'code', '1', NULL, '0001', '1', '9');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('236', '76', 'IKEY', '2', NULL, 'iKey', '1', '10');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('237', '76', 'LP0', '2', NULL, 'ext1', '1', '11');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('240', '77', 'Header key', '1', NULL, '87CD', '1', '1');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('241', '77', 'Size of header', '1', NULL, '0008', '1', '2');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('242', '77', 'Size of message', '1', NULL, '000B', '1', '3');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('243', '77', 'Funcation code', '1', NULL, '0001', '1', '4');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('244', '77', 'Message type', '1', NULL, '0071', '1', '5');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('245', '77', 'Number of parameters', '1', NULL, '0008', '1', '6');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('246', '77', 'TS Order', '1', NULL, '4D', '1', '7');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('247', '77', 'Priority', '2', NULL, 'priority', '1', '8');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('248', '77', 'code', '1', NULL, '0001', '1', '9');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('249', '77', 'IKEY', '2', NULL, 'iKey', '1', '10');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES ('250', '77', 'LP0', '2', NULL, 'ext1', '1', '11');

ruoyi-admin/src/main/java/com/ruoyi/init/StartService.java

@@ -10,7 +10,6 @@ import com.ruoyi.ams.erp.service.impl.SyncServiceImpl;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.core.redis.RedisKey;
 import com.ruoyi.common.utils.http.HttpRequest;
-import com.ruoyi.common.utils.http.HttpUtils;
 import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.thread.ServerGs;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-admin/src/main/java/com/ruoyi/thread/ClientHandler.java

@@ -7,6 +7,7 @@ import com.ruoyi.ams.agv.ndc.domain.AmsTask;
 import com.ruoyi.ams.agv.ndc.service.IAmsTaskService;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
 import lombok.extern.slf4j.Slf4j;
@@ -37,12 +38,13 @@ public class ClientHandler {
     @Autowired
     private IAmsTaskService amsTaskService;
 
-    @Autowired
     private RedisCache redisCache;
 
     public ClientHandler(Socket socket, ISysConfigService configService) {
         this.socket = socket;
         this.configService = configService;
+        this.redisCache = SpringUtils.getBean("redisCache");
+        this.amsTaskService = SpringUtils.getBean("amsTaskServiceImpl");
     }
 
     public void start() {
@@ -152,13 +154,15 @@ public class ClientHandler {
                             break;
                         case "3F00500D0A":
                             //入库区域光栅检测到信号
-                            if (redisCache.checkIsExist(Constant.AREA_INFO.STORAGE_AREA.getKey())) break;
+                            if (redisCache.checkIsExist(Constant.AREA_INFO.STORAGE_AREA.getKey()) || redisCache.checkIsExist(Constant.GRATING_RELIEVE_CMD.STORAGE_GRATING.getKey())) break;
+                            log.info("storage area control is trigger ......");
                             insertAmsTask(Constant.AREA_INFO.STORAGE_AREA.getValue());
                             redisCache.setCacheObject(Constant.AREA_INFO.STORAGE_AREA.getKey(), Boolean.TRUE);
                             break;
                         case "3F00600D0A":
                             //出库区域光栅检测到信号
-                            if (redisCache.checkIsExist(Constant.AREA_INFO.EXIT_AREA.getKey())) break;
+                            if (redisCache.checkIsExist(Constant.AREA_INFO.EXIT_AREA.getKey()) || redisCache.checkIsExist(Constant.GRATING_RELIEVE_CMD.EXIT_GRATING.getKey())) break;
+                            log.info("exit area control is trigger ......");
                             insertAmsTask(Constant.AREA_INFO.EXIT_AREA.getValue());
                             redisCache.setCacheObject(Constant.AREA_INFO.EXIT_AREA.getKey(), Boolean.TRUE);
                             break;

ruoyi-admin/src/main/java/com/ruoyi/thread/ServerGs.java

@@ -2,6 +2,8 @@ package com.ruoyi.thread;
 
 import com.ruoyi.ams.agv.ndc.common.ByteUtil;
 import com.ruoyi.base.constant.Constant;
+import com.ruoyi.common.core.redis.RedisCache;
+import com.ruoyi.common.utils.spring.SpringUtils;
 import com.ruoyi.system.domain.SysConfig;
 import com.ruoyi.system.service.ISysConfigService;
 import lombok.extern.slf4j.Slf4j;
@@ -12,8 +14,8 @@ import java.io.OutputStream;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * Server监听端口主服务
@@ -28,6 +30,10 @@ public class ServerGs {
 
     private ISysConfigService configService;
 
+    private RedisCache redisCache;
+
+    private ScheduledExecutorService executor;
+
     /**
      * 监听端口
      *
@@ -37,6 +43,8 @@ public class ServerGs {
         try {
             this.serverSocket = new ServerSocket(port);
             this.configService = configService;
+            this.redisCache = SpringUtils.getBean("redisCache");
+            this.executor = SpringUtils.getBean("scheduledExecutorService");
             System.out.println("光栅服务端启动成功，端口：" + port);
         } catch (IOException e) {
             System.out.println("光栅服务端启动失败");
@@ -70,67 +78,43 @@ public class ServerGs {
             try {
                 Socket client = serverSocket.accept();
                 log.info("----->有光栅客户端新连接:ip," + client.getInetAddress() + ",p:" + client.getPort());
+                executor.scheduleWithFixedDelay(() -> {
+                    OutputStream os = null;
+                    try {
+                        os = client.getOutputStream();
+                        if (redisCache.checkIsExist(Constant.GRATING_RELIEVE_CMD.STORAGE_GRATING.getKey())) {
+                            os.write(ByteUtil.hexString2ByteArray(Constant.GRATING_RELIEVE_CMD.STORAGE_GRATING.getValue()));
+                            os.flush();
+                        }
 
-                new Timer().schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        OutputStream os = null;
+                        if (redisCache.checkIsExist(Constant.GRATING_RELIEVE_CMD.EXIT_GRATING.getKey())) {
+                            os.write(ByteUtil.hexString2ByteArray(Constant.GRATING_RELIEVE_CMD.EXIT_GRATING.getValue()));
+                            os.flush();
+                        }
+                        //根据参数判定哪个光栅进行超高检测  > condifvalue为Y开启光栅检测，N关闭光栅检测
+                        SysConfig config = new SysConfig();
+                        config.setConfigName("光栅");
+                        config.setConfigValue("Y");
+                        List<SysConfig> list = configService.selectConfigList(config);
+                        for (SysConfig sysConfig : list) {
+                            String detectionSignal = Constant.GRATING_DETECTION_SIGNAL.getValueByKey(sysConfig.getConfigKey());
+                            if (StringUtils.isBlank(detectionSignal)) continue;
+                            os.write(ByteUtil.hexString2ByteArray(detectionSignal));
+                            os.flush();
+                            Thread.sleep(200);
+                        }
+                    } catch (Exception e) {
+                        log.error("光栅客户端断开：" + e.getMessage());
+                        //关闭连接
                         try {
-                            os = client.getOutputStream();
-
-                            //根据参数判定哪个光栅进行超高检测  > condifvalue为Y开启光栅检测，N关闭光栅检测
-                            SysConfig config = new SysConfig();
-                            config.setConfigName("光栅");
-                            config.setConfigValue("Y");
-                            List<SysConfig> list = configService.selectConfigList(config);
-                            for (SysConfig sysConfig : list) {
-                                String detectionSignal = Constant.GRATING_DETECTION_SIGNAL.getValueByKey(sysConfig.getConfigKey());
-                                if (StringUtils.isBlank(detectionSignal)) continue;
-                                os.write(ByteUtil.hexString2ByteArray(detectionSignal));
-                                os.flush();
-                                Thread.sleep(200);
-                            }
-
-//                            for (int i = 0; i < list.size(); i++) {
-//                                //发送检测信号到光栅PLC
-//                                switch (list.get(i).getConfigKey()) {
-//                                    case "sys.guangshan.no1":
-//                                        // 光栅1 发送检测信号
-////                                        log.info("------------光栅1 发送检测信号------------>");
-//                                        os.write(ByteUtil.hexString2ByteArray("3F00010D0A"));
-//                                        break;
-//                                    case "sys.guangshan.no2":
-//                                        // 光栅2 发送检测信号
-////                                        log.info("------------光栅2 发送检测信号------------>");
-//                                        os.write(ByteUtil.hexString2ByteArray("3F00020D0A"));
-//                                        break;
-//                                    case "sys.guangshan.no3":
-//                                        // 光栅3 发送检测信号
-////                                        log.info("------------光栅3 发送检测信号------------>");
-//                                        os.write(ByteUtil.hexString2ByteArray("3F00030D0A"));
-//                                        break;
-//                                    case "sys.guangshan.no4":
-//                                        // 光栅4 发送检测信号
-////                                        log.info("------------光栅4 发送检测信号------------>");
-//                                        os.write(ByteUtil.hexString2ByteArray("3F00040D0A"));
-//                                        break;
-//                                }
-//                                os.flush();
-//                                Thread.sleep(200);
-//                            }
-                        } catch (Exception e) {
-                            log.error("光栅客户端断开：" + e.getMessage());
-                            //关闭连接
-                            try {
-                                os.close();
-                                client.close();
-                            } catch (Exception ex) {
-                                ex.printStackTrace();
-                            }
-                            throw new RuntimeException("光栅客户端断开,释放线程资源：" + e.getMessage());
+                            os.close();
+                            client.close();
+                        } catch (Exception ex) {
+                            ex.printStackTrace();
                         }
+                        throw new RuntimeException("光栅客户端断开,释放线程资源：" + e.getMessage());
                     }
-                }, 6000, 2000);
+                }, 1000, 500, TimeUnit.MILLISECONDS);
                 new ClientHandler(client, configService).start();
             } catch (IOException e) {
                 System.out.println("光栅服务端异常:" + e);

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/base/BaseSkuTypeController.java

@@ -1,27 +1,18 @@
 package com.ruoyi.web.controller.warewms.base;
 
-import java.util.ArrayList;
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.ruoyi.web.vo.DictVO;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.base.domain.BaseSkuType;
+import com.ruoyi.base.service.IBaseSkuTypeService;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.base.domain.BaseSkuType;
-import com.ruoyi.base.service.IBaseSkuTypeService;
 import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 物料分类Controller

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wcs/WcsController.java

@@ -42,17 +42,27 @@ public class WcsController {
     private final static String CLOSE = "CLOSE";
 
     /**
-     * 按钮盒对应出库区域ip
+     * 按钮盒对应出库区域ip(旧)
      */
     private final static String EXIT_AREA_IP = "192.168.77.105";
 
     /**
-     * 按钮盒对应入库区域ip
+     * 按钮盒对应出库区域ip
+     */
+    private final static String NEW_EXIT_AREA_IP = "192.168.77.108";
+
+    /**
+     * 按钮盒对应入库区域ip(旧)
      */
     private final static String STORAGE_AREA_IP = "192.168.77.104";
 
     /**
-     * 按钮盒控制
+     * 按钮盒对应入库区域ip
+     */
+    private final static String NEW_STORAGE_AREA_IP = "192.168.77.107";
+
+    /**
+     * 按钮盒控制对应NDC任务类型
      */
     private static final Map<String, String> buttonBoxControlMap= new HashMap<String, String>(){
         {
@@ -62,12 +72,24 @@ public class WcsController {
     };
 
     /**
-     * 按钮盒区域对应id
+     * 按钮盒解除管控对应光栅缓存key
+     */
+    private static final Map<String, String> buttonBoxGratingRedisKeyMap= new HashMap<String, String>(){
+        {
+            put(Constant.AREA_INFO.STORAGE_AREA.getValue(), Constant.GRATING_RELIEVE_CMD.STORAGE_GRATING.getKey());
+            put(Constant.AREA_INFO.EXIT_AREA.getValue(), Constant.GRATING_RELIEVE_CMD.EXIT_GRATING.getKey());
+        }
+    };
+
+    /**
+     * 按钮盒区域对应NDCid
      */
     private static final Map<String, String> buttonBoxAreaMap= new HashMap<String, String>(){
         {
             put(EXIT_AREA_IP, Constant.AREA_INFO.EXIT_AREA.getValue());
             put(STORAGE_AREA_IP, Constant.AREA_INFO.STORAGE_AREA.getValue());
+            put(NEW_EXIT_AREA_IP, Constant.AREA_INFO.EXIT_AREA.getValue());
+            put(NEW_STORAGE_AREA_IP, Constant.AREA_INFO.STORAGE_AREA.getValue());
         }
     };
 
@@ -81,6 +103,7 @@ public class WcsController {
         if (Constant.TASK_BUSINESS_TYPE.TASK_75.getValue().equals(businessType)
                 && redisCache.checkIsExist(Constant.AREA_INFO.getKeyByValue(op))) {
             insertAmsTask(op, Constant.TASK_BUSINESS_TYPE.TASK_77.getValue());
+            redisCache.setCacheObject(buttonBoxGratingRedisKeyMap.get(op), Boolean.TRUE, 3, TimeUnit.SECONDS);
             redisCache.deleteObject(Constant.AREA_INFO.getKeyByValue(op));
         }
         insertAmsTask(op, businessType);

ruoyi-admin/src/main/resources/application-dev.yml

@@ -91,4 +91,4 @@ logging:
 testtag:
     autosend: false
     aciservice: false
-    gsService: false
+    gsService: true

warewms-base/src/main/java/com/ruoyi/base/constant/Constant.java

@@ -643,11 +643,11 @@ public class Constant {
         /***
          * 5号光栅
          */
-        NO5("sys.guangshan.no5", "3F00510D0A"),
+        NO5("sys.guangshan.no5", "0000000000"),
         /***
          * 6号光栅
          */
-        NO6("sys.guangshan.no6", "3F00610D0A");
+        NO6("sys.guangshan.no6", "0000000000");
 
         /**
          * 光栅编号
@@ -762,4 +762,73 @@ public class Constant {
                     .map(AREA_INFO::getKey).findFirst().orElseGet(() -> null);
         }
     }
+
+    /**
+     * 出入库区域光栅解除信号
+     */
+    public enum GRATING_RELIEVE_CMD {
+        /***
+         * 入库区域光栅
+         */
+        STORAGE_GRATING("storageAreaGrating", "3F00500D0A"),
+        /***
+         * 出库区域光栅
+         */
+        EXIT_GRATING("exitAreaGrating", "3F00600D0A");
+
+        /**
+         * 区域缓存key
+         */
+        private String key;
+
+        /**
+         * 接触信号
+         */
+        private String value;
+
+        GRATING_RELIEVE_CMD(String key, String value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        /**
+         * 获取区域缓存key
+         *
+         * @return
+         */
+        public String getKey() {
+            return key;
+        }
+
+        /**
+         * 获取区域光栅解除信号
+         *
+         * @return
+         */
+        public String getValue() {
+            return value;
+        }
+
+        /**
+         * 根据区域缓存key获取区域光栅解除信号
+         *
+         * @param key
+         * @return
+         */
+        public static String getValueByKey(String key) {
+            return Arrays.stream(values()).filter(item -> CompareUtil.compare(item.getKey(), key) == 0)
+                    .map(GRATING_RELIEVE_CMD::getValue).findFirst().orElseGet(() -> null);
+        }
+
+        /**
+         * 根据区域对接杭叉AGV LP0字段获取区域缓存key
+         *
+         * @param value
+         * @return
+         */
+        public static String getKeyByValue(String value) {
+            return Arrays.stream(values()).filter(item -> CompareUtil.compare(item.getValue(), value) == 0)
+                    .map(GRATING_RELIEVE_CMD::getKey).findFirst().orElseGet(() -> null);
+        }
+    }
 }