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/controller/MatPreparationController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 9e416e6..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));
}
@@ -115,7 +116,7 @@
}
@PreAuthorize("hasAuthority('manager:outStock:update')")
- @OperationLog("Update 锛涘嚭搴撳崟鎹�")
+ @OperationLog("Update 鍑哄簱鍗曟嵁")
@PostMapping("/preparation/update")
@ApiOperation("鏇存柊")
public R update(@RequestBody WkOrder wkOrder) {
--
Gitblit v1.9.1