1

BBWY.Client/APIServices/PackPurchaseTaskService.cs

@@ -56,7 +56,7 @@ namespace BBWY.Client.APIServices
 
         public ApiResponse<long> SaveCer(CerRequest cerRequest)
         {
-            return SendRequest<long>(globalContext.QKApiHost, "api/Certificate/CommitCer", cerRequest
+            return SendRequest<long>(globalContext.QKApiHost, "api/Certificate/CommitCerData", cerRequest
           , null, HttpMethod.Post);
         }
 

BBWY.Client/Models/QualityTask/PurchaseSku.cs

@@ -45,10 +45,15 @@ namespace BBWY.Client.Models.QualityTask
         /// 是否需要配置合格证
         /// </summary>
         public bool IsNeedCer { get => isNeedCer; set { Set(ref isNeedCer, value); } }
+
+        /// <summary>
+        /// 合格证配置信息
+        /// </summary>
+        public CertificateModel cerDTO;
         /// <summary>
         /// 合格证配置信息
         /// </summary>
-        public CertificateModel CerDTO { get; set; }
+        public CertificateModel CerDTO { get => cerDTO; set { Set(ref cerDTO, value); } }
 
         private bool isSetCertificate;
         /// <summary>

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -366,7 +366,7 @@ namespace BBWY.Client.ViewModels
             SetBarCodeCommand = new RelayCommand(SetBarCode);
             SetCertificateCommand = new RelayCommand<PurchaseSku>(SetCertificate);
             LookBarCommand = new RelayCommand(LookBar);
-            LookCerCommand = new RelayCommand<string>(LookCer);
+            LookCerCommand = new RelayCommand<CertificateModel>(LookCer);
             //SearchSkuCommand = new RelayCommand<object>(SearchSku);
             CompeteQualityTaskCommand = new RelayCommand<object>(CompeteQualityTask);
             IncreateList = new ObservableCollection<IncreateModel>();
@@ -541,6 +541,15 @@ namespace BBWY.Client.ViewModels
             setCerWindow.LoadData(model.IsNeedCer, model.CerDTO, packPurchaseTaskService, spuCertificateModel, IsSetSpuCertificate);
             setCerWindow.SaveResult = (s, PackCerState) =>
             {
+                if (string.IsNullOrEmpty(s.PurchaseSkuId))
+                {
+                    var sku = PurchaseSkuList.SingleOrDefault(p => p.CerDTO.GoodsNumber == s.GoodsNumber);
+                    sku.CerDTO = s;
+                    sku.IsSetCertificate = false;
+                    sku.IsNeedCer = PackCerState == PackCerState.合格证信息;
+                    IsNeedCertificateModel = Need.需要;
+                    return;
+                }
                 var skus = PurchaseSkuList.SingleOrDefault(p => p.PurchaseSkuId == s.PurchaseSkuId);
                 skus.CerDTO = s;
                 skus.IsSetCertificate = false;
@@ -554,9 +563,10 @@ namespace BBWY.Client.ViewModels
         /// <summary>
         /// 查看合格证
         /// </summary>
-        private void LookCer(string id)
+        private void LookCer(CertificateModel certificate)
         {
-            QualityLookCerWindow lookCerWindow = new QualityLookCerWindow(PurchaseSkuList.SingleOrDefault(p => p.PurchaseSkuId == id).CerDTO);
+            
+           QualityLookCerWindow lookCerWindow = new QualityLookCerWindow(certificate);
             lookCerWindow.Show();
         }
         /// <summary>

BBWY.Client/Views/QualityTask/BatchPrintWindow.xaml.cs

@@ -155,7 +155,7 @@ namespace BBWY.Client.Views.QualityTask
             if (!string.IsNullOrEmpty(barNumber.Text))
                 try
                 {
-                    cerNum = Convert.ToInt32(barNumber.Text);
+                    barNum = Convert.ToInt32(barNumber.Text);
                 }
                 catch
                 {
@@ -198,6 +198,11 @@ namespace BBWY.Client.Views.QualityTask
                         foreach (var cer in CertificateModel)
                             PrintData(cerNum, printName, null, cer);
                 }
+
+                App.Current.Dispatcher.Invoke(new Action(() =>
+                {
+                    this.Close();
+                }));
             });
 
         }

BBWY.Client/Views/QualityTask/QualitySetCerWindow.xaml.cs

@@ -106,6 +106,8 @@ namespace BBWY.Client.Views.QualityTask
 
             var standers = CertificateModel.ExcuteStander.Split(',', StringSplitOptions.RemoveEmptyEntries);
 
+
+
             var resData = packTaskService.SaveCer(new CerRequest
             {
                 Brand = CertificateModel.Brand,
@@ -122,7 +124,8 @@ namespace BBWY.Client.Views.QualityTask
                 ApplyAge = CertificateModel.ApplyAge,
                 GoodsNumber = CertificateModel.GoodsNumber,
                 ProduceDate = CertificateModel.ProduceDate,
-                PurchaseSkuId = CertificateModel.PurchaseSkuId
+                PurchaseSkuId = CertificateModel.PurchaseSkuId,
+                 
 
             });
             if (resData == null || !resData.Success)

BBWY.Client/Views/QualityTask/QualityWindow.xaml

@@ -345,7 +345,7 @@
                                             <Border Margin="20 0 0 0" BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="150" Width="150">
                                                 <StackPanel Orientation="Vertical">
                                                     <Border BorderBrush="{StaticResource Border.Brush}" BorderThickness="1" Height="30 "  Margin="20 50 20 30">
-                                                        <TextBlock Text="配件1" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                                        <TextBlock Text="{Binding  CerDTO.GoodsNumber,StringFormat=配件{0}}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
 
                                                     </Border>
 
@@ -353,7 +353,7 @@
                                                         <TextBlock Text="合格证: " VerticalAlignment="Center"/>
 
                                                         <StackPanel  Orientation="Horizontal"
-                                                             Visibility="{Binding  IsNeedCer, Converter={StaticResource objConverter}, ConverterParameter=true:Visible:Collapsed }">
+                                                             Visibility="{Binding   IsNeedCer, Converter={StaticResource objConverter}, ConverterParameter=true:Visible:Collapsed }">
 
                                                             <c:BButton Content="待确认" Style="{StaticResource LinkButton}" Width="35"  Height="15" 
                                                            Command="{Binding DataContext. SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"
@@ -362,7 +362,7 @@
                                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" 
                             Visibility="{Binding  IsSetCertificate, Converter={StaticResource objConverter}, ConverterParameter=false:Visible:Collapsed }">
                                                                 <c:BButton Content="查看" Style="{StaticResource LinkButton}" Width="35"  Height="15" 
-                                                               CommandParameter="{Binding PurchaseSkuId}" 
+                                                               CommandParameter="{Binding CerDTO}" 
                                                                Command="{Binding DataContext. LookCerCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"/>
                                                                 <c:BButton Content="修改" Style="{StaticResource LinkButton}" Width="35"  Height="15" CommandParameter="{Binding }"  
                                                                Command="{Binding DataContext.SetCertificateCommand,RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Window}}}"