From 5bf16f602bd575c149cf6d01a9258300a3869a6e Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Sun, 9 Jul 2023 15:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E5=BD=A2=E7=A0=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/Models/PackTask/PackTaskModel.cs           | 2 +-
 BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/BBWY.Client/Models/PackTask/PackTaskModel.cs b/BBWY.Client/Models/PackTask/PackTaskModel.cs
index e7899405..ee33a18c 100644
--- a/BBWY.Client/Models/PackTask/PackTaskModel.cs
+++ b/BBWY.Client/Models/PackTask/PackTaskModel.cs
@@ -150,7 +150,7 @@ namespace BBWY.Client.Models
                 ProductNo = BarCodeModel.ProductNo,
                 SkuId = BarCodeModel.SkuId,
                 SkuName = BarCodeModel.SkuName,
-                ShopName= ShopName
+                ShopName = BarCodeModel.ShopName
             };
             printWindow.LoadData();
             //printWindow.Datas = LoadBarLabelModels();
diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index 343430d9..94050546 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
@@ -588,10 +588,10 @@ namespace BBWY.Client.ViewModels
                 BatchPrintWindow batchPrint = new BatchPrintWindow();
 
 
-                if (BarCodeModel!=null)
-                {
-                    BarCodeModel.ShopName = OriginShopName;
-                }
+                //if (BarCodeModel!=null)
+                //{
+                //    BarCodeModel.ShopName = OriginShopName;
+                //}
                 batchPrint.SetData(GoodProductQuantity,
                    PurchaseSkuList.Where(p => p.IsNeedCer && p.CerDTO.Id > 0).Select(p => p.CerDTO).ToArray()
                     , BarCodeModel);