From 9ed1797b593d3be339c2ad03d5111da8ffb74681 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E9=B8=BF=E5=B1=95?= <18031053041@163.com>
Date: Fri, 17 Jul 2026 15:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B4=A7=E6=80=A5=E4=BB=BB=E5=8A=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ShiftManageDomainService.java     | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
index 1183fc082..420ae5b7a 100644
--- a/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
+++ b/mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
@@ -496,25 +496,20 @@ public class ShiftManageDomainService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean revokeAudit(ShiftManageDO shiftManageDO) {
         LoginUser loginUser = SecurityUtils.getLoginUser();
-        List<Long> shiftManageIds = shiftManageDO.getShiftManageIds();
-        if (CollectionUtils.isEmpty(shiftManageIds)) {
+        Long shiftManageId = shiftManageDO.getShiftManageId();
+        if (shiftManageId == null) {
             throw new ServiceException("移位单id不能为空");
         }
-        List<ShiftManage> shiftManageList = shiftManageService.listByIds(shiftManageIds);
-        if (CollectionUtils.isEmpty(shiftManageList)) {
+        ShiftManage shiftManage = shiftManageService.getById(shiftManageId);
+        if (shiftManage == null) {
             throw new ServiceException("移位单不存在");
         }
-        for (ShiftManage shiftManage : shiftManageList) {
-            if (!Integer.valueOf(2).equals(shiftManage.getShiftStatus())) {
-                throw new ServiceException("移位单【" + shiftManage.getShiftNumber() + "】状态不为待移位，不可撤回");
-            }
+        if (!Integer.valueOf(2).equals(shiftManage.getShiftStatus())) {
+            throw new ServiceException("移位单【" + shiftManage.getShiftNumber() + "】状态不为待移位，不可撤回");
         }
         // 删除生成的配送任务（taskType=5，trackingNumber=shiftNumber）
-        List<String> shiftNumbers = shiftManageList.stream()
-                .map(ShiftManage::getShiftNumber)
-                .collect(Collectors.toList());
         deliveTaskService.remove(new QueryWrapper<DeliveTask>().lambda()
-                .in(DeliveTask::getTrackingNumber, shiftNumbers)
+                .eq(DeliveTask::getTrackingNumber, shiftManage.getShiftNumber())
                 .eq(DeliveTask::getTaskType, 5));
         // 回退：shiftStatus=1（已创建），taskDistribution=2（未下发），auditStatus=1（未审核）
         shiftManageService.update(null, new UpdateWrapper<ShiftManage>().lambda()
@@ -524,7 +519,7 @@ public class ShiftManageDomainService {
                 .set(ShiftManage::getUpdateBy, loginUser.getUserid())
                 .set(ShiftManage::getUpdateByName, loginUser.getUsername())
                 .set(ShiftManage::getUpdateTime, new Date())
-                .in(ShiftManage::getShiftManageId, shiftManageIds));
+                .eq(ShiftManage::getShiftManageId, shiftManageId));
         return true;
     }