From d8bcc17a31282f1ce73a541a2339bca8fd7f0816 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Mon, 28 Oct 2024 16:16:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E6=96=99=E5=92=8C?=
 =?UTF-8?q?=E8=A1=A5=E6=96=99=202024/8/7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/label.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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);