From fb98cd280dd1158e542cc8b94003612700ae4ea4 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 11 三月 2026 14:04:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
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 60635d3..0e1e7da 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
@@ -704,7 +704,7 @@
.setSourceId(outId)
.setSiteNo(param.getSiteNo());
//澧炲姞澶囪揣鍑哄簱绫诲瀷鍒ゆ柇
- Short type = wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type)
+ Short type = wkOrder.getType().equals(OrderType.ORDER_PRE.type) || wkOrder.getType().equals(OrderType.ORDER_PRE_NOT_OUT.type)
?TaskResouceType.TASK_RESOUCE_STOCK_UP.val
:TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
try {
--
Gitblit v1.9.1