From a546b70a863e44c2e8735b3cfc9da45a781b735f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 03 十一月 2023 10:10:33 +0800
Subject: [PATCH] #托盘码下架
---
src/main/java/com/zy/asrs/controller/OrderController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 650e9bf..8dc4cbe 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -426,9 +426,8 @@
locCheckEntityWrapper.eq("order_no",orderNo);
List<OrderDetl> list = orderDetlService.selectList(locCheckEntityWrapper);
List<OrderDetlVo> orderDetlVos=new ArrayList<>();
- OrderDetlVo orderDetlVo=new OrderDetlVo();
- for (OrderDetl o:
- list) {
+ for (OrderDetl o:list) {
+ OrderDetlVo orderDetlVo=new OrderDetlVo();
orderDetlVo.setOrderNo(o.getOrderNo());
orderDetlVo.setMatnr(o.getMatnr());
orderDetlVo.setMaktx(o.getMaktx());
@@ -469,6 +468,34 @@
return R.ok(orderService.selectAllorderNo());
}
+ @RequestMapping(value = "/order/list/AllCu")
+ @ManagerAuth
+ public R orderCuList(@RequestParam(required = false) String orderNo){
+ EntityWrapper<Order> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(orderNo)) {
+ wrapper.like("order_no", orderNo);
+ }
+ wrapper.le("settle", 2).eq("status", 1);
+ wrapper.orderBy("create_time", false);
+ List<Order> orders = orderService.selectList(wrapper);
+ // 淇濈暀鍑哄簱鍗�
+ if (!Cools.isEmpty(orders)) {
+ Iterator<Order> iterator = orders.iterator();
+ while (iterator.hasNext()) {
+ Order order = iterator.next();
+ if (order.getDocType() != null) {
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (docType != null) {
+ if (docType.getPakout() == 1) {
+ iterator.remove();
+ }
+ }
+ }
+ }
+ }
+ return R.ok().add(orders);
+ }
+
//璁㈠崟缁勬墭2
@RequestMapping(value = "/order/list/orderNo")
public R orderListorderNo(@RequestParam String orderNo) {
--
Gitblit v1.9.1