From 9d2d63ee09e8bcf494fc3fd14a48d82731fac9ef Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期三, 24 四月 2024 09:14:38 +0800
Subject: [PATCH] 根据楼层入库出库
---
src/main/java/com/zy/asrs/controller/OrderController.java | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 7367065..3648a67 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -101,7 +101,7 @@
// 鎵�鏈夊叆搴撹鍗�
@RequestMapping(value = "/order/detls/in/page/auth")
@ManagerAuth
- public R orderDetls(@RequestParam(defaultValue = "1")Integer curr,
+ public R orderIn(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10000")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@@ -122,6 +122,35 @@
return R.ok(orderService.selectPage(new Page<>(curr, limit), wrapper));
}
+ // 鎵�鏈夊叆搴撹鍗曟槑缁�
+ @RequestMapping(value = "/order/detls/pakin/page/auth")
+ @ManagerAuth
+ public R orderDetls(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "100")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
+ wrapper.orderBy("create_time", false);
+ }
+ List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
+ List<Long> docIds = new ArrayList<>();
+ for (DocType pakin : pakins) {
+ docIds.add(pakin.getDocId());
+ }
+ EntityWrapper<Order> orderEntityWrapper = new EntityWrapper<>();
+ List<Order> orders = orderService.selectList(orderEntityWrapper.in("doc_type",docIds));
+ List<String> orderNos = new ArrayList<>();
+ for (Order order : orders) {
+ orderNos.add(order.getOrderNo());
+ }
+ wrapper.in("order_no",orderNos);
+ return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
@RequestMapping(value = "/order/detl/all/auth")
@ManagerAuth
public R head(@RequestParam Long orderId){
--
Gitblit v1.9.1