|
@@ -392,7 +392,7 @@ const _handlerScan=(code)=> {
|
|
|
//将匹配到的条码放到第一个
|
|
//将匹配到的条码放到第一个
|
|
|
let count=0
|
|
let count=0
|
|
|
modelLocative.list=modelLocative.list.reduce((list, item) => {
|
|
modelLocative.list=modelLocative.list.reduce((list, item) => {
|
|
|
- if ((barcodeToUpperCase(item.barcode) === barcodeToUpperCase(code) || barcodeToUpperCase(item.barcodeAs) === barcodeToUpperCase(code)) && item.operationTime===null) {
|
|
|
|
|
|
|
+ if ((barcodeToUpperCase(item.barcode) === barcodeToUpperCase(code) ||item.barcodeAs === barcodeToUpperCase(code)) && item.operationTime===null) {
|
|
|
count++
|
|
count++
|
|
|
if (count==1) {
|
|
if (count==1) {
|
|
|
list.unshift(item)
|
|
list.unshift(item)
|
|
@@ -413,12 +413,14 @@ const _handlerScan=(code)=> {
|
|
|
let barcode = Object.keys(listMap).find(key => {
|
|
let barcode = Object.keys(listMap).find(key => {
|
|
|
return key.includes(`${upperCode},`) || key.includes(`${code}-null`);
|
|
return key.includes(`${upperCode},`) || key.includes(`${code}-null`);
|
|
|
});
|
|
});
|
|
|
|
|
+ console.log(barcode,"barcode")
|
|
|
let activeBarcode=listMap[barcode]
|
|
let activeBarcode=listMap[barcode]
|
|
|
if (!activeBarcode) {
|
|
if (!activeBarcode) {
|
|
|
activeBarcode = modelLocative.list.find(item => {
|
|
activeBarcode = modelLocative.list.find(item => {
|
|
|
return barcodeToUpperCase(item.barcode) === upperCode || item.barcodeAs === upperCode;
|
|
return barcodeToUpperCase(item.barcode) === upperCode || item.barcodeAs === upperCode;
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
|
|
+ console.log(activeBarcode,"activeBarcode")
|
|
|
if(activeBarcode.operationTime){
|
|
if(activeBarcode.operationTime){
|
|
|
showConfirmDialog({
|
|
showConfirmDialog({
|
|
|
title: '温馨提示',
|
|
title: '温馨提示',
|