From ca3e4977395bc02c5d147dffdff7381333fdfbca Mon Sep 17 00:00:00 2001
From: heshaofeng <heshaofeng@hnkhzn.com>
Date: 星期四, 09 四月 2026 14:39:37 +0800
Subject: [PATCH] 空箱跨区域移库
---
项目代码/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue | 96 +++++++++++++++++++++++++++++++----------------
1 files changed, 63 insertions(+), 33 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
index 7687237..d6dbc74 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/extend/outOrderDetail.vue"
@@ -17,10 +17,18 @@
<el-link
type="primary"
size="small"
- v-if="isBatch === 0"
+ v-if="isBatch === 0 && mainBusinessType != '30'"
style="float: right; height: 20px"
@click="handleOpenPicking"
>鎷ｉ��</el-link
+ >
+ <el-link
+ type="primary"
+ size="small"
+ v-if="mainBusinessType === '30'"
+ style="float: right; height: 20px"
+ @click="handleOpenRecheckPicking"
+ >閲嶆鎷ｉ��</el-link
>
<el-link
type="primary"
@@ -33,7 +41,7 @@
<el-link
type="primary"
size="small"
- v-if="isBatch === 0"
+ v-if="isBatch === 0 && mainBusinessType != '30'"
style="float: right; height: 20px; margin-right: 10px"
@click="outbound"
>鐩存帴鍑哄簱</el-link
@@ -229,6 +237,12 @@
width: 90,
},
{
+ prop: "warehouseCode",
+ title: "浠撳簱缂栧彿",
+ type: "string",
+ width: 90,
+ },
+ {
prop: "unit",
title: "鍗曚綅",
type: "string",
@@ -295,7 +309,7 @@
size: 30,
Wheres: [],
page: 1,
- rows: 30,
+ rows: 240,
},
searchFormOptions: [
[
@@ -403,39 +417,55 @@
query: { orderId: this.row.id, orderNo: this.row.orderNo },
});
},
+ handleOpenRecheckPicking() {
+ this.$router.push({
+ path: "/outbound/recheckOutPicking",
+ query: { orderId: this.row.id, orderNo: this.row.orderNo },
+ });
+ },
outbound() {
- if (this.selection.length === 0) {
- return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
- }
+ if (this.selection.length === 0) {
+ return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
+ }
- const keys = this.selection.map((item) => item.id);
- const requestParams = {
- detailIds: keys,
- outboundQuantity: 1,
- operator: "",
- orderNo: this.row.orderNo,
- isBatch: this.isBatch,
- };
- console.log(requestParams);
- this.$refs.DirectOutbound.open(requestParams);
- },
- outboundbatch() {
- if (this.selection.length === 0) {
- return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
- }
+ const keys = this.selection.map((item) => item.id);
+ const requestParams = {
+ detailIds: keys,
+ outboundQuantity: 1,
+ operator: "",
+ orderNo: this.row.orderNo,
+ isBatch: this.isBatch,
+ };
+ console.log(requestParams);
+ this.$refs.DirectOutbound.open(requestParams);
+ },
+
+ outboundbatch() {
+ if (this.selection.length === 0) {
+ return this.$message.error("璇烽�夋嫨鍗曟嵁鏄庣粏");
+ }
- const keys = this.selection.map((item) => item.id);
- const requestParams = {
- detailIds: keys,
- outboundQuantity:
- this.selection[0].orderQuantity - this.selection[0].lockQuantity,
- operator: "",
- orderNo: this.row.orderNo,
- isBatch: this.isBatch,
- };
- console.log(requestParams);
- this.$refs.DirectOutbound.open(requestParams);
- },
+ const keys = this.selection.map((item) => item.id);
+
+ // 璁＄畻鎵�鏈夐�変腑鏄庣粏鐨勫彲鍑哄簱鏁伴噺鎬诲拰
+ let totalOutboundQuantity = 0;
+ this.selection.forEach(item => {
+ // 绫诲瀷杞崲+瀹归敊锛岄伩鍏嶉潪鏁板瓧鍊煎鑷磋绠楅敊璇�
+ const orderQty = Number(item.orderQuantity) || 0;
+ const lockQty = Number(item.lockQuantity) || 0;
+ totalOutboundQuantity += (orderQty - lockQty);
+ });
+
+ const requestParams = {
+ detailIds: keys,
+ outboundQuantity: totalOutboundQuantity,
+ operator: "",
+ orderNo: this.row.orderNo,
+ isBatch: this.isBatch,
+ };
+ console.log("鍒嗘壒鍑哄簱鍙傛暟锛�", requestParams);
+ this.$refs.DirectOutbound.open(requestParams);
+ },
setCurrent(row) {
this.$refs.singleTable.setCurrentRow(row);
},
--
Gitblit v1.9.3