From caba4d73572d0496f406b0cfe996f4b69a943f34 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 24 Jan 2024 13:48:08 +0800 Subject: [PATCH 01/21] =?UTF-8?q?=E5=8F=91=E6=96=99=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E8=BD=A6=E9=97=B4=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/issue/coms/comIssueRequestCreator.vue | 2 +- pages/issue/request/issueRequestCreate.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pages/issue/coms/comIssueRequestCreator.vue b/pages/issue/coms/comIssueRequestCreator.vue index 29827a1e..4eb07fb7 100644 --- a/pages/issue/coms/comIssueRequestCreator.vue +++ b/pages/issue/coms/comIssueRequestCreator.vue @@ -3,7 +3,7 @@ - diff --git a/pages/issue/request/issueRequestCreate.vue b/pages/issue/request/issueRequestCreate.vue index 5b039da1..970ff741 100644 --- a/pages/issue/request/issueRequestCreate.vue +++ b/pages/issue/request/issueRequestCreate.vue @@ -93,7 +93,7 @@ if (this.detailSource.subList.length == 0) { this.detailSource = { - workShopCode: item.workshopCode, + workshopCode: item.workshopCode, workShopName: item.workShopName, productionLineCode: item.productionLineCode, productionLineName: item.productionLineName, From d86546561d0e202349f71e36ebffff21d9b8b240 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 24 Jan 2024 16:28:48 +0800 Subject: [PATCH 02/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=92=8C=E7=AE=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mycomponents/scan/winScanPackAndLocation.vue | 104 +++++++++++++------ pages/deliver/job/deliverDetail.vue | 5 +- pages/purchaseReturn/record/returnRecord.vue | 2 +- 3 files changed, 74 insertions(+), 37 deletions(-) diff --git a/mycomponents/scan/winScanPackAndLocation.vue b/mycomponents/scan/winScanPackAndLocation.vue index 536b7969..5b653c14 100644 --- a/mycomponents/scan/winScanPackAndLocation.vue +++ b/mycomponents/scan/winScanPackAndLocation.vue @@ -28,7 +28,7 @@ + @confirm="" style='height: 30rpx;border:1px solid #fff ;'> @@ -122,7 +122,8 @@ businessType: {}, inventoryStatus: [], managementPrecision: '', - fromInventoryStatuses: "" + fromInventoryStatuses: "", + isCheck:false } }, created() { @@ -168,20 +169,30 @@ this.$emit("close", ''); }, - scanLocation() { + + scanLocation(scanResult) { + var isCheck = false; if (this.fromLocationCode == '') { - this.showMessage('来源库位不能为空', callback => { + this.showErrorMessage('来源库位不能为空', callback => { this.locationGetFocus(); }) return; } + + if(this.fromLocationList.length>0){ + if(!this.isInLocationList(this.fromLocationCode)){ + this.showErrorMessage("扫描库位【"+this.fromLocationCode+'】不在任务来源库位中', callback => { + this.locationGetFocus(); + }) + return; + } + } uni.showLoading({ title: '扫描中...', mask: true }); getBasicLocationByCode(this.fromLocationCode).then(res => { - uni.hideLoading(); if (res.data.total > 0) { let result = res.data.list[0]; var type = result.type; @@ -189,8 +200,10 @@ if (available == "TRUE") { if (checkDirectoryItemExist(this.fromLocationTypeArray, type)) { this.location = result; - this.packGetFocus(); + // this.packGetFocus(); + this.checkPackage(scanResult); } else { + uni.hideLoading(); var hint = getListLocationTypeDesc(this.fromLocationTypeArray); this.showErrorMessage("库位[" + this.fromLocationCode + "]是" + getLocationTypeName(type) + ",
需要的库位类型是[" + hint + "]", callback => { @@ -198,11 +211,13 @@ }) } } else { + uni.hideLoading(); this.showErrorMessage("扫描库位[" + this.fromLocationCode + "]不可用", res => { this.locationGetFocus(); }) } } else { + uni.hideLoading(); this.showErrorMessage('未查询到库位[' + this.fromLocationCode + ']', res => { this.locationGetFocus(); }) @@ -215,36 +230,45 @@ }) }, - getScanResult(result) { - console.log("扫描", result) - if (this.fromLocationCode == '' || this.fromLocationCode == null) { - this.showMessage('请先扫描来源库位', callback => { - this.locationGetFocus(); - }) - return; - } else { - if (result.label != null) { - this.scanResult = result; - // uni.showLoading({ - // title: '查询中...', - // mask: true - // }) - getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses, - res => { - if (res.success) { - this.managementPrecision = res.managementPrecision - this.afterQueryBalance(res.data.list); - } else { - this.showErrorMessage(res.message, res => { - this.packGetFocus(); - }) - } - // uni.hideLoading(); - }); - } + getScanResult(result) { + // console.log("扫描", result) + // if (this.fromLocationCode == '' || this.fromLocationCode == null) { + // this.showMessage('请先扫描来源库位', callback => { + // this.locationGetFocus(); + // }) + // return; + // } else + this.scanLocation(result); + // debugger + // if(this.isCheck){ + // this.checkPackage(result); + // } + }, + + checkPackage(result){ + if (result.label != null) { + this.scanResult = result; + // uni.showLoading({ + // title: '查询中...', + // mask: true + // }) + getBalanceByManagementPrecision(result.label, this.fromLocationCode, this.fromInventoryStatuses, + res => { + uni.hideLoading(); + if (res.success) { + this.managementPrecision = res.managementPrecision + this.afterQueryBalance(res.data.list); + } else { + this.showErrorMessage(res.message, res => { + this.packGetFocus(); + }) + } + // uni.hideLoading(); + }); } }, + afterQueryBalance(datas) { if (this.allowNullBalance) { this.allowNoneBalance(datas); @@ -401,6 +425,20 @@ change(e) { this.show = e.show }, + isInLocationList(location) { + var item = this.fromLocationList.filter(res => { + res = location + }) + if (item != undefined && item.length > 0) { + return true + } + return false + }, + addLocationCode(code) { + if (!this.isInLocationList(code)) { + this.fromLocationList.push(code) + } + } } } diff --git a/pages/deliver/job/deliverDetail.vue b/pages/deliver/job/deliverDetail.vue index 3bd38488..4af0b5ee 100644 --- a/pages/deliver/job/deliverDetail.vue +++ b/pages/deliver/job/deliverDetail.vue @@ -224,7 +224,7 @@ }) //使用在途库，不查询管理模式 - if (this.jobContent.useOnTheWayLocation == 'TRUE') { + if (locationCode == null) { this.submitJob(); } else { //获取管理模式，封装参数 @@ -280,8 +280,7 @@ record.supplierCode = r.supplierCode; //使用在途库不改变管理模式 - if (this.jobContent.useOnTheWayLocation == - 'TRUE') { + if (this.toLocationCode ==null) { record.toPackingNumber = r .packingNumber; record.toBatch = r.batch; diff --git a/pages/purchaseReturn/record/returnRecord.vue b/pages/purchaseReturn/record/returnRecord.vue index 68f60fce..3ab0f291 100644 --- a/pages/purchaseReturn/record/returnRecord.vue +++ b/pages/purchaseReturn/record/returnRecord.vue @@ -286,7 +286,7 @@ submitItem.fromBatch = detail.batch; submitItem.toBatch = detail.batch; - submitItem.fromLocationCode = this.fromLocationCode; + submitItem.fromLocationCode = detail.locationCode; submitItem.toLocationCode = ''; //采购退货直接出库，目标库位为空 submitItem.qty = detail.handleQty; From dc9a488f0b9cf2d09ea2d4009d990ea0b651a5b7 Mon Sep 17 00:00:00 2001 From: lijuncheng Date: Wed, 24 Jan 2024 16:31:44 +0800 Subject: [PATCH 03/21] =?UTF-8?q?=E5=88=B6=E5=93=81=E5=8F=91=E8=B4=A7?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/deliver/coms/comScanDeliverPack.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pages/deliver/coms/comScanDeliverPack.vue b/pages/deliver/coms/comScanDeliverPack.vue index 66fca552..de38df00 100644 --- a/pages/deliver/coms/comScanDeliverPack.vue +++ b/pages/deliver/coms/comScanDeliverPack.vue @@ -3,10 +3,17 @@ - - 扫描箱码 - 关闭 + + + 扫描箱码 + + + + + + - + @@ -45,7 +45,7 @@ type: Number, default: 0 }, - showItemQty: { + isShowBalanceQty: { type: Boolean, default: true }, diff --git a/mycomponents/record/recordComDetailCard.vue b/mycomponents/record/recordComDetailCard.vue index 9631545a..62883887 100644 --- a/mycomponents/record/recordComDetailCard.vue +++ b/mycomponents/record/recordComDetailCard.vue @@ -6,7 +6,7 @@ + :isShowBalance="true" :isShowBalanceQty="isShowBalanceQty"> @@ -86,7 +86,7 @@ default: true }, - isShowItemQty: { + isShowBalanceQty: { type: Boolean, default: false }, diff --git a/pages/container/coms/comPalletRecord.vue b/pages/container/coms/comPalletRecord.vue index f41af4d6..ad07a2b9 100644 --- a/pages/container/coms/comPalletRecord.vue +++ b/pages/container/coms/comPalletRecord.vue @@ -5,7 +5,7 @@