切换正式环境端口，删除任务优化

ruoyi-admin/src/main/java/com/ruoyi/common/Constant.java

@@ -4,7 +4,7 @@ package com.ruoyi.common;
 public class Constant {
 
     public static final String LOCAL_URL = "http://127.0.0.1:8084";
-    public static final String WMS_BASE_URL = "http://10.88.10.69:8290/service";
+    public static final String WMS_BASE_URL = "http://10.88.10.69:8390/service";
     public static final String RCS_BASE_URL = "http://192.168.58.101:8182/rcms/services/rest/hikRpcService/";
 
     public static final String HEADER_TOKEN = "fed3d1511a5a474b9e1f9c56246cb1ec";

ruoyi-admin/src/main/java/com/ruoyi/job/controller/MydoJobController.java

@@ -132,6 +132,14 @@ public class MydoJobController extends BaseController
         return mydoJobService.outhandFinish(jobIds);
     }
 
+    @PreAuthorize("@ss.hasAnyPermi('job:mydoJob:cancelJob')")
+    @Log(title = "出库作废", businessType = BusinessType.OTHER)
+    @RequestMapping("/cancelJob")
+    public AjaxResult cancelJob(@RequestParam("jobIds")String[] jobIds)
+    {
+        return toAjax(mydoJobService.deleteMydoJobByJobIds(jobIds));
+    }
+
     @PreAuthorize("@ss.hasAnyPermi('job:mydoJob:resendTaskToEntrance')")
     @Log(title = "入口输送机重新下发", businessType = BusinessType.OTHER)
     @PutMapping("/resendTaskToEntrance")

ruoyi-admin/src/main/java/com/ruoyi/job/service/impl/MydoJobServiceImpl.java

@@ -107,20 +107,23 @@ public class MydoJobServiceImpl implements IMydoJobService
     public int deleteMydoJobByJobIds(String[] jobIds)
     {
         for (String jobId : jobIds) {
-
-            if (selectMydoJobByJobId(jobId) == null) continue;
             MydoJob mydoJob = selectMydoJobByJobId(jobId);
-            selectMydoJobByJobId(jobId).setStatus(TASK_STATUS_INVALID);
+
+            if (mydoJob == null) continue;
+            mydoJob.setStatus(TASK_STATUS_INVALID);
             updateMydoJob(mydoJob);
             mydoJobMapper.insertHistory(jobId);
+            deleteMydoJobByJobId(jobId);
 
             //当执行任务的【删除】操作时（特殊场景需要手动处理异常导致不需要入库时，此时不需要向回传异常）
             // 此处顺便处理对应任务号生成的堆垛机执行队列，省去sql直接表中删记录的操作
-            String taskNo = selectMydoJobByJobId(jobId).getTaskNo();
+            DdjDeviceExecutionQueue queue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(mydoJob.getTaskNo());
-            if (ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByTaskNo(taskNo) != null) {
+            if (queue != null){
-                ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(taskNo);
+                ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(mydoJob.getTaskNo());
             }
 
+            log.info("【人工操作】执行手动删除作业，作业号：{}", jobId);
+
         }
         return mydoJobMapper.deleteMydoJobByJobIds(jobIds);
     }
@@ -134,6 +137,26 @@ public class MydoJobServiceImpl implements IMydoJobService
     @Override
     public int deleteMydoJobByJobId(String jobId)
     {
+        try{
+            MydoJob mydoJob = selectMydoJobByJobId(jobId);
+            if (mydoJob == null) return 0;
+
+            mydoJob.setStatus(TASK_STATUS_INVALID);
+            updateMydoJob(mydoJob);
+            mydoJobMapper.insertHistory(jobId);
+
+            //当执行任务的【删除】操作时（特殊场景需要手动处理异常导致不需要入库时，此时不需要向回传异常）
+            // 此处顺便处理对应任务号生成的堆垛机执行队列，省去sql直接表中删记录的操作
+            String taskNo = selectMydoJobByJobId(jobId).getTaskNo();
+            if (taskNo != null || taskNo != "") {
+                ddjDeviceExecutionQueueService.deleteDdjDeviceExecutionQueueByTaskNo(taskNo);
+            }
+
+            log.info("【人工操作】执行手动删除作业，作业号：{}", jobId);
+        }catch (Exception e){
+            log.warn("【提示】操作失败，发生了未知错误：{}", e.getMessage());
+        }
+
         return mydoJobMapper.deleteMydoJobByJobId(jobId);
     }
 

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

@@ -14,7 +14,7 @@ spring:
 #               本机
                 url: jdbc:sqlserver://127.0.0.1:1433;databaseName=FT568-wcs;encrypt=true;trustServerCertificate=true;
                 username: sa
-                password: 123456
+                password: Aa123456
 
 #               生产
 #                url: jdbc:sqlserver://192.168.58.10:1433;databaseName=FT568-wcs;encrypt=true;trustServerCertificate=true;

ruoyi-admin/src/main/resources/logback.xml

@@ -5,9 +5,6 @@
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
-<!--  输出编码格式  -->
-	<property name="log.charset" value="UTF-8" />
-
 	<!-- 控制台输出 -->
 	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
@@ -27,7 +24,7 @@
 		</rollingPolicy>
 		<encoder>
 			<pattern>${log.pattern}</pattern>
-            <charset>${log.charset}</charset>
+            <charset>UTF-8</charset>
 		</encoder>
 		<filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
@@ -50,7 +47,7 @@
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
-            <charset>${log.charset}</charset>
+            <charset>UTF-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->
@@ -73,7 +70,7 @@
         </rollingPolicy>
         <encoder>
             <pattern>${log.pattern}</pattern>
-            <charset>${log.charset}</charset>
+            <charset>UTF-8</charset>
         </encoder>
         <filter class="ch.qos.logback.classic.filter.LevelFilter">
             <!-- 过滤的级别 -->

ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml

@@ -83,7 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             <if test="wmsTaskNo != null and wmsTaskNo != ''">and wms_task_no = #{wmsTaskNo}</if>
         </where>
-        ORDER BY create_time DESC,finish_time DESC
+        ORDER BY create_time DESC,finish_time DESC;
     </select>
 
     <select id="selectMydoJobList" parameterType="MydoJob" resultMap="MydoJobResult">