移除质检是否合格证条件判断

BBWY.Client/GlobalContext.cs

@@ -9,7 +9,7 @@ namespace BBWY.Client
         {
             ShopServiceGroupList = new List<string>();
             ShopServiceGroupLowerList = new List<string>();
-            ClientVersion = "10124";
+            ClientVersion = "10125";
         }
 
         private User user;

BBWY.Client/ViewModels/QualityTask/QualityViewModel.cs

@@ -453,13 +453,13 @@ namespace BBWY.Client.ViewModels
                 }
                 request.BarcodeId = BarCodeModel.Id;
             }
-            if (IsNeedCertificateModel == Need.需要)
+            if(PurchaseSkuList != null && PurchaseSkuList.Count > 0&&purchaseSkuList.Any(p=> p.IsNeedCer)) //(IsNeedCertificateModel == Need.需要)
             {
-                if (PurchaseSkuList == null && PurchaseSkuList.Count <= 0)
+                //if ()
-                {
+                //{
-                    MessageBox.Show("无可用的合格证打印！");
+                //    MessageBox.Show("无可用的合格证打印！");
-                    return;
+                //    return;
-                }
+                //}
                 if (PurchaseSkuList.Where(p => p.IsSetCertificate).Count() > 0)
                 {
                     MessageBox.Show("存在未确认的合格证,请先完成确认！");
@@ -575,7 +575,8 @@ namespace BBWY.Client.ViewModels
 
                 if (ReflashWindow != null) ReflashWindow();
                 var window = obj as BWindow;
-                    App.Current.Dispatcher.Invoke(new Action(() => {
+                App.Current.Dispatcher.Invoke(new Action(() =>
+                {
 
                     window.Close();
                 }));
@@ -717,6 +718,7 @@ namespace BBWY.Client.ViewModels
             BasicPack = model.BasicPack;
             CertificatePosition = model.CertificatePosition;
 
+
             ArrivalQuantity = 0;
             GoodProductQuantity = 0;
 
@@ -744,7 +746,20 @@ namespace BBWY.Client.ViewModels
 
             var packTaskRes = packPurchaseTaskService.GetQualityTask(model.TaskId);
 
+            if (packTaskRes==null)
+            {
+                MessageBox.Show("网络异常!");
+                return;
+            }
+            if (!packTaskRes.Success || packTaskRes.Data==null)
+            {
+                MessageBox.Show(packTaskRes.Msg);
+                return;
+            }
+
+
 
+            SkuPurchaseSchemeId = packTaskRes.Data.SkuPurchaseSchemeId;
             saveType = packTaskRes.Data.SaveType;
             if (saveType == null)
             {

BBWY.Client/Views/PackTask/LookCerWindow.xaml.cs

@@ -32,6 +32,10 @@ namespace BBWY.Client.Views.PackTask
             int goodsNumberIndex = 0;
             foreach (CertificateModel certificateModel in certificate)
             {
+                if (certificateModel==null)
+                {
+                    continue;
+                }
                 goodsNumberIndex++;
                 certificateModel.GoodsNumberIndex = goodsNumberIndex;
                 GoodsNumberCerList.Add(new GoodsNumberCer

BBWY.Client/Views/QualityTask/QualityWindow.xaml

@@ -395,7 +395,7 @@
                             <ColumnDefinition Width="90"/>
                             <ColumnDefinition Width="140"/>
                             <ColumnDefinition Width="86"/>
-                            <ColumnDefinition Width="86"/>
+                            <ColumnDefinition Width="0" />
                             <ColumnDefinition Width="100"/>
                         </Grid.ColumnDefinitions>
                         <Grid.RowDefinitions>