From 88541d6e4eed9f1172959d1b4e4caac0f474b6bb Mon Sep 17 00:00:00 2001
From: "506583276@qq.com" <506583276@qq.com>
Date: Sun, 11 Jun 2023 17:07:14 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E5=8C=BA=E5=88=86B=E7=AB=AFC?=
 =?UTF-8?q?=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BBWY.Client/GlobalContext.cs                    |  2 +-
 .../PackPurchaseTask/QualityTaskResponse.cs     |  6 ++++++
 .../ViewModels/QualityTask/QualityViewModel.cs  | 17 ++++++++++++-----
 .../QualityTask/QualitySetCerWindow.xaml.cs     |  5 ++++-
 4 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/BBWY.Client/GlobalContext.cs b/BBWY.Client/GlobalContext.cs
index 6d76bbda..cbe0b1f3 100644
--- a/BBWY.Client/GlobalContext.cs
+++ b/BBWY.Client/GlobalContext.cs
@@ -9,7 +9,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10123";
+            ClientVersion = "10124";
         }
 
         private User user;
diff --git a/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs b/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs
index f8f767c6..1a7c7571 100644
--- a/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs
+++ b/BBWY.Client/Models/APIModel/Response/PackPurchaseTask/QualityTaskResponse.cs
@@ -93,6 +93,12 @@ namespace BBWY.Client.Models.APIModel.Response.PackPurchaseTask
         /// 配件列表
         /// </summary>
         public PurchaseSku[] PurchaseSkus { get; set; }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public SaveType? SaveType { get; set; }
     }
     public class WareHourseDTO
     {
diff --git a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
index 723289be..5276b081 100644
--- a/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
+++ b/BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs
@@ -20,6 +20,7 @@ using Org.BouncyCastle.Asn1.Crmf;
 using System.Runtime.InteropServices.WindowsRuntime;
 using NPOI.Util;
 using BBWY.Controls;
+using WebSocketSharp;
 
 namespace BBWY.Client.ViewModels
 {
@@ -585,12 +586,8 @@ namespace BBWY.Client.ViewModels
 
                     System.Windows.MessageBox.Show(ex.Message);
                 }
-            
-
-
            
 
-
         }
 
 
@@ -653,7 +650,7 @@ namespace BBWY.Client.ViewModels
                 model.CerDTO.BrandName = BrandName;
 
             QualitySetCerWindow setCerWindow = new QualitySetCerWindow();
-            setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate);
+            setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate, saveType);
             setCerWindow.SaveResult = (s, PackCerState) =>
             {
                 if (string.IsNullOrEmpty(s.PurchaseSkuId))
@@ -694,6 +691,9 @@ namespace BBWY.Client.ViewModels
             look.Show();
         }
 
+
+
+        SaveType? saveType;
         /// <summary>
         /// 搜索 skuId(todo:)
         /// </summary>
@@ -743,6 +743,13 @@ namespace BBWY.Client.ViewModels
 
 
             var packTaskRes = packPurchaseTaskService.GetQualityTask(model.TaskId);
+
+
+            saveType = packTaskRes.Data.SaveType;
+            if (saveType==null)
+            {
+                saveType = OrderId.IsNullOrEmpty() ? SaveType.C端 : SaveType.B端;
+            }
             if (packTaskRes == null || !packTaskRes.Success) return;
             BarCodeModel = packTaskRes.Data.BarCodeDTO;
             IsNeedBarCode = packTaskRes.Data.IsNeedBar ? Need.需要 : Need.不需要;
diff --git a/BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml.cs b/BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml.cs
index 477e0dbd..9ce656c1 100644
--- a/BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml.cs
+++ b/BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml.cs
@@ -35,14 +35,16 @@ namespace BBWY.Client.Views.QualityTask
             PackCerState = obj;
         }
 
-        public void LoadData(bool isNeedCer, CertificateModel CertificateModel, PackPurchaseTaskService packTaskService, CertificateModel SpuCertificateModel, bool IsSetSpuCertificate)
+        public void LoadData(bool isNeedCer, CertificateModel CertificateModel, PackPurchaseTaskService packTaskService, CertificateModel SpuCertificateModel, bool IsSetSpuCertificate,SaveType? saveType)
         {
             this.CertificateModel = CertificateModel.Copy();
             this.packTaskService = packTaskService;
             PackCerState = isNeedCer ? PackCerState.合格证信息 : PackCerState.无需合格证;
+            SaveType = saveType;
             this.DataContext = this;
         }
 
+        public SaveType? SaveType { get; set; }
         public ICommand SetPackCerStateCommand { get; set; }
 
 
@@ -123,6 +125,7 @@ namespace BBWY.Client.Views.QualityTask
                 GoodsNumber = CertificateModel.GoodsNumber,
                 ProduceDate = CertificateModel.ProduceDate,
                 PurchaseSkuId = CertificateModel.PurchaseSkuId,
+                 SaveType = SaveType
             });
             if (resData == null || !resData.Success)
             {