diff --git a/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue b/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue index 1134079..515e5dc 100644 --- a/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue +++ b/src/views/modules/haianAutoWarehouse/haianPalletAssembly.vue @@ -677,6 +677,11 @@ export default { this.openCallEmptyModal() }, showScanModal() { + // A0206不允许手工组盘主动扫入标签,被分拣场景不走本页 - rqrq + if (this.operationType === 'in' && this.currentPalletType === 'A0206') { + this.$alert('A0206类型栈板不允许主动扫入标签', '错误', { confirmButtonText: '确定' }) + return + } this.scanModalVisible = true this.scanCode = '' this.currentSelectedPosition = '' @@ -833,6 +838,14 @@ export default { return } this.scanRequestLoading = true + // 提交前再拦一次A0206,避免改类型后仍走扫进接口 - rqrq + if (this.currentPalletType === 'A0206') { + this.scanRequestLoading = false + this.scanCode = '' + this.$alert('A0206类型栈板不允许主动扫入标签', '错误', { confirmButtonText: '确定' }) + this.moveFocusToScanInput() + return + } savePalletDetail({ site: this.site, palletId: this.palletCode, diff --git a/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue b/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue index 789ae10..331c643 100644 --- a/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue +++ b/src/views/modules/haianAutoWarehouse/haianPalletPacking.vue @@ -721,8 +721,13 @@ export default { } this.openCallEmptyModal() }, - // 打开扫码弹窗并初始化网格数据,交互与原PDA页面一致 - rqrq + // 打开扫码弹窗并初始化网格数据;A0206禁止主动扫进,扫出仍允许 - rqrq showScanModal() { + // A0206不允许组盘入库主动扫入标签,被分拣场景不走本页 - rqrq + if (this.operationType === 'in' && this.currentPalletType === 'A0206') { + this.$alert('A0206类型栈板不允许主动扫入标签', '错误', { confirmButtonText: '确定' }) + return + } this.scanModalVisible = true this.scanCode = '' this.currentSelectedPosition = '' @@ -885,6 +890,14 @@ export default { return } this.scanRequestLoading = true + // 提交前再拦一次A0206,避免改类型后仍走扫进接口 - rqrq + if (this.currentPalletType === 'A0206') { + this.scanRequestLoading = false + this.scanCode = '' + this.$alert('A0206类型栈板不允许主动扫入标签', '错误', { confirmButtonText: '确定' }) + this.moveFocusToScanInput() + return + } savePalletDetail({ site: this.site, palletId: this.palletCode,