From e4b641e65e49c7854ed11e7822316431f5e0ce1b Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 27 六月 2025 08:36:03 +0800
Subject: [PATCH] 出库单生成波次功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java | 4 +++-
rsf-admin/src/page/orders/wave/WaveItemList.jsx | 12 ------------
rsf-admin/src/page/orders/outStock/OutStockWaveDialog.jsx | 1 -
rsf-admin/.env | 2 +-
4 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/rsf-admin/.env b/rsf-admin/.env
index 42a0829..7075a86 100644
--- a/rsf-admin/.env
+++ b/rsf-admin/.env
@@ -1,3 +1,3 @@
-VITE_BASE_IP=192.168.4.43
+VITE_BASE_IP=192.168.4.12
# VITE_BASE_IP=47.76.147.249
VITE_BASE_PORT=8080
diff --git a/rsf-admin/src/page/orders/outStock/OutStockWaveDialog.jsx b/rsf-admin/src/page/orders/outStock/OutStockWaveDialog.jsx
index cdead23..6bd93c7 100644
--- a/rsf-admin/src/page/orders/outStock/OutStockWaveDialog.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutStockWaveDialog.jsx
@@ -29,7 +29,6 @@
const handleChange = (event) => {
console.log(event);
-
setFormData({ id: event })
};
diff --git a/rsf-admin/src/page/orders/wave/WaveItemList.jsx b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
index 0439bed..b9649a9 100644
--- a/rsf-admin/src/page/orders/wave/WaveItemList.jsx
+++ b/rsf-admin/src/page/orders/wave/WaveItemList.jsx
@@ -6,31 +6,19 @@
SearchInput,
TopToolbar,
SelectColumnsButton,
- EditButton,
FilterButton,
- CreateButton,
- ExportButton,
- BulkDeleteButton,
WrapperField,
useRecordContext,
useTranslate,
useNotify,
useListContext,
- FunctionField,
TextField,
NumberField,
DateField,
- BooleanField,
- ReferenceField,
TextInput,
- DateTimeInput,
DateInput,
SelectInput,
NumberInput,
- ReferenceInput,
- ReferenceArrayInput,
- AutocompleteInput,
- DeleteButton,
useGetRecordId,
Button,
useRefresh,
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
index 4797899..cc71aeb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java
@@ -276,7 +276,9 @@
if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrder> orders = this.list(new LambdaQueryWrapper<AsnOrder>().in(AsnOrder::getId, params.getIds()));
+ List<AsnOrder> orders = this.list(new LambdaQueryWrapper<AsnOrder>()
+ .eq(AsnOrder::getExceStatus, AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .in(AsnOrder::getId, params.getIds()));
if (orders.isEmpty()) {
throw new CoolException("褰撳墠鍗曟嵁鐘舵�佷笉鑳芥墽琛屾尝娆＄敓鎴愭搷浣滐紒锛�");
}
--
Gitblit v1.9.1