From 66042dcaa96d66edaf56a863d5576207a13c2db5 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 01 四月 2026 17:37:04 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 01902fb..154d3f7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -46,10 +46,13 @@
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
- public R navList(@RequestParam(required = false) String orderNo){
+ public R navList(@RequestParam(required = false) String orderNo, @RequestParam(required = false) String shipName){
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
+ }
+ if (!Cools.isEmpty(shipName)) {
+ wrapper.like("ship_name", shipName);
}
wrapper.le("settle", 2).eq("status", 1);
// 绛涢�夊嚭搴撳崟,涓嶄负OrderTypeEnum.STOCK
@@ -76,11 +79,15 @@
@RequestMapping(value = "/order/AGV/nav/list/auth")
@ManagerAuth
- public R AGVnavList(@RequestParam(required = false) String orderNo){
+ public R AGVnavList(@RequestParam(required = false) String orderNo, @RequestParam(required = false) String shipCode){
EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(orderNo)) {
wrapper.like("order_no", orderNo);
}
+
+ if (!Cools.isEmpty(shipCode)) {
+ wrapper.like("ship_code", shipCode);
+ }
wrapper.le("settle", 2).eq("status", 1);
wrapper.eq("doc_type", OrderTypeEnum.STOCK.type);
wrapper.orderBy("create_time", false);
--
Gitblit v1.9.1