From ad5fef776eb9d66a0fcfc2ddf89698c5642e0eec Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 06 三月 2026 08:36:24 +0800
Subject: [PATCH] 增加一个定时任务。如果拣货出库过程中,相同料箱号,存在(199 ,200)的任务 并且同时存在  101,196的任务 则101和196的任务会 自动变成199

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
index 264d337..8f8d42a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/BasContainerController.java
@@ -82,8 +82,10 @@
         basContainer.setCreateTime(new Date());
         basContainer.setUpdateBy(getLoginUserId());
         basContainer.setUpdateTime(new Date());
-        BasContainer container = basContainerService.getOne(new LambdaQueryWrapper<BasContainer>().eq(BasContainer::getContainerType, basContainer.getContainerType()));
-        if (null != container) {
+        long count = basContainerService.count(new LambdaQueryWrapper<BasContainer>()
+                .eq(BasContainer::getContainerType, basContainer.getContainerType())
+                .eq(BasContainer::getDeleted, 0));
+        if (count > 0) {
             return R.error("璇ョ被鍨嬪凡琚垵濮嬪寲");
         }
         if (null !=basContainer.getAreaIds()){

--
Gitblit v1.9.1