永湖光栅对接最终版

base_sql/pallet_sql/yonghu_dml_20230921.sql

@@ -26,3 +26,15 @@ INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type
 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');
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES (251, '78', '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 (252, '78', '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 (253, '78', '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 (254, '78', '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 (255, '78', '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 (256, '78', '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 (257, '78', 'TS Order', 1, NULL, '4E', 1, 7);
+INSERT INTO `ams_hexdefine_detail` (`id`, `business_type`, `col_name`, `col_type`, `bind_table`, `col_val`, `val_type`, `sort_index`) VALUES (258, '78', '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 (259, '78', '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 (260, '78', '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 (261, '78', 'LP0', 2, NULL, 'ext1', 1, 11);
+

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/IAmsTaskService.java

@@ -1,9 +1,9 @@
 package com.ruoyi.ams.agv.ndc.service;
 
-import java.util.List;
-
 import com.ruoyi.ams.agv.ndc.domain.AmsTask;
 
+import java.util.List;
+
 /**
  * ams任务列表Service接口
  *
@@ -72,4 +72,6 @@ public interface IAmsTaskService {
      * @return
      */
     List<AmsTask> selectTaskNotIssued();
+
+    void insertGratingAmsTask(String op, String businessType);
 }

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/service/impl/AmsTaskServiceImpl.java

@@ -1,11 +1,15 @@
 package com.ruoyi.ams.agv.ndc.service.impl;
 
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.ams.agv.ndc.mapper.AmsTaskMapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.ruoyi.ams.agv.ndc.common.ByteUtil;
+import com.ruoyi.ams.agv.ndc.common.CRC16Util;
 import com.ruoyi.ams.agv.ndc.domain.AmsTask;
+import com.ruoyi.ams.agv.ndc.mapper.AmsTaskMapper;
 import com.ruoyi.ams.agv.ndc.service.IAmsTaskService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * ams任务列表Service业务层处理
@@ -112,4 +116,15 @@ public class AmsTaskServiceImpl implements IAmsTaskService
     public List<AmsTask> selectTaskNotIssued() {
         return amsTaskMapper.selectTaskNotIssued();
     }
+
+    @Override
+    public void insertGratingAmsTask(String op, String businessType){
+        AmsTask amsTask = new AmsTask();
+        amsTask.setTaskNo(IdWorker.getIdStr());
+        amsTask.setIkey(Long.parseLong(String.valueOf(CRC16Util.calcCrc16(ByteUtil.string2byteArray(amsTask.getTaskNo())))));
+        amsTask.setPriority(1);
+        amsTask.setBusinessType(businessType);
+        amsTask.setExt1(op);
+        amsTaskMapper.insertAmsTask(amsTask);
+    }
 }

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

@@ -0,0 +1,27 @@
+package com.ruoyi.ams.wcs.controller;
+
+import com.ruoyi.ams.wcs.form.BtnOpForm;
+import com.ruoyi.ams.wcs.service.IWcsService;
+import com.ruoyi.common.core.domain.AjaxResult;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Slf4j
+@RestController
+@RequestMapping("/wcs/ctl")
+public class WcsController {
+
+
+    @Autowired
+    private IWcsService wcsService;
+
+    @PostMapping("/btnOp")
+    public AjaxResult buttonBoxOperation(@RequestBody BtnOpForm btnOpForm) {
+        wcsService.buttonBoxOperation(btnOpForm);
+        return AjaxResult.success();
+    }
+}

warewms-ams/src/main/java/com/ruoyi/ams/wcs/form/BtnOpForm.java

@@ -0,0 +1,9 @@
+package com.ruoyi.ams.wcs.form;
+
+import lombok.Data;
+
+@Data
+public class BtnOpForm {
+    private String ip;
+    private String opType;
+}

warewms-ams/src/main/java/com/ruoyi/ams/wcs/service/IWcsService.java

@@ -0,0 +1,14 @@
+package com.ruoyi.ams.wcs.service;
+
+import com.ruoyi.ams.wcs.form.BtnOpForm;
+
+/**
+ * 出库单头Service接口
+ *
+ * @author ruoyi
+ * @date 2022-10-18
+ */
+public interface IWcsService {
+
+    void buttonBoxOperation(BtnOpForm btnOpForm);
+}

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

@@ -1,30 +1,29 @@
-package com.ruoyi.web.controller.warewms.wcs;
+package com.ruoyi.ams.wcs.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
-import com.ruoyi.ams.agv.ndc.common.ByteUtil;
-import com.ruoyi.ams.agv.ndc.common.CRC16Util;
-import com.ruoyi.ams.agv.ndc.domain.AmsTask;
 import com.ruoyi.ams.agv.ndc.service.IAmsTaskService;
+import com.ruoyi.ams.wcs.form.BtnOpForm;
+import com.ruoyi.ams.wcs.service.IWcsService;
 import com.ruoyi.base.constant.Constant;
-import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.web.form.BtnOpForm;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
+/**
+ * 出库单头Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-10-18
+ */
 @Slf4j
-@RestController
-@RequestMapping("/wcs/ctl")
-public class WcsController {
+@Service
+public class WcsServiceImpl implements IWcsService {
+
 
     @Autowired
     private RedisCache redisCache;
@@ -81,6 +80,16 @@ public class WcsController {
         }
     };
 
+    /**
+     * 解除管控对应ndc任务类型
+     */
+    private static final Map<String, String> ndcReleaseControlBusinessTypeMap= new HashMap<String, String>(){
+        {
+            put(Constant.AREA_INFO.STORAGE_AREA.getValue(), Constant.TASK_BUSINESS_TYPE.TASK_77.getValue());
+            put(Constant.AREA_INFO.EXIT_AREA.getValue(), Constant.TASK_BUSINESS_TYPE.TASK_78.getValue());
+        }
+    };
+
     /**
      * 按钮盒区域对应NDCid
      */
@@ -93,8 +102,8 @@ public class WcsController {
         }
     };
 
-    @PostMapping("/btnOp")
-    public AjaxResult add(@RequestBody BtnOpForm btnOpForm) {
+    @Override
+    public void buttonBoxOperation(BtnOpForm btnOpForm){
         log.info("按钮盒请求------------------------》" + JSON.toJSONString(btnOpForm));
         redisCache.setCacheObject(btnOpForm.getIp() + btnOpForm.getOpType(), btnOpForm.getOpType(), 15, TimeUnit.SECONDS);
 
@@ -102,23 +111,11 @@ public class WcsController {
         String businessType = buttonBoxControlMap.get(btnOpForm.getOpType());
         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());
+            amsTaskService.insertGratingAmsTask(op, ndcReleaseControlBusinessTypeMap.get(op));
             redisCache.setCacheObject(buttonBoxGratingRedisKeyMap.get(op), Boolean.TRUE, 3, TimeUnit.SECONDS);
             redisCache.deleteObject(Constant.AREA_INFO.getKeyByValue(op));
         }
-        insertAmsTask(op, businessType);
-        return AjaxResult.success("");
+        amsTaskService.insertGratingAmsTask(op, businessType);
     }
 
-    private void insertAmsTask(String op, String businessType){
-        AmsTask amsTask = new AmsTask();
-        amsTask.setTaskNo(IdWorker.getIdStr());
-        amsTask.setIkey(Long.parseLong(String.valueOf(CRC16Util.calcCrc16(ByteUtil.string2byteArray(amsTask.getTaskNo())))));
-        amsTask.setStFrom(Integer.valueOf(Constant.LOC_MIDDLE_CACHE.toString()));
-        amsTask.setStTo(Integer.valueOf(Constant.LOC_SORTATION_CACHE.toString()));
-        amsTask.setPriority(1);
-        amsTask.setBusinessType(businessType);
-        amsTask.setExt1(op);
-        amsTaskService.insertAmsTask(amsTask);
-    }
-}
+}

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

@@ -337,6 +337,11 @@ public class Constant {
          * 光栅解除交通管制
          */
         TASK_77("77"),
+
+        /**
+         * 光栅解除交通管制
+         */
+        TASK_78("78"),
         /**
          * 暂停
          */