From fb4e7fd8575a97467a972028a91484f71985656c Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 12 九月 2024 17:03:47 +0800
Subject: [PATCH] #
---
zy-asrs-admin/src/views/out/orderOut/index.vue | 5 +++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | 5 ++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-admin/src/views/out/orderOut/index.vue b/zy-asrs-admin/src/views/out/orderOut/index.vue
index 0da913d..867312c 100644
--- a/zy-asrs-admin/src/views/out/orderOut/index.vue
+++ b/zy-asrs-admin/src/views/out/orderOut/index.vue
@@ -120,7 +120,8 @@
post('/api/order/out/page', {
current: currentPage,
pageSize: pageSize,
- condition: searchOrder.value
+ condition: searchOrder.value,
+ orderOut: true,
}).then((resp) => {
let result = resp.data;
if (result.code == 200) {
@@ -196,7 +197,7 @@
if (result.code == 200) {
message.success(formatMessage('page.add.success', '鎴愬姛'));
emit('pageReload', 'reload')
- }else{
+ } else {
message.error(result.msg);
}
})
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
index 004fe36..6307bfe 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
@@ -89,7 +89,10 @@
}
wrapper.in(Order::getOrderType, types);
- wrapper.isNull(Order::getWaveId);
+
+ if (map.containsKey("orderOut")) {
+ wrapper.isNull(Order::getWaveId);
+ }
if (!Cools.isEmpty(condition)) {
wrapper.and(wrapper1 -> {
--
Gitblit v1.9.1