优化任务拆分及生成

warewms-tianao/pom.xml

@@ -45,21 +45,7 @@
             <artifactId>warewms-ams</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.github.rholder</groupId>
-            <artifactId>guava-retrying</artifactId>
-        </dependency>
 
-        <dependency>
-            <groupId>com.github.xingshuangs</groupId>
-            <artifactId>iot-communication</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.paho</groupId>
-            <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-            <version>1.2.2</version>
-        </dependency>
     </dependencies>
 
 </project>

warewms-tianao/src/main/java/com/ruoyi/tianao/job/FeedbackJob.java

@@ -1,11 +1,10 @@
 package com.ruoyi.tianao.job;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONObject;
 import com.ruoyi.base.domain.CarInfo;
 import com.ruoyi.base.service.ICarInfoService;
-import com.ruoyi.tianao.init.PublishAGVInfo;
+import com.ruoyi.system.init.PublishAGVInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 

warewms-tianao/src/main/java/com/ruoyi/tianao/service/TianaoService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.tianao.service;
 
 import com.alibaba.fastjson.JSONObject;
+import com.ruoyi.ams.agv.ndc.domain.AmsTask;
 import com.ruoyi.ams.agv.ndc.entity.CarStatus;
 import com.ruoyi.ams.task.domain.WcsTask;
 import com.ruoyi.tianao.domian.TianaoTask;

warewms-tianao/src/main/java/com/ruoyi/tianao/service/impl/TianaoServiceImpl.java

@@ -1,8 +1,8 @@
 package com.ruoyi.tianao.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.http.HttpRequest;
 import com.alibaba.fastjson.JSONObject;
+import com.github.xingshuangs.iot.protocol.s7.service.S7PLC;
 import com.ruoyi.ams.agv.ndc.domain.AmsTask;
 import com.ruoyi.ams.agv.ndc.entity.CarStatus;
 import com.ruoyi.ams.agv.ndc.service.IAmsTaskService;
@@ -12,17 +12,15 @@ import com.ruoyi.ams.task.mapper.WcsTaskMapper;
 import com.ruoyi.ams.task.service.IWcsTaskService;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
-import com.ruoyi.base.domain.BaseLocationZone;
 import com.ruoyi.base.mapper.BaseLocationZoneMapper;
 import com.ruoyi.base.service.IBaseLocationInfoService;
-import com.ruoyi.base.service.IBaseLocationZoneService;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.system.service.ISysConfigService;
-import com.ruoyi.system.service.impl.SysConfigServiceImpl;
 import com.ruoyi.tianao.domian.TianaoTask;
+import com.ruoyi.system.init.PlcConnectServiceRunner;
 import com.ruoyi.tianao.service.TianaoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -72,6 +70,9 @@ public class TianaoServiceImpl implements TianaoService {
     @Autowired
     private ISysConfigService iSysConfigService;
 
+    @Autowired
+    PlcConnectServiceRunner plcConnectServiceRunner;
+
     @Value("${tianao.taskBackUrl}")
     private String taskBackUrl;
     @Value("${tianao.AGVStatusBackUrl}")
@@ -109,6 +110,9 @@ public class TianaoServiceImpl implements TianaoService {
             if ("N".equals(toAddress.getIsEmpty())) {
                 return returnJson("e0001", "目标位置库存不为空", "fail");
             }
+            if (formAddress.getZoneId().equals(10004L) || toAddress.getZoneId().equals(10004L)) {
+                return returnJson("e0001", "该库区无法出入库!", "fail");
+            }
             //判断是否需要拆分任务
             if (zoneList.contains(formAddress.getZoneId()) || zoneList.contains(toAddress.getZoneId())) {
                 WcsTask wcsTask = createWcsTask(tianaoTask, formAddress, toAddress, "0");
@@ -282,6 +286,7 @@ public class TianaoServiceImpl implements TianaoService {
         return jsonObject;
     }
 
+
     @Override
     public String testTask(WcsTask wcsTask) {
         return tianaoCallBack(wcsTask);