From 33590e66e814b1c2e025e038410ef0006f4f38f7 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期一, 21 十月 2024 16:37:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
index f659893..b49cbb0 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OrderController.java
@@ -57,7 +57,7 @@
@RequestMapping(value = "/order/list/orderNo")
public R orderListorderNo(@RequestParam String orderNo) {
//鏁伴噺淇敼鎴愪负瀹屾垚鏁伴噺
- List<OrderDetl> orderDetl1=orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderNo,orderNo));
+ List<OrderDetl> orderDetl1 = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderNo, orderNo));
List<OrderDetl> orderDetls= new ArrayList<OrderDetl>();
for (OrderDetl o: orderDetl1) {
BigDecimal c1 = new BigDecimal(o.getEnableQty()).setScale(2,BigDecimal.ROUND_HALF_UP);
@@ -76,6 +76,12 @@
return R.ok(orderService.selectAllorderNo(getHostId()));
}
+ @RequestMapping(value = "/order/comb/list/all")
+ @ManagerAuth
+ public R orderListComb() {
+ return R.ok(orderService.selectAllCombOrderNo(getHostId()));
+ }
+
// @RequestMapping(value = "/outOrder/list/all")
// @ManagerAuth
// public R orderOutList() {
--
Gitblit v1.9.1