diff --git a/pages/material/features/ProduceReturnPage/index.vue b/pages/material/features/ProduceReturnPage/index.vue
index 4eb6d15..7b6eee7 100644
--- a/pages/material/features/ProduceReturnPage/index.vue
+++ b/pages/material/features/ProduceReturnPage/index.vue
@@ -11,20 +11,11 @@
 				<label>选择仓库:</label>&nbsp;&nbsp;&nbsp;&nbsp;
 				<zxzUniDataSelect filterable v-model="ERPLOCATION" :localdata="items" @change="change">
 				</zxzUniDataSelect>
-<<<<<<< HEAD
-=======
 			</u-form-item>
 	<!--		<u-form-item :border-bottom="false">
 				<label>选择库位：</label>
 				 <zxzUniDataSelect filterable v-model="LOCATIONNAME" :localdata="items_Location"-->
 					<!-- :disabled="Locatiaon_state"></zxzUniDataSelect> -->
-			<u-form-item :border-bottom="false">
-			<label>选择库位:   </label>
-			<downSelect class="downSelect-col" ref='selectRef' showKey="storageName" mode='single' :dataList="items_Location" @resultBack="resultBack">
-			  <u-input :border="true" v-model="LOCATIONNAME" placeholder="请输入" @input="handleInput"/>
-			</downSelect>
->>>>>>> c596f28377050fefce42433c3bcbb7d676e49713
-			</u-form-item>
 			
 			<!-- <u-form-item :border-bottom="false">
 				<label>选择库位：</label>
@@ -864,31 +855,28 @@
 			getLocationName() {
 				this.items_Location = []
 				this.items_Location = []
-				if (this.ERPLOCATION != '') {
-					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
-					}).then(res => {
-						if (res.data.success) {
-							for (let i = 0; i < res.data.resultObj.length; i++) {
-								var _Arr = res.data.resultObj[i];
-								this.items_Location.push({
-									text: _Arr.DESCRIPTION,
-									value: _Arr.STORAGENAME
-								});
-							}
-							console.log(this.items_Location)
-							this.getitems_LocationAll('');
-						} else {
-							this.$showMessage(res.data.message)
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
+				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
+					ERPLocation: ERPFACTORY
+				}).then(res => {
+					if (res.data.success) {
+						for (let i = 0; i < res.data.resultObj.length; i++) {
+							var _Arr = res.data.resultObj[i];
+							this.items_Location.push({
+								text: _Arr.DESCRIPTION,
+								value: _Arr.STORAGENAME
+							});
 						}
-						this.focusBarCode = true
-						this.focusShipRequest = false
-					}).catch(err => {
-						this.$showMessage(err)
-					});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
+						console.log(this.items_Location)
+						this.getitems_LocationAll('');
+					} else {
+						this.$showMessage(res.data.message)
+					}
+					this.focusBarCode = true
+					this.focusShipRequest = false
+				}).catch(err => {
+					this.$showMessage(err)
+				});
 			
 			},
 			getitems_LocationAll(query) {
diff --git a/pages/material/features/ProductStockIn/index.vue b/pages/material/features/ProductStockIn/index.vue
index c242d51..2f2529c 100644
--- a/pages/material/features/ProductStockIn/index.vue
+++ b/pages/material/features/ProductStockIn/index.vue
@@ -417,31 +417,28 @@
 			getLocationName() {
 				this.items_Location = []
 				this.items_LocationAll = []
-				if (this.ERPLOCATION != '') {
-					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
-					}).then(res => {
-						if (res.data.success) {
-							for (let i = 0; i < res.data.resultObj.length; i++) {
-								var _Arr = res.data.resultObj[i];
-								this.items_LocationAll.push({
-									text: _Arr.DESCRIPTION,
-									value: _Arr.STORAGENAME
-								});
-							}
-							console.log(this.items_LocationAll)
-							this.getitems_LocationAll('');
-						} else {
-							this.$showMessage(res.data.message)
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
+				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
+					ERPLocation: ERPFACTORY
+				}).then(res => {
+					if (res.data.success) {
+						for (let i = 0; i < res.data.resultObj.length; i++) {
+							var _Arr = res.data.resultObj[i];
+							this.items_LocationAll.push({
+								text: _Arr.DESCRIPTION,
+								value: _Arr.STORAGENAME
+							});
 						}
-						this.focusBarCode = true
-						this.focusShipRequest = false
-					}).catch(err => {
-						this.$showMessage(err)
-					});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
+						console.log(this.items_LocationAll)
+						this.getitems_LocationAll('');
+					} else {
+						this.$showMessage(res.data.message)
+					}
+					this.focusBarCode = true
+					this.focusShipRequest = false
+				}).catch(err => {
+					this.$showMessage(err)
+				});
 
 			},
 			getitems_LocationAll(query) {