fix

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

@@ -14,6 +14,7 @@ import org.nl.acs.instruction.service.InstructionService;
 import org.nl.acs.instruction.service.impl.InstructionServiceImpl;
 import org.nl.acs.log.service.DeviceExecuteLogService;
 import org.nl.acs.opc.DeviceAppService;
+import org.nl.acs.task.service.TaskService;
 import org.nl.system.service.lucene.LuceneExecuteLogService;
 import org.nl.system.service.param.ISysParamService;
 import org.nl.config.SpringContextHolder;
@@ -79,6 +80,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
         DeviceAppService deviceAppService = SpringContextHolder.getBean(DeviceAppService.class);
         DeviceService deviceService = SpringContextHolder.getBean(DeviceService.class);
         DeviceExecuteLogService logServer = SpringContextHolder.getBean(DeviceExecuteLogService.class);
+        TaskService taskService=SpringContextHolder.getBean(TaskService.class);
         ip = paramService.findByCode(AcsConfig.AGVURL).getValue();
         port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue());
 
@@ -183,6 +185,7 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                         if (!ObjectUtil.isEmpty(inst)) {
                             if (!ObjectUtil.isEmpty(inst)) {
                                 instructionService.cancelNOSendAgv(inst.getInstruction_id());
+                                taskService.cancel(inst.getTask_id());
                             }
                         }
                         data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);

acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java

@@ -115,7 +115,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             if (arr[18] * 256 + arr[19] == 0) {
 
             }
-            data = NDCAgvService.sendAgvOneModeInst(phase, index, 0,0,0,0,0);
+            data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
         }
 
         //普通站点
@@ -125,11 +125,11 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
         //
         SiemensConveyorDeviceDriver siemensConveyorDeviceDriver;
 
-        TaskDto task =taskService.findById(inst.getTask_id());
-        int start_height= ObjectUtil.isNotEmpty(task.getStart_height())?Integer.parseInt(task.getStart_height()):0;
-        int next_height= ObjectUtil.isNotEmpty(task.getNext_height())?Integer.parseInt(task.getNext_height()):0;
-        String start_point=task.getStart_point_code();
-        String next_point=task.getNext_point_code();
+        TaskDto task = taskService.findById(inst.getTask_id());
+        int start_height = ObjectUtil.isNotEmpty(task.getStart_height()) ? Integer.parseInt(task.getStart_height()) : 0;
+        int next_height = ObjectUtil.isNotEmpty(task.getNext_height()) ? Integer.parseInt(task.getNext_height()) : 0;
+        String start_point = task.getStart_point_code();
+        String next_point = task.getNext_point_code();
 
         //分配 车id
         //(不需要WCS反馈)
@@ -220,7 +220,8 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             data = getData(data, index, inst, task);
             //到达放货等待点
             //(需要WCS反馈)
-    } else if (phase == 0x06) {
+        } else if (phase == 0x06) {
+            data = getData(data, index, inst, task);
             //到达放货点
             //(需要WCS反馈)
         } else if (phase == 0x07) {
@@ -290,7 +291,7 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                 log.info("未找到编号{}对应的指令", ikey);
                 return;
             }
-            data = NDCAgvService.sendAgvOneModeInst(phase, index, 0,0,0,0,0);
+            data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
         }
         //到达位置点
         //(需要WCS反馈)
@@ -298,13 +299,13 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
             //1、根据货位id找到对应三工位设备，赋给agv属性地址对应的满料位设备
             agvaddr = arr[18] * 256 + arr[19];
             agvaddr_copy = agvaddr;
-            data = NDCAgvService.sendAgvOneModeInst(phase, index, 0,0,0,0,0);
+            data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
             logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data);
         } else if (phase == 0x50) {//进入交通灯区域
-            data = NDCAgvService.sendAgvOneModeInst(phase, index, 0,0,0,0,0);
+            data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
             logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data);
         } else if (phase == 0x51) {//离开交通灯区域
-            data = NDCAgvService.sendAgvOneModeInst(phase, index, 0,0,0,0,0);
+            data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
             logServer.deviceExecuteLog(this.device_code, "", "", "agvphase:" + phase + "反馈:" + data);
         }
         if (!ObjectUtil.isEmpty(data)) {
@@ -318,24 +319,24 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
         String start_point;
         int next_height;
         int start_height;
-        if(!"2".equals(task.getTask_type())) {
+        if (!"2".equals(task.getTask_type())) {
             BaseRequest request = new BaseRequest();
             request.setRequestNo(IdUtil.simpleUUID());
             request.setTaskId(task.getExt_task_id());
             JSONObject resp = JSONObject.parseObject(acsToWmsService.feedbackState(request));
-            if("200".equals(resp.getString("code"))){
-                start_height=resp.getJSONObject("parameters").getInteger("start_height");
-                next_height=resp.getJSONObject("parameters").getInteger("next_height");
-                start_point=resp.getJSONObject("parameters").getString("start_point");
-                next_point=resp.getJSONObject("parameters").getString("next_point");
+            if ("200".equals(resp.getString("code"))) {
+                start_height = resp.getJSONObject("parameters").getInteger("start_height");
+                next_height = resp.getJSONObject("parameters").getInteger("next_height");
+                start_point = resp.getJSONObject("parameters").getString("start_point");
+                next_point = resp.getJSONObject("parameters").getString("next_point");
                 task.setStart_height(String.valueOf(start_height));
                 task.setNext_height(String.valueOf(next_height));
                 task.setStart_point_code(start_point);
                 task.setStart_device_code(start_point);
                 task.setNext_point_code(next_point);
                 task.setNext_device_code(next_point);
-                int start_address=deviceService.queryAddressBydeviceCode(start_point);
-                int next_address=deviceService.queryAddressBydeviceCode(next_point);
+                int start_address = deviceService.queryAddressBydeviceCode(start_point);
+                int next_address = deviceService.queryAddressBydeviceCode(next_point);
                 taskService.update(task);
                 inst.setStart_point_code(start_point);
                 inst.setStart_device_code(start_point);
@@ -343,11 +344,11 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
                 inst.setNext_device_code(next_point);
                 instructionService.update(inst);
                 data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, start_address, next_address, start_height, next_height);
-                log.info("指令号:{},phase:{},acs请求wms申请成功", inst.getInstruction_code(),phase);
-            }else{
-                log.info("指令号:{},phase:{},acs请求wms申请失败", inst.getInstruction_code(),phase);
+                log.info("指令号:{},phase:{},acs请求wms申请成功", inst.getInstruction_code(), phase);
+            } else {
+                log.info("指令号:{},phase:{},acs请求wms申请失败", inst.getInstruction_code(), phase);
             }
-        }else {
+        } else {
             data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
         }
         return data;

acs/nladmin-system/nlsso-server/src/main/resources/log/AgvNdcOneDeviceDriver.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="AgvNdcOneDeviceDriver" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/AGV驱动与NDC交互/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>2GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+
+    </appender>
+
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.acs.device_driver.basedriver.agv.ndcone.AgvNdcOneDeviceDriver" level="info" additivity="false">
+        <appender-ref ref="AgvNdcOneDeviceDriver"/>
+    </logger>
+</included>

acs/nladmin-system/nlsso-server/src/main/resources/log/AutoCreateInst.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="AutoCreateInst" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/自动创建指令/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>2GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+
+    </appender>
+
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.modules.quartz.task.AutoCreateInst" level="info" additivity="false">
+        <appender-ref ref="AutoCreateInst"/>
+    </logger>
+</included>

acs/nladmin-system/nlsso-server/src/main/resources/log/LnshRGVDeviceDriver.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="LnshRGVDeviceDriver" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/RGV日志/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>2GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+
+    </appender>
+
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.acs.device_driver.lnsh.lnsh_rgv.LnshRGVDeviceDriver" level="info" additivity="false">
+        <appender-ref ref="LnshRGVDeviceDriver"/>
+    </logger>
+</included>

acs/nladmin-system/nlsso-server/src/main/resources/log/Lucene.xml

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <define name="DEVICECODE" class="org.nl.modules.logging.DeviceCodeDir"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="FILE_LUCENE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/lucene/${DEVICECODE}/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>2GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+
+    </appender>
+
+    <appender name="luceneAppender" class="org.nl.modules.lucene.common.LuceneAppender" />
+    <appender name="asyncLuceneAppender" class="ch.qos.logback.classic.AsyncAppender">
+        <appender-ref ref="luceneAppender" />
+        <!-- 设置队列大小，根据您的需求调整 -->
+        <queueSize>512</queueSize>
+    </appender>
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.modules.lucene.service.impl.LuceneExecuteLogServiceImpl" level="info" additivity="true">
+        <appender-ref ref="FILE_LUCENE"/>
+        <appender-ref ref="asyncLuceneAppender"/>
+    </logger>
+</included>

acs/nladmin-system/nlsso-server/src/main/resources/log/NDCAgvServiceImpl.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="NDCAgvServiceImpl" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/NDCAGV服务/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>2GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+
+    </appender>
+
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.acs.agv.server.impl.NDCAgvServiceImpl" level="info" additivity="false">
+        <appender-ref ref="NDCAgvServiceImpl"/>
+    </logger>
+</included>

acs/nladmin-system/nlsso-server/src/main/resources/log/OneNDCSocketConnectionAutoRun.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="OneNDCSocketConnectionAutoRun" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/NDC交互日志/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>2GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+
+    </appender>
+
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.start.auto.run.OneNDCSocketConnectionAutoRun" level="info" additivity="false">
+        <appender-ref ref="OneNDCSocketConnectionAutoRun"/>
+    </logger>
+</included>

acs/nladmin-system/nlsso-server/src/main/resources/log/WmsToAcs.xml

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<included>
+    <springProperty scope="context" name="logPath" source="logging.file.path" defaultValue="logs"/>
+    <property name="LOG_HOME" value="${logPath}"/>
+    <!-- 按照每天生成日志文件 -->
+    <appender name="WmsToAcs" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+            <!--日志文件输出的文件名-->
+            <FileNamePattern>${LOG_HOME}/WMS请求ACS/%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+            <!--日志文件保留天数-->
+            <maxHistory>15</maxHistory>
+            <!--单个日志最大容量 至少10MB才能看得出来-->
+            <maxFileSize>200MB</maxFileSize>
+            <!--所有日志最多占多大容量-->
+            <totalSizeCap>2GB</totalSizeCap>
+        </rollingPolicy>
+        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+            <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
+            <charset>${log.charset}</charset>
+        </encoder>
+
+    </appender>
+
+    <!--  <logger name="org.nl.start.Init" level="info" additivity="false">
+          <appender-ref ref="FILE3"/>
+      </logger>-->
+
+    <!-- 打印sql -->
+    <logger name="org.nl.acs.ext.wms.service.impl.WmsToAcsServiceImpl" level="info" additivity="false">
+        <appender-ref ref="WmsToAcs"/>
+    </logger>
+</included>

acs/nladmin-system/nlsso-server/src/main/resources/logback-spring.xml

@@ -18,7 +18,14 @@ https://juejin.cn/post/6844903775631572999
     <!--引入默认的一些设置-->
     <!--<include resource="log/XrToMes.xml"/>
     <include resource="log/MesToErp.xml"/>-->
-    <include resource="log/XgAgvDeviceDriver.xml"/>
+    <include resource="log/AutoCreateInst.xml"/>
+    <include resource="log/AcsToWms.xml"/>
+    <include resource="log/WmsToAcs.xml"/>
+    <include resource="log/OneNDCSocketConnectionAutoRun.xml"/>
+<!--    <include resource="log/Lucene.xml"/>-->
+    <include resource="log/AgvNdcOneDeviceDriver.xml"/>
+    <include resource="log/NDCAgvServiceImpl.xml"/>
+    <include resource="log/LnshRGVDeviceDriver.xml"/>
 
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
         <withJansi>true</withJansi>

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/controller/AcsToWmsController.java

@@ -48,8 +48,8 @@ public class AcsToWmsController {
     }
 
     @PostMapping("/status")
-    @Log("设备状态同步")
-    @ApiOperation("设备状态同步")
+    @Log("任务状态同步")
+    @ApiOperation("任务状态同步")
     //@SaCheckPermission("@el.check('schBaseTask:add')")
     @SaIgnore
     public ResponseEntity<Object> status(@RequestBody JSONObject param) {

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java

@@ -116,9 +116,9 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
      */
     @Override
     public BaseResponse status(JSONObject param) {
+        log.info("ACS请求反馈任务状态,信息:{}!", param.toString());
         String requestNo = param.getString("requestNo");
-        FeedBackTaskStatusRequest taskStatusRequest = param.toJavaObject(FeedBackTaskStatusRequest.class);
-        String taskId = taskStatusRequest.getTask_id();
+        String taskId = param.getString("task_code");
         if (ObjectUtil.isEmpty(taskId)) {
             throw new BadRequestException("任务编码不能为空！");
         }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/TBXBKJTask.java

@@ -90,7 +90,7 @@ public class TBXBKJTask extends AbstractTask {
                 continue;
             }
             // 设置终点并修改创建成功状态
-            task.setPoint_code1(point.getPoint_code());
+            task.setPoint_code1(point.getNext_wait_point());
             task.setTask_status(TaskStatus.CREATED.getCode());
             task.setRemark("");
             taskService.update(task);
@@ -186,5 +186,9 @@ public class TBXBKJTask extends AbstractTask {
     @Override
     protected void feedbackTaskState(JSONObject param,SchBaseTask schBaseTask, BaseResponse result) {
         //todo 重算最优点
+        SchBasePoint startPoint = pointService.getOne(new LambdaQueryWrapper<SchBasePoint>()
+                .eq(SchBasePoint::getPoint_code, schBaseTask.getPoint_code2()));
+        SchBasePoint point = this.findNextPoint(startPoint);
+        schBaseTask.setPoint_code1(point.getPoint_code());
     }
 }

lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/mapper/PointMapper.xml

@@ -7,7 +7,7 @@
         FROM
             `sch_base_point` p
         WHERE p.region_code like CONCAT('%', #{regionCode}, '%')
-        and p.point_status = #{point_status}
+        and p.point_status = #{point_status} and p.is_used = 1
         ORDER BY region_code
     </select>
 

lms/nladmin-system/nlsso-server/src/main/resources/config/application-prod.yml

@@ -6,17 +6,21 @@ spring:
     druid:
       db-type: com.alibaba.druid.pool.DruidDataSource
       driverClassName: net.sf.log4jdbc.sql.jdbcapi.DriverSpy
-      url: jdbc:log4jdbc:mysql://${DB_HOST:192.168.4.121}:${DB_PORT:3306}/${DB_NAME:yy_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      url: jdbc:log4jdbc:mysql://${DB_HOST:127.0.0.1}:${DB_PORT:3306}/${DB_NAME:cw_wms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
+      #      url: jdbc:log4jdbc:mysql://${DB_HOST:47.111.78.178}:${DB_PORT:3306}/${DB_NAME:stand_lms}?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&useOldAliasMetadataBehavior=true
       username: ${DB_USER:root}
       password: ${DB_PWD:123456}
+      #      password: ${DB_PWD:P@ssw0rd}
       # 初始连接数
       initial-size: 5
       # 最小连接数
       min-idle: 15
       # 最大连接数
-      max-active: 60
+      max-active: 30
+      # 超时时间(以秒数为单位)
+      remove-abandoned-timeout: 180
       # 获取连接超时时间
-      max-wait: 5000
+      max-wait: 3000
       # 连接有效性检测时间
       time-between-eviction-runs-millis: 60000
       # 连接在池中最小生存的时间
@@ -36,11 +40,8 @@ spring:
         enabled: true
       stat-view-servlet:
         enabled: true
-        # 控制台管理用户名和密码
         url-pattern: /druid/*
         reset-enable: false
-        login-username: admin
-        login-password: 123456
       filter:
         stat:
           enabled: true
@@ -53,12 +54,11 @@ spring:
             multi-statement-allow: true
   redis:
     #数据库索引
-    database: ${REDIS_DB:15}
+    database: ${REDIS_DB:2}
     host: ${REDIS_HOST:127.0.0.1}
     port: ${REDIS_PORT:6379}
     password: ${REDIS_PWD:}
-    #连接超时时间
-    timeout: 5000
+
 # 登录相关配置
 login:
   # 登录缓存
@@ -77,47 +77,22 @@ login:
     heigth: 36
     # 内容长度
     length: 2
-    # 字体名称，为空则使用默认字体，如遇到线上乱码，设置其他字体即可
+    # 字体名称，为空则使用默认字体
     font-name:
     # 字体大小
     font-size: 25
 
-#jwt
-jwt:
-  header: Authorization
-  # 令牌前缀
-  token-start-with: Bearer
-  # 必须使用最少88位的Base64对该令牌进行编码
-  base64-secret: ZmQ0ZGI5NjQ0MDQwY2I4MjMxY2Y3ZmI3MjdhN2ZmMjNhODViOTg1ZGE0NTBjMGM4NDA5NzYxMjdjOWMwYWRmZTBlZjlhNGY3ZTg4Y2U3YTE1ODVkZDU5Y2Y3OGYwZWE1NzUzNWQ2YjFjZDc0NGMxZWU2MmQ3MjY1NzJmNTE0MzI=
-  # 令牌过期时间 此处单位/毫秒 ，默认2小时，可在此网站生成 https://www.convertworld.com/zh-hans/time/milliseconds.html
-  token-validity-in-seconds: 7200000
-  # 在线用户key
-  online-key: online-token-
-  # 验证码
-  code-key: code-key-
-  # token 续期检查时间范围（默认30分钟，单位默认毫秒），在token即将过期的一段时间内用户操作了，则给用户的token续期
-  detect: 1800000
-  # 续期时间范围，默认 1小时，这里单位毫秒
-  renew: 3600000
-
-# IP 本地解析
-ip:
-  local-parsing: true
-
 #是否允许生成代码，生产环境设置为false
 generator:
-  enabled: false
-
-#如果生产环境要开启swagger，需要配置请求地址
-#springfox:
-#  documentation:
-#    swagger:
-#      v2:
-#        host: # 接口域名或外网ip
+  enabled: true
 
 #是否开启 swagger-ui
 swagger:
-  enabled: false
+  enabled: true
+
+# IP 本地解析
+ip:
+  local-parsing: true
 
 # 文件存储路径
 file:
@@ -135,7 +110,7 @@ file:
   avatarMaxSize: 5
 logging:
   file:
-    path: /app/jar/logs
+    path: C:\log\wms
   config: classpath:logback-spring.xml
 
 # Sa-Token配置
@@ -157,5 +132,32 @@ sa-token:
   jwt-secret-key: opsjajisdnnca0sdkksdfaaasdfwwq
   # token 前缀
   token-prefix: Bearer
-  is-read-cookie: false
-  is-read-body: false
+  sso:
+    # Ticket有效期 (单位: 秒)，默认五分钟
+    ticket-timeout: 300
+    # 所有允许的授权回调地址
+    allow-url: "*"
+    # 是否打开单点注销功能
+    is-slo: true
+
+    # ------- SSO-模式三相关配置 （下面的配置在SSO模式三并且 is-slo=true 时打开）
+    # 是否打开模式三
+    isHttp: true
+    # 接口调用秘钥（用于SSO模式三的单点注销功能）
+    secretkey: kQwIOrYvnXmSDkwEiFngrKidMcdrgKor
+    # ---- 除了以上配置项，你还需要为 Sa-Token 配置http请求处理器（文档有步骤说明）
+  is-read-cookie: true
+  is-print: false
+  #  未登录 StpUtil.getTokenSession() 设置值，获取值 @SaIgnore 得忽略接口
+  token-session-check-login: false
+  alone-redis:
+    # Redis数据库索引（默认为0）
+    database: 2
+    # Redis服务器地址
+    host: 127.0.0.1
+    # Redis服务器连接端口
+    port: 6379
+    # Redis服务器连接密码（默认为空）
+    password:
+    # 连接超时时间
+    timeout: 10s

lms/nladmin-ui/src/views/wms/sch/point/index.vue

@@ -208,6 +208,9 @@
           <el-form-item label="父类编码" prop="vehicle_code">
             <el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint" />
           </el-form-item>
+          <el-form-item label="物料类型" prop="vehicle_type">
+            <el-input v-model="form.vehicle_type" style="width: 370px;" />
+          </el-form-item>
           <el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
             <el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
           </el-form-item>