From e0a1c1f6925a70f377abc855659b527e18454e95 Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期五, 12 十二月 2025 13:56:13 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu
---
项目代码/WIDESEA_WMSClient/src/extension/inbound/extend/AllocateStockSelect.vue | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllocateStockSelect.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllocateStockSelect.vue"
index 4733980..103eb4f 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllocateStockSelect.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/inbound/extend/AllocateStockSelect.vue"
@@ -126,7 +126,7 @@
<script>
import VolBox from "@/components/basic/VolBox.vue";
import { ElMessage } from "element-plus";
-
+import { stationManager, STATION_STORAGE_KEY } from "@/../src/uitils/stationManager";
export default {
components: { VolBox },
data() {
@@ -140,6 +140,7 @@
{ prop: "palletCode", title: "鎵樼洏缂栧彿", type: "string", width: 150 },
{ prop: "locationCode", title: "璐т綅缂栧彿", type: "string", width: 180 },
{ prop: "useableQuantity", title: "鍙敤鏁伴噺", type: "string" },
+ {prop:"orderDetailId",title:"鍗曟嵁鏄庣粏涓婚敭",type:"string",width:150,hidden:true},
],
selection: [],
selectionSum: 0,
@@ -160,6 +161,17 @@
],
};
},
+ onMounted() {
+ // 浠庢湰鍦板瓨鍌ㄥ姞杞戒繚瀛樼殑绔欏彴鍊�
+ const savedStation = stationManager.getStation();
+ console.log(savedStation);
+ if (savedStation) {
+ outboundForm.selectedPlatform = savedStation;
+ } else if (stationOptions.length > 0) {
+ // 濡傛灉娌℃湁淇濆瓨鐨勫�硷紝浣跨敤绗竴涓�夐」
+ //stationValue.value = stationOptions[0].value;
+ }
+ },
methods: {
open(row) {
this.row = row;
@@ -192,6 +204,11 @@
}
// 閲嶇疆琛ㄥ崟閬垮厤娈嬬暀鍊�
this.outboundForm.selectedPlatform = "";
+ const savedStation = stationManager.getStation();
+ console.log(savedStation);
+ if (savedStation) {
+ this.outboundForm.selectedPlatform = savedStation;
+ }
this.showOutboundDialog = true;
},
@@ -200,15 +217,15 @@
this.$refs.outboundFormRef.validate((valid) => {
if (!valid) return;
-
+console.log(this.selection)
if (this.selection.length <= 0) {
return this.$message.error("璇峰嬀閫�");
}
let url = this.pkcx
- ? "api/Task/GenerateOutboundTask?orderDetailId="
- : "api/Task/GenerateOutboundTask?orderDetailId=";
+ ? "api/Task/GenerateAllocatOutboundTask?orderDetailId="
+ : "api/Task/GenerateAllocatOutboundTask?orderDetailId=";
this.http
- .post(url + this.row.id, this.selection, "鏁版嵁澶勭悊涓�")
+ .post(url + this.row.id+"&station="+this.outboundForm.selectedPlatform, this.selection, "鏁版嵁澶勭悊涓�")
.then((x) => {
if (!x.status) return this.$message.error(x.message);
this.$message.success("鎿嶄綔鎴愬姛");
@@ -226,7 +243,7 @@
const url = "api/StockInfo/GetAllocateStockSelect?materielCode=";
this.http
.post(
- url + this.row.materielCode + "&orderId=" + this.row.orderId,
+ url + this.row.materielCode + "&orderId=" + this.row.orderId + "&orderDetailId=" + this.row.id,
null,
"鏌ヨ涓�"
)
--
Gitblit v1.9.3