From 82065a03737fa1370eb9f4f01ab5332933baf08a Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期四, 05 三月 2026 09:23:37 +0800
Subject: [PATCH] 云仓WMS+RCS+自动入库临时方法配置
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
index 8ed1ab3..eca93c6 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/WkOrderController.java
@@ -57,14 +57,16 @@
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> asList = Arrays.asList(OrderType.ORDER_IN.type);
queryWrapper.in("type", asList);
- return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
+ Page<WkOrder> pageResult = asnOrderService.page(pageParam, queryWrapper);
+ asnOrderService.fillPalletQty(pageResult.getRecords());
+ return R.ok().add(pageResult);
}
@ApiOperation("鑾峰彇棣栭〉琛ㄥご鏁版嵁")
@PostMapping("/asnOrder/dashbord/header")
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
public R getDashbord() {
- return R.ok().add(asnOrderService.getDashbord());
+ return asnOrderService.getDashbord();
}
@ApiOperation("鑾峰彇鍑哄叆搴撹秼鍔垮浘")
@@ -84,14 +86,20 @@
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping({"/asnOrder/many/{ids}", "/asnOrders/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(asnOrderService.listByIds(Arrays.asList(ids)));
+ List<WkOrder> list = asnOrderService.listByIds(Arrays.asList(ids));
+ asnOrderService.fillPalletQty(list);
+ return R.ok().add(list);
}
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@OperationLog("琛ㄥ崟鏌ヨ")
@GetMapping("/asnOrder/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(asnOrderService.getById(id));
+ WkOrder order = asnOrderService.getById(id);
+ if (order != null) {
+ asnOrderService.fillPalletQty(Collections.singletonList(order));
+ }
+ return R.ok().add(order);
}
@PreAuthorize("hasAuthority('manager:asnOrder:save')")
--
Gitblit v1.9.1