From d9a147817ff9013003b169d42320fcbc6e6d39df Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 11 三月 2026 14:42:16 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 5 ++++-
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java | 1 +
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java
index f872a51..9f6e3e9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskResouceType.java
@@ -19,6 +19,7 @@
TASK_RESOUCE_EMPTY_TYPE("6", "绌哄鍣ㄥ嚭搴撲换鍔�"),
TASK_RESOUCE_STOCK_UP("7", "澶囪揣鍑哄簱浠诲姟"),
+
TASK_RESOUCE_STOCK_NOT_OUT("8", "澶囪揣鍑哄簱浠诲姟"),
;
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index c221ee5..da14058 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -225,7 +225,7 @@
}
task.setTaskType(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type).setWarehType(deviceSite.getDevice());
} else {
- if (resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_UP.val)){
+ if (resouce.equals(TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val)){
//鍏ㄦ澘鍑哄簱
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
.eq(DeviceSite::getSite, siteNo).eq(DeviceSite::getType, TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index f9adffc..15265c3 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -706,9 +706,12 @@
//澧炲姞澶囪揣鍑哄簱绫诲瀷鍒ゆ柇
Short type = null;
switch (wkOrder.getType()) {
- case "preNot":
+ case "pre":
type = TaskResouceType.TASK_RESOUCE_STOCK_UP.val;
break;
+ case "preNot":
+ type = TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val;
+ break;
default:
type = TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
}
--
Gitblit v1.9.1