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