From 7a8389595aa621f7f58b09a0c982ffac03823b86 Mon Sep 17 00:00:00 2001
From: 647556386 <647556386@qq.com>
Date: 星期五, 09 一月 2026 15:51:09 +0800
Subject: [PATCH] 1
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue | 1 -
项目代码/WMS无仓储版/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs | 4 ++++
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue | 21 ++++++++++++---------
3 files changed, 16 insertions(+), 10 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue"
index eb61cbc..6d19fbd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/OrderStockTake.vue"
@@ -159,7 +159,7 @@
>
<el-input
v-model.number="formData.actualQuantity"
- placeholder="璇疯緭鍏ュ疄闄呯洏鐐规暟閲忥紙澶т簬0锛�"
+ placeholder="璇疯緭鍏ュ疄闄呯洏鐐规暟閲�"
type="number"
clearable
@keydown.enter="handleStockTakeComplete"
@@ -334,15 +334,18 @@
}
};
-// 瀹為檯鐩樼偣鏁伴噺楠岃瘉锛堜紭鍖栵細鏈夊�兼椂楠岃瘉鍚堟硶鎬э級
+// 瀹為檯鐩樼偣鏁伴噺楠岃瘉锛氫粎楠岃瘉鏁板�间笉灏忎簬0
const validateActualQuantity = (rule, value, callback) => {
- if (value === null || value === undefined) {
- callback(new Error("璇疯緭鍏ュ疄闄呯洏鐐规暟閲�"));
- } else if (value <= 0) {
- callback(new Error("瀹為檯鐩樼偣鏁伴噺蹇呴』澶т簬0"));
- } else if (!Number.isInteger(value)) {
- callback(new Error("瀹為檯鐩樼偣鏁伴噺蹇呴』鏄暣鏁�"));
- } else {
+ // 绌哄�肩敱required瑙勫垯澶勭悊锛岃繖閲屽彧楠岃瘉鏁板�煎悎娉曟��
+ if (value === null || value === undefined || value === "") {
+ callback(); // 绌哄�间笉鍦ㄨ繖閲屾彁绀猴紝浜ょ粰required瑙勫垯
+ }
+ // 楠岃瘉鏁板�兼槸鍚﹀皬浜�0
+ else if (value < 0) {
+ callback(new Error("瀹為檯鐩樼偣鏁伴噺涓嶈兘灏忎簬0"));
+ }
+ // 楠岃瘉閫氳繃
+ else {
callback();
}
};
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
index 4c584fb..ffb55b7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/printView.vue"
@@ -147,7 +147,6 @@
<span class="print-count">鍏� {{ printData.length }} 涓墿鏂欏崱寰呮墦鍗�</span>
<div>
<el-button type="primary" size="small" @click="print">鎵撳嵃鍏ㄩ儴</el-button>
- <el-button type="danger" size="small" @click="showDetialBox = false">鍏抽棴</el-button>
</div>
</div>
</template>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs"
index 96d2949..b1f62ed 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS\346\227\240\344\273\223\345\202\250\347\211\210/WIDESEA_WMSServer/WIDESEA_InboundService/TakeStockOrderService.cs"
@@ -365,6 +365,10 @@
.WhereIF(!string.IsNullOrEmpty(takeStockOrderDetail.WarehouseCode),
detail => !string.IsNullOrEmpty(detail.WarehouseCode)
&& detail.WarehouseCode == takeStockOrderDetail.WarehouseCode)
+ .WhereIF(!string.IsNullOrEmpty(takeStockOrderDetail.BatchNo),
+ detail => !string.IsNullOrEmpty(detail.BatchNo)
+ && detail.BatchNo == takeStockOrderDetail.BatchNo)
+
.ToList();
// 灏嗗尮閰嶇殑鏄庣粏娣诲姞鍒版�诲垪琛�
--
Gitblit v1.9.3