|
|
@@ -405,18 +405,18 @@ const _handlerScan=(code)=> {
|
|
|
return list;
|
|
|
}, [])
|
|
|
const listMap = modelLocative.list.reduce((acc, item) => {
|
|
|
- const key = `${barcodeToUpperCase(item.barcode)},${barcodeToUpperCase(item.barcodeAs)}-${item.operationTime}`
|
|
|
+ const key = `${barcodeToUpperCase(item.barcode)},${item.barcodeAs}-${item.operationTime}`
|
|
|
acc[key] = item
|
|
|
return acc
|
|
|
}, {})
|
|
|
const upperCode = barcodeToUpperCase(code);
|
|
|
let barcode = Object.keys(listMap).find(key => {
|
|
|
- return key.includes(`${upperCode},`) || key.includes(`${upperCode}-null`);
|
|
|
+ return key.includes(`${upperCode},`) || key.includes(`${code}-null`);
|
|
|
});
|
|
|
let activeBarcode=listMap[barcode]
|
|
|
if (!activeBarcode) {
|
|
|
activeBarcode = modelLocative.list.find(item => {
|
|
|
- return barcodeToUpperCase(item.barcode) === upperCode || barcodeToUpperCase(item.barcodeAs) === upperCode;
|
|
|
+ return barcodeToUpperCase(item.barcode) === upperCode || item.barcodeAs === upperCode;
|
|
|
});
|
|
|
}
|
|
|
if(activeBarcode.operationTime){
|