diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index e4e88005..ecf674cf 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -55,7 +55,7 @@ + headerType="HPQ,HMQ" :isShowHistory="false" :locationCode='locationCode'> @@ -152,6 +152,10 @@ type: String, default: '' }, + locationCode:{ + type: String, + default: '' + } }, data() { return { @@ -179,7 +183,7 @@ fontSize: "100rpx" }, bussinessCode: 'Issue', - toLocationAreaTypeList: [] + toLocationAreaTypeList: [], } }, created() { @@ -270,7 +274,7 @@ } }, - queryBalance(result) { + queryBalance(result , managementType ) { try { let that = this; // if (that.fromLocationCode == '') { @@ -281,7 +285,12 @@ // } let packageInfo = result.package; let itemCode = result.label.itemCode; - let packingCode = result.label.packingNumber; + let packingCode = ''; + if(managementType == 'BY_BATCH' || managementType == 'BY_QUANTITY'){ + packingCode = '' + } else{ + packingCode = result.label.packingNumber; + } let lot = result.label.batch; let item = that.toLocation.Items.find(r => r.itemCode == itemCode); if (item == undefined) { @@ -401,7 +410,7 @@ }, - onScan(result) { + onScan(result, managementType) { if (!result.package) { this.showErrorMessage('扫描数据错误[' + result.label.code + "]", res => { @@ -427,12 +436,12 @@ this.getToLocationBalance(result) } }else{ - this.queryBalance(result) + this.queryBalance(result, managementType) } }, //查询到目标库位的库存余额 - getToLocationBalance(result) { + getToLocationBalance(result, managementType) { uni.showLoading({ title: '查询中', mask: true @@ -470,7 +479,7 @@ // value: this.toLocationAreaTypeList.join(',') // }) - this.queryBalance(result); + this.queryBalance(result, managementType); // var params = { // filters: filters, // pageNo: 1, diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue index 06d17c2f..e171f0ed 100644 --- a/src/pages/issue/job/issueDetail.vue +++ b/src/pages/issue/job/issueDetail.vue @@ -46,7 +46,7 @@ + @afterScan='afterScan' :locationCode='fromLocationCode'> @@ -115,7 +115,8 @@ jobStatus: "", scanMessage: '', managementList: [], - managementType: "" + managementType: "", + fromLocationCode:'' }; }, @@ -300,7 +301,7 @@ this.showErrorMessage("请扫描您需要提交的发料任务") return } - console.log("提交参数", JSON.stringify(params)); + console.log("提交参数", params); issueJobSubmit(params).then(res => { uni.hideLoading() if (res.data) {