1.删除冗余代码

2.维护搬运配置枚举

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

@@ -2,22 +2,15 @@ package com.ruoyi.init;
 
 import com.ruoyi.ams.agv.ndc.AciService;
 import com.ruoyi.ams.agv.ndc.config.InitTaskConfig;
-import com.ruoyi.ams.agv.ndc.thread.*;
+import com.ruoyi.ams.agv.ndc.thread.AciServiceThread;
+import com.ruoyi.ams.agv.ndc.thread.AutoTaskThread;
 import com.ruoyi.ams.business.IBusinessService;
-import com.ruoyi.ams.config.domain.dto.AgvCallDTO;
-import com.ruoyi.ams.config.domain.dto.AgvCallItemDTO;
-import com.ruoyi.ams.config.domain.dto.LotattDTO;
-import com.ruoyi.base.constant.Constant;
-import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.service.IBaseLocationInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Slf4j
 @Component
 public class StartService implements CommandLineRunner {
@@ -29,12 +22,6 @@ public class StartService implements CommandLineRunner {
     @Autowired
     private AciService aciService;
     @Autowired
-    private AutoTranSitTask autoTranSitTask;
-    @Autowired
-    private AutoRfidReaderTask autoRfidReaderTask;
-    @Autowired
-    private AutoButtonBoxTask autoButtonBoxTask;
-    @Autowired
     private IBaseLocationInfoService baseLocationInfoService;
 
     @Override

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaDocAsnController.java

@@ -94,7 +94,7 @@ public class PdaDocAsnController {
             agvCallItemDTOList.add(agvCallItemDTO);
         });
         agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        return businessService.agvCall(Constant.IN_TRAN_FLOW_ID, agvCallDTO);
+        return businessService.agvCall(1l, agvCallDTO);
     }
 
     @Data

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/pda/PdaDocSoController.java

@@ -129,7 +129,7 @@ public class PdaDocSoController {
         agvCallItemDTO.setLotattDTO(lotattDTO);
         agvCallItemDTOList.add(agvCallItemDTO);
         agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        return businessService.agvCall(Constant.STO_TRAN_FLOW_ID, agvCallDTO);
+        return businessService.agvCall(1l, agvCallDTO);
     }
 
     @Data

warewms-ams/src/main/java/com/ruoyi/ams/agv/ndc/thread/AutoButtonBoxTask.java

@@ -57,7 +57,7 @@ public class AutoButtonBoxTask {
         agvCallItemDTO.setLotattDTO(lotattDTO);
         agvCallItemDTOList.add(agvCallItemDTO);
         agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        AjaxResult ajaxResult = businessService.agvCall(Constant.MOLD_HANDLING_CB_FLOW_ID, agvCallDTO);
+        AjaxResult ajaxResult = businessService.agvCall(1l, agvCallDTO);
         if (!ajaxResult.isSuccess()) {
             log.error("下发模具搬运任务（冲边）失败：" + ajaxResult.getMsg());
             return;
@@ -91,7 +91,7 @@ public class AutoButtonBoxTask {
         agvCallItemDTO.setLotattDTO(lotattDTO);
         agvCallItemDTOList.add(agvCallItemDTO);
         agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        AjaxResult ajaxResult = businessService.agvCall(Constant.MOLD_HANDLING_LH_FLOW_ID, agvCallDTO);
+        AjaxResult ajaxResult = businessService.agvCall(1l, agvCallDTO);
         if (!ajaxResult.isSuccess()) {
             log.error("下发模具搬运任务（硫化）失败：" + ajaxResult.getMsg());
             return;

warewms-ams/src/main/java/com/ruoyi/ams/business/BusinessServiceImpl.java

@@ -142,13 +142,6 @@ public class BusinessServiceImpl implements IBusinessService {
                 if (flowConfigHeaderVO.getFlowType().equals("ASN")) {
                     // 统计入库箱数
                     List<AgvCallItemDTO> agvCallItemDTOList = agvCallDTO.getAgvCallItemDTOList();
-                    int boxNum = agvCallItemDTOList.size();
-//                    int boxNum = agvCallItemDTOList.stream()
-//                            .mapToInt(v -> v.getQty().intValue())
-//                            .reduce(Integer::sum).getAsInt();
-                    asnSoStrategy.setAsnHeightLimit(boxNum + "");
-                    log.info("统计箱数量：" + boxNum);
-
                     List<BaseLocationInfo> locationFromList = this.convertLocation(paramLocationFrom, agvCallDTO.getWarehouseId(), null);
                     List<BaseLocationInfo> locationToList = this.convertLocation(paramLocationTo, agvCallDTO.getWarehouseId(), "shift_no+ 0,shift_index");
                     locationFrom = this.zoneLocationAllocation(locationFromList, "locationFrom", "ASN", asnSoStrategy, token);
@@ -302,17 +295,6 @@ public class BusinessServiceImpl implements IBusinessService {
                     if (!b.getStockStatus().equals("00") || !b.getIsEmpty().equals("Y") || redisCache.checkIsLock(RedisKey.LOCK_LOCATION + b.getId())) {
                         continue;
                     }
-                    // 第六层不能放数量超过2的货
-                    int boxNum = Integer.parseInt(asnSoStrategy.getAsnHeightLimit());
-                    if (b.getShiftNo().equals("6")) {
-                        if (boxNum > 2) continue;
-                    } else {
-                        // 其他层数放置箱子数量不能超过6
-                        if (boxNum > 6) {
-                            log.error("入库箱数量不能超过6！");
-                            continue;
-                        }
-                    }
                     if (!redisCache.lockCacheObject(RedisKey.LOCK_LOCATION + b.getId(), b.getId().toString(), token)) {
                         continue;
                     }
@@ -662,22 +644,22 @@ public class BusinessServiceImpl implements IBusinessService {
                 , Constant.WAREHOUSE_ID, null);
         for (BaseLocationInfo baseLocationInfo : baseLocationInfos) {
             // 判断是否有货并且空闲
-            if (baseLocationInfo.getStockStatus().equals(Constant.STOCK_STATUS.STOCK00.getValue())
-                    && baseLocationInfo.getIsEmpty().equals(Constant.IS_YES.N.name())) {
-                if (baseLocationInfo.getUserdefine1().equals("ASN")) {
-                    AgvCallDTO agvCallDTO = new AgvCallDTO();
-                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
-                    businessService.agvCall(Constant.TRAN_STO_FLOW_ID, agvCallDTO);
-                } else if (baseLocationInfo.getUserdefine1().equals("SO_HG")) {
-                    AgvCallDTO agvCallDTO = new AgvCallDTO();
-                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
-                    businessService.agvCall(Constant.TRAN_OUT_FLOW_ID, agvCallDTO);
-                } else if (baseLocationInfo.getUserdefine1().equals("SO_BHG")) {
-                    AgvCallDTO agvCallDTO = new AgvCallDTO();
-                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
-                    businessService.agvCall(Constant.TRAN_OUT_BHG_FLOW_ID, agvCallDTO);
-                }
-            }
+//            if (baseLocationInfo.getStockStatus().equals(Constant.STOCK_STATUS.STOCK00.getValue())
+//                    && baseLocationInfo.getIsEmpty().equals(Constant.IS_YES.N.name())) {
+//                if (baseLocationInfo.getUserdefine1().equals("ASN")) {
+//                    AgvCallDTO agvCallDTO = new AgvCallDTO();
+//                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
+//                    businessService.agvCall(Constant.TRAN_STO_FLOW_ID, agvCallDTO);
+//                } else if (baseLocationInfo.getUserdefine1().equals("SO_HG")) {
+//                    AgvCallDTO agvCallDTO = new AgvCallDTO();
+//                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
+//                    businessService.agvCall(Constant.TRAN_OUT_FLOW_ID, agvCallDTO);
+//                } else if (baseLocationInfo.getUserdefine1().equals("SO_BHG")) {
+//                    AgvCallDTO agvCallDTO = new AgvCallDTO();
+//                    agvCallDTO.setLocationFrom(baseLocationInfo.getLocationNo());
+//                    businessService.agvCall(Constant.TRAN_OUT_BHG_FLOW_ID, agvCallDTO);
+//                }
+//            }
         }
     }
 

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

@@ -8,40 +8,6 @@ package com.ruoyi.base.constant;
 public class Constant {
     public static final String CUSTOMER_ID = "default";
     public static final Long WAREHOUSE_ID = 1L;
-    /**
-     * 入库缓存区到接驳位
-     */
-    public static final long IN_TRAN_FLOW_ID = 18;
-    /**
-     * 接驳位到仓储区
-     */
-    public static final long TRAN_STO_FLOW_ID = 19;
-    /**
-     * 仓储区到接驳位
-     */
-    public static final long STO_TRAN_FLOW_ID = 20;
-    /**
-     * 接驳位到出库缓存区
-     */
-    public static final long TRAN_OUT_FLOW_ID = 21;
-    /**
-     * 接驳位到不合格区
-     */
-    public static final long TRAN_OUT_BHG_FLOW_ID = 22;
-    /**
-     * 模具搬运（移库）
-     */
-    public static final long MOLD_HANDLING_MV_FLOW_ID = 23;
-    /**
-     * 模具搬运（冲边）
-     */
-    public static final long MOLD_HANDLING_CB_FLOW_ID = 24;
-    /**
-     * 模具搬运（硫化）
-     */
-    public static final long MOLD_HANDLING_LH_FLOW_ID = 25;
-
-
     /**
      * 入库缓存位
      */
@@ -58,6 +24,82 @@ public class Constant {
      */
     public static final Long LOC_MIDDLE_CACHE = 99999l;
 
+    /**
+     * 搬运任务配置id
+     */
+    public enum FLOW_CONFIG_ID {
+        /***
+         * 补空托（空托暂存区）
+         */
+        ONE(1l),
+        /**
+         * 空托上料（硫酸镍）
+         */
+        TWO(2l),
+        /**
+         * 空托上料（氯化镍）
+         */
+        THREE(3l),
+        /**
+         * 废料搬运（硫酸镍）
+         */
+        FOUR(4l),
+        /**
+         * 废料搬运（氯化镍）
+         */
+        FIVE(5l),
+        /**
+         * 成品下线（硫酸镍）->裹膜
+         */
+        SIX(6l),
+        /**
+         * 成品下线（硫酸镍）->仓储区
+         */
+        SEVEN(7l),
+        /**
+         * 成品下线（硫酸镍）-裹膜->仓储区
+         */
+        EIGHT(8l),
+        /**
+         * 成品下线（氯化镍）->裹膜
+         */
+        NINE(9l),
+        /**
+         * 成品下线（氯化镍）->仓储区
+         */
+        TEN(10l),
+        /**
+         * 成品下线（氯化镍）-裹膜->仓储区
+         */
+        ELEVEN(11l),
+        /**
+         * 辅料搬运（硫酸镍）
+         */
+        TWELVE(12l),
+        /**
+         * 辅料搬运（氯化镍）
+         */
+        THIRTEEN(13l),
+        /**
+         * 成品出库（硫酸镍）
+         */
+        FOURTEEN(14l),
+        /**
+         * 成品出库（氯化镍）
+         */
+        FIFTEEN(15l);
+
+        private Long flowId;
+
+        FLOW_CONFIG_ID(Long flowId) {
+            this.flowId = flowId;
+        }
+
+        public Long getValue() {
+            return flowId;
+        }
+    }
+
     /**
      * 是否
      */