From 78a4c3f8f157b7ff8b6003847685b50ccb73a9c4 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期三, 11 三月 2026 14:04:13 +0800
Subject: [PATCH] #
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
index 303b94f..1a347c9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
@@ -59,7 +59,7 @@
PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> list = Arrays.asList(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type, OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type, OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type);
- queryWrapper.eq("type", OrderType.ORDER_Pre.type);
+ queryWrapper.in("type", OrderType.ORDER_PRE.type,OrderType.ORDER_PRE_NOT_OUT.type);
queryWrapper.in("wk_type",list);
return R.ok().add(outStockService.page(pageParam, queryWrapper));
}
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 ceb34f3..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.getType().equals(OrderType.ORDER_Pre.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