Merge branch 'main' of http://162.14.99.253:3000/10539622/2025-03-JS-SDK-PDA

# Conflicts:
#	pages/material/features/ProduceReturnPage/index.vue

pages/checkplan/ErpLocationMoveNoInvoice/ErpLocationMoveNoInvoice.vue

@@ -372,9 +372,10 @@
 			getLocationName() {
 				this.items_Location = []
 				this.BoxListInfo = [];
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				if (this.ERPLOCATION != '') {
 					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+						ERPLocation: ERPFACTORY
 					}).then(res => {
 						if (res.data.success) {
 							for (let i = 0; i < res.data.resultObj.length; i++) {

pages/checkplan/InventPage/index.vue

@@ -172,9 +172,10 @@
 			},
 			getLocationName() {
 				this.items_Location = []
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				if (this.ERPLOCATION1 != '') {
 					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION1,
+						ERPLocation: ERPFACTORY,
 					}).then(res => {
 						console.log(res.data.resultObj)
 						if (res.data.success) {

pages/checkplan/ModifyLocationName/ModifyLocationName.vue

@@ -362,9 +362,10 @@
 			},
 			getLocationName2() {
 				this.items_Location = []
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				if (this.ERPLOCATION != '') {
 					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+						ERPLocation: ERPFACTORY
 					}).then(res => {
 						if (res.data.success) {
 							for (let i = 0; i < res.data.resultObj.length; i++) {

pages/material/features/OtherStockIn/index.vue

@@ -295,9 +295,9 @@
 			},
 			getLocationName() {
 				this.items_Location = []
-				if (this.ERPLOCATION != '') {
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+					ERPLocation: ERPFACTORY
 				}).then(res => {
 					if (res.data.success) {
 						for (let i = 0; i < res.data.resultObj.length; i++) {
@@ -316,9 +316,6 @@
 				}).catch(err => {
 					this.$showMessage(err)
 				});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
 
 			},
 			selConfirm(e) {

pages/material/features/ProduceReturnPage/index.vue

@@ -22,7 +22,6 @@
 			  <u-input :border="true" v-model="LOCATIONNAME" placeholder="请输入" @input="handleInput"/>
 			</downSelect>
 			</u-form-item>
-			
 			<!-- <u-form-item :border-bottom="false">
 				<label>选择库位：</label>
 				<downSelect ref='selectRef' showKey="storageName" mode='single' :dataList="items_Location" @resultBack="resultBack">
@@ -855,9 +854,9 @@
 			getLocationName() {
 				this.items_Location = []
 				this.items_Location = []
-				if (this.ERPLOCATION != '') {
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+					ERPLocation: ERPFACTORY
 				}).then(res => {
 					if (res.data.success) {
 						for (let i = 0; i < res.data.resultObj.length; i++) {
@@ -877,9 +876,6 @@
 				}).catch(err => {
 					this.$showMessage(err)
 				});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
 			
 			},
 			getitems_LocationAll(query) {

pages/material/features/ProductSaleReturn/index.vue

@@ -322,9 +322,9 @@
 			},
 			getLocationName() {
 				this.items_Location = []
-				if (this.ERPLOCATION != '') {
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+					ERPLocation: ERPFACTORY
 				}).then(res => {
 					if (res.data.success) {
 						for (let i = 0; i < res.data.resultObj.length; i++) {
@@ -343,9 +343,6 @@
 				}).catch(err => {
 					this.$showMessage(err)
 				});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
 
 			},
 

pages/material/features/ProductStockIn/index.vue

@@ -417,9 +417,9 @@
 			getLocationName() {
 				this.items_Location = []
 				this.items_LocationAll = []
-				if (this.ERPLOCATION != '') {
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+					ERPLocation: ERPFACTORY
 				}).then(res => {
 					if (res.data.success) {
 						for (let i = 0; i < res.data.resultObj.length; i++) {
@@ -439,9 +439,6 @@
 				}).catch(err => {
 					this.$showMessage(err)
 				});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
 
 			},
 			getitems_LocationAll(query) {

pages/material/features/TransferReceivePage/index.vue

@@ -348,9 +348,9 @@
 			},
 			getLocationName() {
 				this.items_Location = []
-				if (this.ERPLOCATION != '') {
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+					ERPLocation: ERPFACTORY
 				}).then(res => {
 					if (res.data.success) {
 						for (let i = 0; i < res.data.resultObj.length; i++) {
@@ -369,9 +369,6 @@
 				}).catch(err => {
 					this.$showMessage(err)
 				});
-				} else {
-					this.$showMessage("请先选择仓库")
-				}
 
 			},
 			getitems_LocationAll(query){

pages/product/features/LIbraryStockInOpt/index.vue

@@ -414,9 +414,10 @@
 			},
 			getLocationName() {
 				this.items_Location = []
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				if (this.ERPLOCATION != '') {
 					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+						ERPLocation: ERPFACTORY
 					}).then(res => {
 						if (res.data.success) {
 							for (let i = 0; i < res.data.resultObj.length; i++) {

pages/product/features/LIbraryStockTransfer/index.vue

@@ -652,9 +652,10 @@
 			},
 			getLocationName() {
 				this.items_Location = []
+				let ERPFACTORY = JSON.parse(uni.getStorageSync('orgObject')).ERPFACTORY;
 				if (this.ERPLOCATION != '') {
 					this.$MyRequest('/api/storage/getLocationNameForERPLocation', {
-						ERPLocation: this.ERPLOCATION
+						ERPLocation: ERPFACTORY
 					}).then(res => {
 						if (res.data.success) {
 							for (let i = 0; i < res.data.resultObj.length; i++) {