diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue index 6d13149d..0f0f7e50 100644 --- a/src/pages/issue/coms/comScanIssuePack.vue +++ b/src/pages/issue/coms/comScanIssuePack.vue @@ -228,6 +228,27 @@ onScan(result) { + if(this.toLocation&&result.package.packUnit){ + let item = this.toLocation.Items.find(r => r.itemCode == result.package.itemCode); + if(result.package.packUnit!==item.packUnit){ + this.$refs.comMessage.showModal({ + iconType:'警告', + content:'包装规格不一致', + showConfirmButton:true, + showCancelButton:true, + confirmText:'是', + cancelText:'否', + success:({confirm})=>{ + if(confirm){ + this.onScanResult(result) + } + } + }); + return + } + } + }, + onScanResult(result) { try { let that = this; if (that.fromLocationCode == '') { diff --git a/src/pages/issue/js/issue.js b/src/pages/issue/js/issue.js index 0cabca84..696ff895 100644 --- a/src/pages/issue/js/issue.js +++ b/src/pages/issue/js/issue.js @@ -55,7 +55,7 @@ export function createItemInfo(detail) { itemName: detail.itemName, productionLineCode: detail.productionLineCode, workStationCode: detail.workStationCode, - stdPackQty: detail.stdPackQty, + packQty: detail.packQty, packUnit: detail.packUnit, qty: detail.qty, uom: detail.uom,