From c2850e1679353a3978db169d965ef5fce6158677 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期三, 11 三月 2026 10:47:08 +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/api/controller/mes/MesController.java | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java | 2 +-
rsf-admin/src/page/orders/preparation/PreparationOrderList.jsx | 2 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java | 5 +++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java | 3 ++-
6 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/rsf-admin/src/page/orders/preparation/PreparationOrderList.jsx b/rsf-admin/src/page/orders/preparation/PreparationOrderList.jsx
index 2422e13..989bc17 100644
--- a/rsf-admin/src/page/orders/preparation/PreparationOrderList.jsx
+++ b/rsf-admin/src/page/orders/preparation/PreparationOrderList.jsx
@@ -219,7 +219,7 @@
title={"menu.outStock"}
empty={false}
filters={filters}
- filter={{ deleted: 0, type: 'out', wkType: 23 }}
+ filter={{ deleted: 0 }}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
index ce02626..f3dd503 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mes/MesController.java
@@ -61,7 +61,7 @@
try {
WkOrder order = new WkOrder();
String orderNo = params.getString("orderNo");
- order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_OUT.type)
+ order.setCode(orderNo).setPoCode(orderNo).setType(OrderType.ORDER_Pre.type)
// .setWkType(OrderWorkType.ORDER_WORK_TYPE_MATERIAL_PREPARATION.type)
.setCreateBy(getLoginUserId())
.setUpdateBy(getLoginUserId());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
index fcfcc15..785f69b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -125,7 +125,7 @@
Page<WkOrder> page = new Page<>(curr, limit);
LambdaQueryWrapper<WkOrder> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
- wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type);
+// wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type);
wkOrderLambdaQueryWrapper.eq(WkOrder::getWkType, orderType);
wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrder::getCode, orderNo);
Page<WkOrder> wkOrderPage = outStockService.page(page, wkOrderLambdaQueryWrapper);
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 e729b28..303b94f 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
@@ -58,8 +58,9 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
-// List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
-// queryWrapper.in("type", list);
+ 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("wk_type",list);
return R.ok().add(outStockService.page(pageParam, queryWrapper));
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
index 44a9291..f72e9c7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/OrderType.java
@@ -13,7 +13,8 @@
ORDER_IN("in", "鍏ュ簱鍗�"),
ORDER_TRANSFER("transfer", "璋冩嫈鍗�"),
ORDER_REVISE("revise", "搴撳瓨璋冩暣"),
- ORDER_CHECK("check", "鐩樼偣鍗�");
+ ORDER_CHECK("check", "鐩樼偣鍗�"),
+ ORDER_Pre("pre","澶囪揣鍗�");
OrderType(String type, String desc) {
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..ceb34f3 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)
?TaskResouceType.TASK_RESOUCE_STOCK_UP.val
:TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
try {
--
Gitblit v1.9.1