From 515866f63c9fbdb83de3f2016e4eaf2af99490d7 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期三, 15 一月 2025 11:32:52 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/淮安PDA/pages/stash/receiveorderoutbound.vue |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
index af2a882..f77f363 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/\346\267\256\345\256\211PDA/pages/stash/receiveorderoutbound.vue"
@@ -43,7 +43,7 @@
 					</uni-forms-item>
 				</uni-forms> -->
 				<uni-list :border="true">
-					<uni-list-item direction="column" v-for="(item,index) in orderInfo" :key="item.id">
+					<uni-list-item direction="column" v-for="item in orderinfoDetails" :key="item.id">
 						<template v-slot:body>
 								<view class="uni-content">
 									<view>鏀惰揣鍗曞彿锛歿{orderNo}}</view>
@@ -175,6 +175,7 @@
 				current: 0,
 				orderNo: "",
 				orderInfo: [],
+				orderinfoDetails:[],
 				label: "",
 				innerCode: "",
 				PurchaseOrderNo: "閲囪喘鍗曞彿锛�",
@@ -218,6 +219,7 @@
 				endTypeRange: [],
 				sns: "",
 				receiveOrderId: 0,
+				warehouseId:""
 			}
 		},
 
@@ -233,6 +235,7 @@
 			this.orderNo = res.orderNo;
 			this.receiveOrderId = res.receiveOrderId;
 			this.label = "鏀惰揣鍗曞彿锛�" + this.orderNo;
+			this.warehouseId=res.warehouseId;
 			this.getData();
 		},
 		mounted() {
@@ -363,6 +366,12 @@
 					})
 					return;
 				}
+				if(this.warehouseId==2){
+					//鏇挎崲鎸囧畾涓や釜瀛楃闂寸殑瀛楃
+					this.sns = this.sns.replace(/(Q:)([^,PO]+)(,PO)/, (match, p1, p2, p3) => {
+					  return p1 + this.Quantity + p3;
+					});
+				}
 				this.$u.post('/api/ReceiveOrderDetail/AddReceiveOrderDetail?serNum=' + this.sns + '&orderNo=' + this
 					.orderNo, {}).then(res => {
 					if (res.status) {
@@ -464,8 +473,8 @@
 				}
 				this.$u.post('/api/ReceiveOrderDetail/GetReceiveOrderInfos', postData).then((res) => {
 					if (res.status) {
-						this.orderInfo = res.data;
-						if (this.orderInfo.length > 3) {
+						this.orderinfoDetails = res.data;
+						if (this.orderinfoDetails.length > 3) {
 							this.loadVisible = true;
 						}
 					}

--
Gitblit v1.9.3