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

# Conflicts:
#	common/MyRequest.js
#	common/config.js

pages/StockOut/features/PurchaseReturn/index.vue

@@ -498,25 +498,16 @@
 				}).then((res) => {
 					console.log(res.resultObj)
 					this.opCode = res.resultObj
-					this.$MyRequest('/bpel/event', {
+          let param = {
-						header: {
+            opcode: opcode,
-							MESSAGENAME:'CompleteShipRequestForPurReturn',
+            user: this.userId,
-							 LANGUAGE: 'Chinese',
+            siteName: this.siteName,
-							 EventUser: this.userId
+            boxList: this.boxList,
-						},
+            commitDate: this.commitDate,
-						body: {
+            shipRequestName: this.receiveRequestName
-							SITENAME: 'SDK',
-							RECEIVEREQUESTNAME: this.receiveRequestName,
-							RECEIVEREQUESTDETAILNAME: '',
-							RECEIVEREQUESTDETAILTYPE: '',
-							MATERIALSPECNAME: '',
-							ReceiveActNo: '',
-							CHECKBOX: false,
-							ACTTYPE: 'STCO',
-							RECEIVEREQUESTTYPE: '45',
-							REASONCODE: '',
-							REASONCODETYPE: ''
           }
+					this.$MyRequest('/purchase/CompleteReceiveRequest', {
+            param
 					}).then(res => {
 						console.log(res)
 						this.opCode = "";

pages/StockOut/features/ShipRequestReservation/index.vue

@@ -650,6 +650,10 @@
 					user: this.userId
 				}).then(res => {
 					if (res.data.success) {
+            if (res.data.resultObj.length < 1) {
+              this.$showMessage("查询不到库存")
+              return
+            }
 						if (indexList.length > 0) {
 							res.data.resultObj.map((val) => {
 								if (indexList.some(el => el.MATERIALPACKINGNAME == val
@@ -657,6 +661,8 @@
 									val.IS_CHECK = 'Y'
 								}
 							})
+						} else {
+              this.$showMessage(res.data.message)
             }
 						this.BoxInfoList = res.data.resultObj
 						this.currentPage = 1

pages/login/index.vue

@@ -217,7 +217,7 @@ export default {
 								  PLATFORM:"APP"
 								}
 							}).then(res => {
-								if(res.data.code == 0) {
+								if(res.data.code == 200) {
 									console.log(222222222)
 									let menuList = res.data.data.menuList
 									// console.log('menuList', menuList)