From 854db25954aacc0516614bd59850acfd293394e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=B4=E8=BE=89?= Date: Fri, 21 Mar 2025 18:32:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=94=80=E5=94=AE=E9=A2=84=E5=A4=87?= =?UTF-8?q?=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/MyRequest.js | 4 ++-- common/config.js | 4 ++-- pages/login/index.vue | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/MyRequest.js b/common/MyRequest.js index 2f5ee6c..01645d6 100644 --- a/common/MyRequest.js +++ b/common/MyRequest.js @@ -7,8 +7,8 @@ // const baseurl = 'http://172.22.10.218:22252' 8 // const baseurl = 'http://192.168.1.73:32202' // 测试环境 // const baseurl = 'http://172.22.10.217:22202' // 正式环境1 -const baseurl = 'http://172.22.10.225:22202' // SAP测试环境 -// const baseurl = 'http://localhost:18878' +// const baseurl = 'http://172.22.10.225:22202' // SAP测试环境 +const baseurl = 'http://localhost:18873' //--------------------------------------------------开始封装 import service from './service'; diff --git a/common/config.js b/common/config.js index b501fc3..b9e18d8 100644 --- a/common/config.js +++ b/common/config.js @@ -16,8 +16,8 @@ export default { // url: "http://172.22.10.218:22252", 22258 // url: "http://192.168.1.73:32202", // 测试环境 // url: "http://172.22.10.217:22202", // 正式环境1 - url: "http://172.22.10.225:22202", // SAP测试环境 - // url: "http://localhost:18878", + // url: "http://172.22.10.225:22202", // SAP测试环境 + url: "http://localhost:18873", // 测试服务器接口URL // url: "http://10.4.2.109:90/WMS/WMS_Webservice.asmx", // 请求的参数 diff --git a/pages/login/index.vue b/pages/login/index.vue index 84d7a0d..eefe912 100644 --- a/pages/login/index.vue +++ b/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) From f0c6a5264f3dbcea9cfecac88de9298495fbc1ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=B4=E8=BE=89?= Date: Mon, 24 Mar 2025 10:46:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?1)=20PC=20=20=E5=A4=87=E8=B4=A7=E5=87=BA?= =?UTF-8?q?=E5=BA=93=202)=20PC=20=E5=A4=87=E8=B4=A7=E5=87=BA=E5=BA=93?= =?UTF-8?q?=EF=BC=88=E5=A4=AA=E4=BB=93=EF=BC=89=203)=20PC=20=E9=A2=84?= =?UTF-8?q?=E5=A4=87=E8=B4=A7=E5=87=BA=E5=BA=93=204)=20PDA=20=E5=A4=87?= =?UTF-8?q?=E8=B4=A7=E5=87=BA=E5=BA=93=205)=20PDA=20=E9=A2=84=E5=A4=87?= =?UTF-8?q?=E8=B4=A7=E5=87=BA=E5=BA=93=206)=20PDA=20=E9=9D=9E=E5=85=88?= =?UTF-8?q?=E8=BF=9B=E5=85=88=E5=87=BA=E5=87=BA=E5=BA=93=207)=20PDA=20?= =?UTF-8?q?=E9=94=80=E5=94=AE=E5=87=BA=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/StockOut/features/ShipRequestReservation/index.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pages/StockOut/features/ShipRequestReservation/index.vue b/pages/StockOut/features/ShipRequestReservation/index.vue index 7392346..ee19e17 100644 --- a/pages/StockOut/features/ShipRequestReservation/index.vue +++ b/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,7 +661,9 @@ val.IS_CHECK = 'Y' } }) - } + } else { + this.$showMessage(res.data.message) + } this.BoxInfoList = res.data.resultObj this.currentPage = 1 this.getStockOutInvoiceInfo() From 088410d9cf521b5daa361420e34b04683c485286 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=B4=E8=BE=89?= Date: Mon, 24 Mar 2025 11:47:43 +0800 Subject: [PATCH 3/3] =?UTF-8?q?8)=20=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../features/PurchaseReturn/index.vue | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/pages/StockOut/features/PurchaseReturn/index.vue b/pages/StockOut/features/PurchaseReturn/index.vue index ff8f151..493f41d 100644 --- a/pages/StockOut/features/PurchaseReturn/index.vue +++ b/pages/StockOut/features/PurchaseReturn/index.vue @@ -498,25 +498,16 @@ }).then((res) => { console.log(res.resultObj) this.opCode = res.resultObj - this.$MyRequest('/bpel/event', { - header: { - MESSAGENAME:'CompleteShipRequestForPurReturn', - LANGUAGE: 'Chinese', - EventUser: this.userId - }, - body: { - SITENAME: 'SDK', - RECEIVEREQUESTNAME: this.receiveRequestName, - RECEIVEREQUESTDETAILNAME: '', - RECEIVEREQUESTDETAILTYPE: '', - MATERIALSPECNAME: '', - ReceiveActNo: '', - CHECKBOX: false, - ACTTYPE: 'STCO', - RECEIVEREQUESTTYPE: '45', - REASONCODE: '', - REASONCODETYPE: '' - } + let param = { + opcode: opcode, + user: this.userId, + siteName: this.siteName, + boxList: this.boxList, + commitDate: this.commitDate, + shipRequestName: this.receiveRequestName + } + this.$MyRequest('/purchase/CompleteReceiveRequest', { + param }).then(res => { console.log(res) this.opCode = "";