From 640404cd2545c1f0869c69d5b66e0c7108c36b45 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 16 八月 2025 10:39:10 +0800
Subject: [PATCH] #计划组货单下发上报
---
src/main/java/com/zy/asrs/controller/OrderController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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 8465ddb..3d7fac7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -83,7 +83,7 @@
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
- wrapper.le("settle", 2).eq("status", 1);
+ wrapper.le("settle", 2).eq("status", 1).ne("doc_type",25);
wrapper.orderBy("create_time", false);
List<Order> orders = orderService.selectList(wrapper);
// 淇濈暀鍑哄簱鍗�
@@ -104,6 +104,34 @@
return R.ok().add(orders);
}
+ @RequestMapping(value = "/order/nav/listMes/auth")
+ @ManagerAuth
+ public R navListMes(@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", 0).eq("doc_type", 25);
+ 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() == 0) {
+// iterator.remove();
+// }
+// }
+// }
+// }
+// }
+ return R.ok().add(orders);
+ }
+
@RequestMapping(value = "/order/head/page/auth")
@ManagerAuth
public R head(@RequestParam(defaultValue = "1")Integer curr,
--
Gitblit v1.9.1