|
@ -108,7 +108,7 @@ export function getLabelItems(labelItem, scanMsg, callBack) { |
|
|
if (labelResult.label.labelType == 'PurchaseLabel' || labelResult.label.labelType == 'MakeLabel') { |
|
|
if (labelResult.label.labelType == 'PurchaseLabel' || labelResult.label.labelType == 'MakeLabel') { |
|
|
//查询包装信息
|
|
|
//查询包装信息
|
|
|
let packingNumber = labelResult.label.packingNumber |
|
|
let packingNumber = labelResult.label.packingNumber |
|
|
if (packingNumber != undefined) { |
|
|
if (packingNumber != undefined && packingNumber != '') { |
|
|
getPackageListByNumber(packingNumber).then(pack => { |
|
|
getPackageListByNumber(packingNumber).then(pack => { |
|
|
if (pack.data.reqPackage) { |
|
|
if (pack.data.reqPackage) { |
|
|
labelResult.package = pack.data.reqPackage; |
|
|
labelResult.package = pack.data.reqPackage; |
|
@ -126,9 +126,11 @@ export function getLabelItems(labelItem, scanMsg, callBack) { |
|
|
callBack(labelResult); |
|
|
callBack(labelResult); |
|
|
}) |
|
|
}) |
|
|
} else { |
|
|
} else { |
|
|
labelResult.success = false; |
|
|
labelResult.package = labelResult.label; |
|
|
labelResult.message = '在条码中未解析到箱码'; |
|
|
|
|
|
callBack(labelResult); |
|
|
callBack(labelResult); |
|
|
|
|
|
// labelResult.success = false;
|
|
|
|
|
|
// labelResult.message = '在条码中未解析到箱码';
|
|
|
|
|
|
// callBack(labelResult);
|
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
callBack(labelResult); |
|
|
callBack(labelResult); |
|
|