diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue index f77acd82..69bc3fe7 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue @@ -246,15 +246,35 @@ export default { let scanWeight = this.form.scanWeight let dispatchOrSendMan = this.form.dispatchOrSendMan; let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + // let scList=bcList.map(function(code) { + // return { + // billCode:code, + // scanWeight:scanWeight, + // // scanWeight:null, + // dispatchOrSendManCode: dispatchOrSendManCode + // } + // } + // ) + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code+"30"] || dm[code+"40"]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } // 到件批量 let scanArrivalInfo = { diff --git a/src/views/emis/emisTmsScanRecord/arrivalScan.vue b/src/views/emis/emisTmsScanRecord/arrivalScan.vue index 06f48d89..d1524c47 100644 --- a/src/views/emis/emisTmsScanRecord/arrivalScan.vue +++ b/src/views/emis/emisTmsScanRecord/arrivalScan.vue @@ -236,15 +236,27 @@ export default { let bcList=this.formBatch.billCode.split(/[;\;\,\,\n]/)||[]; let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"30", diff --git a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue index f2f31e70..07e174e3 100644 --- a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue +++ b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue @@ -235,17 +235,28 @@ export default { let bcList=this.formBatch.billCode.split(/[;\;\,\,\n]/)||[]; let scanWeight = this.form.scanWeight; let bagNo = this.form.bagNo; - let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - bagNo:bagNo, - scanWeight:scanWeight, - // scanWeight:null, - scanDate:null - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + bagNo:bagNo, + scanWeight:scanWeight, + // scanWeight:null, + scanDate:null + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"200", diff --git a/src/views/emis/emisTmsScanRecord/deliveryScan.vue b/src/views/emis/emisTmsScanRecord/deliveryScan.vue index 20041221..0d394856 100644 --- a/src/views/emis/emisTmsScanRecord/deliveryScan.vue +++ b/src/views/emis/emisTmsScanRecord/deliveryScan.vue @@ -242,15 +242,27 @@ export default { let bcList=this.formBatch.billCode.split(/[;\;\,\,\n]/)||[]; let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"40", diff --git a/src/views/emis/emisTmsScanRecord/loadingScan.vue b/src/views/emis/emisTmsScanRecord/loadingScan.vue index a1a9a965..bd1d6ef4 100644 --- a/src/views/emis/emisTmsScanRecord/loadingScan.vue +++ b/src/views/emis/emisTmsScanRecord/loadingScan.vue @@ -228,15 +228,36 @@ export default { // let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; let carNo = this.form.carNo; + // let scList=bcList.map(function(code) { + // return { + // billCode:code, + // // scanWeight:scanWeight, + // carNo:carNo, + // dispatchOrSendManCode: dispatchOrSendManCode + // } + // } + // ) + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - // scanWeight:scanWeight, - carNo:carNo, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + // scanWeight:scanWeight, + carNo:carNo, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"301", diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue index e237d2bb..e2b1a141 100644 --- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue +++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue @@ -229,23 +229,34 @@ export default { this.openBatch=false; }, submitFormBatch(){ - if(this.formBatch.billCode==null || this.formBatch.billCode==''){ this.$message.error("输入单号后回车"); return; } let bcList=this.formBatch.billCode.split(/[;\;\,\,\n]/)||[]; + let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"20", diff --git a/src/views/emis/emisTmsScanRecord/positionScanning.vue b/src/views/emis/emisTmsScanRecord/positionScanning.vue index 02b12c96..c2d06ea9 100644 --- a/src/views/emis/emisTmsScanRecord/positionScanning.vue +++ b/src/views/emis/emisTmsScanRecord/positionScanning.vue @@ -247,15 +247,27 @@ export default { let bcList=this.formBatch.billCode.split(/[;\;\,\,\n]/)||[]; let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"70", diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue index 91825e79..928bf8f5 100644 --- a/src/views/emis/emisTmsScanRecord/scanRecord.vue +++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue @@ -242,15 +242,27 @@ export default { let bcList=this.formBatch.billCode.split(/[;\;\,\,\n]/)||[]; let scanWeight = this.form.scanWeight let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"10", diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue index ae7341bd..74a09eae 100644 --- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue +++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue @@ -278,6 +278,16 @@ export default { this.form.ids= arr.map(item=>item.id+item.scanType) }, handleBatchScan(){ + let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + let preOrNextStationCode = this.form.preOrNextStationCode; + if(dispatchOrSendManCode==null || dispatchOrSendManCode==''){ + this.$message.error("请选择取件员"); + return; + } + if(preOrNextStationCode==null||preOrNextStationCode==''){ + this.$message.error("请选择下一站"); + return; + } this.formBatch = { billCode: null, } @@ -310,23 +320,26 @@ export default { this.$message.error("输入单号后回车"); return; } - if(dispatchOrSendManCode==null || dispatchOrSendManCode==''){ - this.$message.error("请选择取件员"); - return; - } - if(preOrNextStationCode==null||preOrNextStationCode==''){ - this.$message.error("请选择下一站"); - return; - } + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code+"10"] || dm[code+"20"]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + // scanWeight:null, + dispatchOrSendManCode: dispatchOrSendManCode + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } // 揽件批量 let scanArrivalInfo = { diff --git a/src/views/emis/emisTmsScanRecord/unloadingScan.vue b/src/views/emis/emisTmsScanRecord/unloadingScan.vue index 2f7fecc3..9a98a02c 100644 --- a/src/views/emis/emisTmsScanRecord/unloadingScan.vue +++ b/src/views/emis/emisTmsScanRecord/unloadingScan.vue @@ -210,16 +210,32 @@ export default { // let scanWeight = this.form.scanWeight // let dispatchOrSendManCode = this.form.dispatchOrSendManCode; let carNo = this.form.carNo; + // let scList=bcList.map(function(code) { + // return { + // billCode:code, + // carNo: carNo + // } + // } + // ) + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - carNo: carNo - // scanWeight:scanWeight, - // scanWeight:null, - // dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + carNo: carNo + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"302", diff --git a/src/views/emis/emisTmsScanRecord/unpackScan.vue b/src/views/emis/emisTmsScanRecord/unpackScan.vue index ce9aa6cd..6259c96d 100644 --- a/src/views/emis/emisTmsScanRecord/unpackScan.vue +++ b/src/views/emis/emisTmsScanRecord/unpackScan.vue @@ -223,16 +223,25 @@ export default { } let bcList=this.formBatch.billCode.split(/[;\;\,\,\n]/)||[]; let scanWeight = this.form.scanWeight - let dispatchOrSendManCode = this.form.dispatchOrSendManCode; + + let haveCode = null; + let dm = this.dataMap; let scList=bcList.map(function(code) { - return { - billCode:code, - scanWeight:scanWeight, - // scanWeight:null, - // dispatchOrSendManCode: dispatchOrSendManCode - } + if(dm[code]){ + haveCode = code; + return; } - ) + return { + billCode:code, + scanWeight:scanWeight, + } + }) + + if(haveCode){ + this.$message.error("重复扫描:"+haveCode); + this.playNoticeTone(1); + return;//终止批量扫描逻辑 + } let scanInfo = { scanType:"201",