添加叠包机允许进入信号对接及删除库存管控任务下发逻辑

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

@@ -114,3 +114,33 @@ rfid:
         number-of-tags: 3 # 一次读取标签的数量
         timeout-milliseconds: 5000
 
+    # plc连接配置
+plc:
+    plcList[0]:
+        ip: 192.68.100.101
+        enable: false
+        name: packingMachine_1Plc
+        ePlcType: S1200
+        heartbeat: DB5000.2
+        confirmTheStatus:
+    plcList[1]:
+        ip: 192.68.100.102
+        enable: false
+        name: packingMachine_2Plc
+        ePlcType: S1200
+        heartbeat: DB5000.2
+        confirmTheStatus:
+    plcList[2]:
+        ip: 192.68.100.103
+        enable: false
+        name: packingMachine_3Plc
+        ePlcType: S1200
+        heartbeat: DB5000.2
+        confirmTheStatus:
+    plcList[3]:
+        ip: 192.68.100.104
+        enable: false
+        name: stackingMachinePlc
+        ePlcType: S1200
+        heartbeat: DB5000.2
+        confirmTheStatus:

ruoyi-dongfangyaiye/src/main/java/com/ruoyi/taiye/job/AMSJob.java

@@ -36,7 +36,7 @@ public class AMSJob {
             boolean b1 = plcConnectServiceRunner.getPlcServer(PLCConnectNameEnum.STACKING_MACHINE.getMetadata()).readBoolean(PLCEnum.STACKING_MACHINE_FEEDING.getMetadata());
             deviceLogService.insertDeviceLog(new DeviceLog(PLCConnectNameEnum.STACKING_MACHINE.getMetadata(),PLCConnectNameEnum.STACKING_MACHINE.getMetaName(),"获取到上料信号："+b1,"1"));
             if (b1) {
-                processService.createPackingMachineUnloadingTask("PM_L_1", 001);
+                processService.createPackingMachineUnloadingTask("PM_L_1", 100000);
             }
         }
     }

ruoyi-dongfangyaiye/src/main/java/com/ruoyi/taiye/service/impl/ProcessServiceImpl.java

@@ -40,9 +40,9 @@ public class ProcessServiceImpl implements ProcessService {
         if (!tasking.isEmpty()){
             return;
         }
-        BaseLocationInfo fromLocation = iBaseLocationInfoService.selectBaseLocationInfoByIdOrNo(SMID, Constant.WAREHOUSE_ID);
-        fromLocation.setIsEmpty("N");
-        iBaseLocationInfoService.updateBaseLocationInfo(fromLocation);
+//        BaseLocationInfo fromLocation = iBaseLocationInfoService.selectBaseLocationInfoByIdOrNo(SMID, Constant.WAREHOUSE_ID);
+//        fromLocation.setIsEmpty("N");
+//        iBaseLocationInfoService.updateBaseLocationInfo(fromLocation);
         AgvCallDTO agvCallDTO = new AgvCallDTO();
         agvCallDTO.setLocationFrom(from+"");
         agvCallDTO.setLocationTo(SMID);

ruoyi-system/src/main/java/com/ruoyi/system/enums/PLCEnum.java

@@ -97,6 +97,11 @@ public enum PLCEnum {
      */
     STACKING_MACHINE_FEEDING("DB5001.0.0"),
 
+    /**
+     * 叠包机允许进入
+     */
+    STACKING_MACHINE_FEEDING_ENTER("DB5001.0.1"),
+
     /**
      * 叠包机上料完成信号
      */

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

@@ -675,21 +675,21 @@ public class BusinessServiceImpl implements IBusinessService {
         BaseLocationZone basLocationZoneTo = null;
 
         //起始库位
-        basLocationInfoFrom = baseLocationInfoService.selectBaseLocationInfoById(Long.parseLong(wcsTask.getLocationFrom()));
+//        basLocationInfoFrom = baseLocationInfoService.selectBaseLocationInfoById(Long.parseLong(wcsTask.getLocationFrom()));
         //目标库位
 //        BaseLocationInfo locationInfoTo = baseLocationInfoService.selectBaseLocationInfoById(Long.parseLong(wcsTask.getLocationTo()));
         //TODO 前置任务未完成不进行下发
-        if (businessService.taskDispatchCheck(wcsTask) == false) {
-            return false;
-        }
+//        if (businessService.taskDispatchCheck(wcsTask) == false) {
+//            return false;
+//        }
 
-        if (basLocationInfoFrom != null) {
+//        if (basLocationInfoFrom != null) {
 
-            if (basLocationInfoFrom.getIsEmpty().equals("Y")) {
-                wcsTask.setRemark("起始库位为空无法进行任务");
-                wcsTaskService.updateWcsTask(wcsTask);
-                return false;
-            }
+//            if (basLocationInfoFrom.getIsEmpty().equals("Y")) {
+//                wcsTask.setRemark("起始库位为空无法进行任务");
+//                wcsTaskService.updateWcsTask(wcsTask);
+//                return false;
+//            }
 
             //起始库位巷道检测(起始库位检测是否同巷道)
 //            if (!StringUtils.isEmpty(basLocationInfoFrom.getColNo())) {
@@ -700,7 +700,7 @@ public class BusinessServiceImpl implements IBusinessService {
 //                    return false;
 //                }
 //            }
-        }
+//        }
 
         //起始库位是地堆需要判断是否有阻挡
 //        if (basLocationInfoFrom.getLocationType().equals("2")) {

warewms-ams/src/main/java/com/ruoyi/ams/task/service/impl/WcsTaskServiceImpl.java

@@ -415,6 +415,7 @@ public class WcsTaskServiceImpl implements IWcsTaskService {
                         if (!StringUtils.isEmpty(wcsTask.getExt8())) {
                             redisCache.unlockCacheObject(Long.parseLong(wcsTask.getExt8()));
                         }
+                        //叠包机
                         if (wcsTask.getTaskType().substring(0, 4).equals("PM_L")) {
                             plcConnectServiceRunner.getPlcServer(PLCConnectNameEnum.STACKING_MACHINE.getMetadata()).writeBoolean(PLCEnum.STACKING_MACHINE_FEEDING_FINISH.getMetadata(), true);
                         }