From 41411a57fc0d237577aa10ccfc1aded50556f5ba Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 28 三月 2026 13:35:23 +0800
Subject: [PATCH] Revert "添加的分属环境配置文件 暂停上报功能"
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index c941727..27011a2 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
@@ -186,7 +189,7 @@
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getThreeCode());
if (DetlDto.has(list, dto)) {
OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
@@ -243,7 +246,7 @@
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),
orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
- orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
+ orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3(), orderDetl.getThreeCode());
if (DetlDto.has(list, dto)) {
OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),
orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),
--
Gitblit v1.9.1