From d255292cedeefc1f93de831d9d788f18401c4a13 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 08 四月 2024 22:20:14 +0800
Subject: [PATCH] # 新增 所有入库订单明细接口
---
src/main/java/com/zy/asrs/controller/OrderController.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 11b9ac2..3648a67 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -126,7 +126,7 @@
@RequestMapping(value = "/order/detls/pakin/page/auth")
@ManagerAuth
public R orderDetls(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10000")Integer limit,
+ @RequestParam(defaultValue = "100")Integer limit,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam Map<String, Object> param){
@@ -134,15 +134,20 @@
excludeTrash(param);
convert(param, wrapper);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
- wrapper.orderBy("settle").orderBy("create_time", false);
+ wrapper.orderBy("create_time", false);
}
- wrapper.eq("status", 1);
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
List<Long> docIds = new ArrayList<>();
for (DocType pakin : pakins) {
docIds.add(pakin.getDocId());
}
- wrapper.in("doc_type",docIds);
+ 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));
}
--
Gitblit v1.9.1