rev 循环依赖

acs/nladmin-system/src/main/java/org/nl/acs/agv/server/impl/XianGongAgvServiceImpl.java

@@ -21,6 +21,7 @@ import org.nl.acs.opc.DeviceAppService;
 import org.nl.acs.opc.DeviceType;
 import org.nl.modules.common.exception.BadRequestException;
 import org.nl.modules.system.service.ParamService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
@@ -34,7 +35,8 @@ import java.util.Map;
 public class XianGongAgvServiceImpl implements XianGongAgvService {
     private final DeviceAppService deviceAppService;
     private final ParamService paramService;
-    private final AcsToWmsService acsToWmsService;
+    @Autowired
+    AcsToWmsService acsToWmsService;
     Map<String, AgvDto> AGVDeviceStatus = new HashMap();
 
     @LokiLog(type = LokiLogType.AGV)

acs/nladmin-system/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java

@@ -149,6 +149,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
 
                     //开始任务/上报订单号
                     if (phase == 0x01) {
+                        log.info("开始上报执行中,指令号:{},指令是否为空:{}", ikey, ObjectUtil.isEmpty(inst));
                         if (!ObjectUtil.isEmpty(inst)) {
                             inst.setInstruction_status("1");
                             inst.setAgv_jobno(String.valueOf(index));

acs/nladmin-system/src/main/resources/config/application-dev.yml

@@ -13,7 +13,7 @@ spring:
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
       #      url: jdbc:log4jdbc:mysql://${DB_HOST:10.1.3.91}:${DB_PORT:3306}/${DB_NAME:acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       #      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.81.252}:${DB_PORT:3306}/${DB_NAME:lzhl_one_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
-      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:wzgj_acs}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:szhr}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       #      password: ${DB_PWD:P@ssw0rd}
       #      password: ${DB_PWD:Root.123456}