Parcourir la source

模具搬运完善-增加了两个流程配置项

k il y a 2 ans
Parent
commit
3c8f48cf9f

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

@@ -41,29 +41,29 @@ public class AutoButtonBoxTask {
     }
 
     /**
-     * 按钮1业务(冲边任务)
+     * 按钮1业务(硫化任务)
      */
     public void buttonTask01() {
         log.info("按钮1已经被按下");
-        // 下发模具搬运任务(冲边)
+        // 下发模具搬运任务
         AgvCallDTO agvCallDTO = new AgvCallDTO();
         agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
         agvCallDTO.setLocationFrom("");
         List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
         AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-        agvCallItemDTO.setSku("冲边模具");
+        agvCallItemDTO.setSku("硫化模具");
         LotattDTO lotattDTO = new LotattDTO();
-        lotattDTO.setLotatt01("冲边模具");
+        lotattDTO.setLotatt01("硫化模具");
         agvCallItemDTO.setLotattDTO(lotattDTO);
         agvCallItemDTOList.add(agvCallItemDTO);
         agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        AjaxResult ajaxResult = businessService.agvCall(Constant.MOLD_HANDLING_CB_FLOW_ID, agvCallDTO);
+        AjaxResult ajaxResult = businessService.agvCall(Constant.MOLD_HANDLING_LH_FLOW_ID, agvCallDTO);
         if (!ajaxResult.isSuccess()) {
-            log.error("下发模具搬运任务(冲边)失败:" + ajaxResult.getMsg());
+            log.error("下发模具搬运任务(硫化)失败:" + ajaxResult.getMsg());
             return;
         }
         try {
-            Thread.sleep(10000);
+            Thread.sleep(1000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
@@ -75,29 +75,29 @@ public class AutoButtonBoxTask {
     }
 
     /**
-     * 按钮2业务(硫化任务)
+     * 按钮2业务(冲边任务)
      */
     public void buttonTask02() {
         log.info("按钮2已经被按下");
-        // 下发模具搬运任务(硫化)
+        // 下发模具搬运任务
         AgvCallDTO agvCallDTO = new AgvCallDTO();
         agvCallDTO.setWarehouseId(Constant.WAREHOUSE_ID);
         agvCallDTO.setLocationFrom("");
         List<AgvCallItemDTO> agvCallItemDTOList = new ArrayList<>();
         AgvCallItemDTO agvCallItemDTO = new AgvCallItemDTO();
-        agvCallItemDTO.setSku("硫化模具");
+        agvCallItemDTO.setSku("冲边模具");
         LotattDTO lotattDTO = new LotattDTO();
-        lotattDTO.setLotatt01("硫化模具");
+        lotattDTO.setLotatt01("冲边模具");
         agvCallItemDTO.setLotattDTO(lotattDTO);
         agvCallItemDTOList.add(agvCallItemDTO);
         agvCallDTO.setAgvCallItemDTOList(agvCallItemDTOList);
-        AjaxResult ajaxResult = businessService.agvCall(Constant.MOLD_HANDLING_LH_FLOW_ID, agvCallDTO);
+        AjaxResult ajaxResult = businessService.agvCall(Constant.MOLD_HANDLING_CB_FLOW_ID, agvCallDTO);
         if (!ajaxResult.isSuccess()) {
-            log.error("下发模具搬运任务(硫化)失败:" + ajaxResult.getMsg());
+            log.error("下发模具搬运任务(冲边)失败:" + ajaxResult.getMsg());
             return;
         }
         try {
-            Thread.sleep(10000);
+            Thread.sleep(1000);
         } catch (InterruptedException e) {
             e.printStackTrace();
         }

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

@@ -29,17 +29,13 @@ public class Constant {
      */
     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_LH_FLOW_ID = 24;
     /**
      * 模具搬运(冲边)
      */
-    public static final long MOLD_HANDLING_CB_FLOW_ID = 24;
-    /**
-     * 模具搬运(硫化)
-     */
-    public static final long MOLD_HANDLING_LH_FLOW_ID = 25;
+    public static final long MOLD_HANDLING_CB_FLOW_ID = 25;
 
 
     /**