From d8b46eb0f1bbe8b51528c0b10d0786fe46c43015 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 19 八月 2025 11:43:52 +0800
Subject: [PATCH] Merge branch 'Dev' of http://101.37.171.70:10101/r/~jhz/STUWMS into Dev

---
 pages/zhijiediaobo/form.vue |   27 ++++++++++++++++++---------
 1 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pages/zhijiediaobo/form.vue b/pages/zhijiediaobo/form.vue
index 6128e89..5c8deb2 100644
--- a/pages/zhijiediaobo/form.vue
+++ b/pages/zhijiediaobo/form.vue
@@ -453,8 +453,8 @@
 					HQty: '',
 					HSCWHName: getUserInfo().HWHName,
 					HSCWHID: getUserInfo().HWhID,
-					HWHName: "",
-					HWHID: "",
+					HWHName: getUserInfo().HWHName,
+					HWHID: getUserInfo().HWhID,
 					HStockStyle: '',
 					HOutStockPlaceName: getUserInfo().HSPName,
 					HOutStockPlaceID: getUserInfo().HSPID,
@@ -1341,11 +1341,11 @@
 			//鎵潯鐮佸鐞�
 			getCode(HBarCode) {
 				//浠撳簱銆佷粨浣嶆枃鏈涓虹┖鏃讹紝娓呯┖瀵瑰簲ID
-				if (!this.hform.HWHName) {
-					this.hform.HWHID = 0
+				if (!this.hform.HSCWHName) {
+					this.hform.HSCWHID = 0
 				}
-				if (!this.hform.HStockPlaceName) {
-					this.hform.HStockPlaceID = 0
+				if (!this.hform.HOutStockPlaceName) {
+					this.hform.HOutStockPlaceID = 0
 				}
 				var sOldBarCode = HBarCode
 				var HDeleteFlag = sOldBarCode.substring(0, 1);
@@ -1353,6 +1353,8 @@
 
 				var sHWHID = this.hform.HWHID
 				var sHSPID = this.hform.HStockPlaceID
+				var sHSCWHID = this.hform.HSCWHID
+				var sHOUTSPID = this.hform.HOutStockPlaceID
 				var sHQty = this.hform.HQty
 				var sSourceBillNo = this.hform.HSourceBillNo
 				var sSourceBillType = this.hform.HMainSourceBillType
@@ -1417,7 +1419,7 @@
 						sHQty = 0;
 					}
 					uni.request({
-						url: this.serverUrl + '/WEBSController/Get_BarCode_Json',
+						url: this.serverUrl + '/WEBSController/get_BarCode_MoveStock_New_Json',
 						data: {
 							sBarCode: sBarCode,
 							HInterID: this.hform.HInterID,
@@ -1426,12 +1428,15 @@
 							HMaker: this.hform.HMaker,
 							HWhID: sHWHID,
 							HSPID: sHSPID,
+							HSCWHID: sHSCWHID,
+							HSCSPID: sHOUTSPID,
 							HQty: sHQty,
-							HRedBlueFlag: this.hform.HRedBlueFlag,
+							// HRedBlueFlag: this.hform.HRedBlueFlag,
 							SourceFlag: HSourceFlag,
 							HSourceBillNo: sSourceBillNo,
 							HSourceBillType: sSourceBillType,
-							HStockOrgID: this.hform.HStockOrgID,
+							HStockInOrgID: this.hform.HStockOrgID,
+							HStockOutOrgID: this.hform.HStockOutOrgID,
 							HScanStyle: "",
 							HCustom1: "",
 							HCustom2: ""
@@ -1982,6 +1987,10 @@
 			position: relative;
 			display: flex;
 
+			picker {
+				width: 100%;
+			}
+			
 			.uni-combox {
 				width: 100%;
 			}

--
Gitblit v1.9.1