From e4d638059f57fdde8d3eb9c79e060458644cd3e3 Mon Sep 17 00:00:00 2001
From: FT577-Server <e003914@163.com>
Date: Sat, 10 Oct 2026 09:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=89=8B=E5=8A=A8=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/scheduleTask/MydoJobHandler.java    | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/MydoJobHandler.java b/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/MydoJobHandler.java
index 712495e..c659592 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/MydoJobHandler.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/scheduleTask/MydoJobHandler.java
@@ -191,7 +191,7 @@ public class MydoJobHandler {
      */
     @Scheduled(fixedRate = TIMEINTERVAL_2000)
     public void cancelMydoJobHandler_In(){
-        List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
+        List<MydoJob> mydoJobs = mydoJobService.selectInMydoJobList(
                 new MydoJob().builder()
                         .status(TaskStatusEnum.CANCEL.getCode())
                         .build()
@@ -210,6 +210,16 @@ public class MydoJobHandler {
                 mydoJobDetailService.deleteMydoJobDetailsByJobId(mydoJob.getJobId());
                 log.info("【手动作废任务】移除<入库>任务明细，作业号:{}", mydoJob.getJobId());
             }
+
+//任务主表
+//            MydoJob job = mydoJobService.selectMydoJobByJobId(mydoJob.getJobId());
+//            if (ObjUtil.isNotNull(job)){
+//                //移除任务子表
+//                mydoJobService.insertMydoJobFinish(mydoJob.getJobId());
+//                mydoJobService.deleteMydoJobByJobId(mydoJob.getJobId());
+//                log.info("【手动作废任务】移除<入库>托盘任务，作业号:{}", mydoJob.getJobId());
+//            }
+
 //库存子表
             List<BasStock> stocks = basStockService.selectBasStockListByTrayCode(mydoJob.getTrayCode());
             if (!stocks.isEmpty()){
@@ -222,7 +232,8 @@ public class MydoJobHandler {
 
 //恢复货位状态
             //入库
-            if (mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN){
+            if (mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN ||
+                    mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN_EMPTY_TRAY){
                 basCargoSpaceService.updateBasCargoSpaceStatus(mydoJob.getCargoSpaceId(), "", CargoSpaceCode.CARGOSPACE_STATUS_AVAILABLE);
                 BasStockInfo stockInfo = basStockInfoService.selectBasStockInfoByTrayCode(mydoJob.getTrayCode());
                 if (ObjUtil.isNotNull(stockInfo)){
@@ -324,7 +335,7 @@ public class MydoJobHandler {
      */
     @Scheduled(fixedRate = TIMEINTERVAL_2000)
     public void cancelMydoJobHandler_Move(){
-        List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
+        List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(
                 new MydoJob().builder()
                         .status(TaskStatusEnum.CANCEL.getCode())
                         .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)
@@ -382,7 +393,7 @@ public class MydoJobHandler {
      */
     @Scheduled(fixedRate = TIMEINTERVAL_2000)
     public void cancelMydoJobHandler_Inventory(){
-        List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
+        List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(
                 new MydoJob().builder()
                         .status(TaskStatusEnum.CANCEL.getCode())
                         .build()
@@ -597,7 +608,7 @@ public class MydoJobHandler {
      */
     @Scheduled(fixedRate = TIMEINTERVAL_2000)
     public void manualCompleteMydoJobHandler_In(){
-        List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
+        List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(
                 new MydoJob().builder()
                         .status(TaskStatusEnum.MANUAL_FINISHED.getCode())
                         .build()
@@ -627,7 +638,8 @@ public class MydoJobHandler {
 
 //恢复货位状态
             //入库
-            if (mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN &&
+            if ((mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN ||
+                    mydoJob.getInOrOut() == TaskType.TASKTYPE_STOCKIN_EMPTY_TRAY) &&
                 mydoJob.getInOrOut() != TaskType.TASKTYPE_PICK_STOCK_MOVE &&
                 mydoJob.getInOrOut() != TaskType.TASKTYPE_INVENTORY_BACK
             ){
@@ -799,7 +811,7 @@ public class MydoJobHandler {
      */
     @Scheduled(fixedRate = TIMEINTERVAL_2000)
     public void manualCompleteMydoJobHandler_Move(){
-        List<MydoJob> mydoJobs = mydoJobService.selectOutMydoJobList(
+        List<MydoJob> mydoJobs = mydoJobService.selectMydoJobList(
                 new MydoJob().builder()
                         .status(TaskStatusEnum.MANUAL_FINISHED.getCode())
                         .inOrOut(TaskType.TASKTYPE_PICK_STOCK_MOVE)