1

BBWY.Client/Models/BatchPurchase/BatchPublishTask.cs

@@ -50,6 +50,11 @@ namespace BBWY.Client.Models
         "需要", "不需要" };
         public ObservableCollection<string> IsNeedBarCodeList { get => isNeedBarCodeList; set { Set(ref isNeedBarCodeList, value); } }
 
+        private ObservableCollection<string> isNeedCertificateList = new ObservableCollection<string> {
+        "需要", "不需要" };
+        public ObservableCollection<string> IsNeedCertificateList { get => isNeedCertificateList; set { Set(ref isNeedCertificateList, value); } }
+
+
         private ObservableCollection<string> certificatePositionList = new ObservableCollection<string> {
                  "无","外部包装","产品包装"
              };
@@ -177,7 +182,7 @@ namespace BBWY.Client.Models
             {
 
                 Set(ref isSetBarCode, value);
-                IsNeedBarCode = IsSetBarCode ? Need.不需要 : Need.需要;
+                //IsNeedBarCode = IsSetBarCode ? Need.不需要 : Need.需要;
             }
         }
 
@@ -191,7 +196,7 @@ namespace BBWY.Client.Models
             {
 
                 Set(ref isSetCertificate, value);
-                IsNeedCertificateModel = IsSetCertificate ? Need.不需要 : Need.需要;
+               // IsNeedCertificateModel = IsSetCertificate ? Need.不需要 : Need.需要;
             }
         }
         private string setSpuCerStatus;
@@ -420,43 +425,7 @@ namespace BBWY.Client.Models
 
                     return;
                 }
-
-                if (productSku.Data.PackConfig != null)
-                {
-                    var config = productSku.Data.PackConfig;
-                    SkuTitle = config.SkuGoodsTitle;
-                    GoodsNumber = config.GoodsNumber;
-                    PackType = (PackType)config.PackType;
-                    BasicPack = (BasicPack)config.BasicPack;
-                    Availability = (TaskState)config.Availability;
-                    MarkMessage = config.MarkMessage;
-                    CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无 : (CertificatePosition)config.CertificatePosition.Value;
-                    // Increment1 = config.Increment1;
-                    string[] increateDatas = config.Increment1.Split(',');
-
-                    bool isSelected = false;
-                    foreach (var item in increates)
-                    {
-                        isSelected = false;
-                        if (increateDatas.Contains(item))
-                        {
-                            isSelected = true;
-                        }
-                        App.Current.Dispatcher.Invoke(() =>
-                        {
-                            IncreateList.Add(new IncreateModel
-                            {
-                                IncreateName = item,
-                                IsSelected = isSelected
-                            });
-                        });
-                    }
-
-                }
-
                 BrandName = productSku.Data.BrandName;
-
-
                 CertificateModel = productSku.Data.Cers;
                 IsSetCertificate = false;
                 if (CertificateModel == null)
@@ -489,6 +458,49 @@ namespace BBWY.Client.Models
                 BarCodeModel.ProductNo = ProductNo;
                 BarCodeModel.SkuId = skuid;
                 BarCodeModel.SkuName = SkuName;
+
+
+                IsNeedBarCode = Need.需要;
+                IsSetBarCode = true;
+                IsSetCertificate = true;
+                if (productSku.Data.PackConfig != null)
+                {
+                    var config = productSku.Data.PackConfig;
+                    SkuTitle = config.SkuGoodsTitle;
+                    GoodsNumber = config.GoodsNumber;
+                    PackType = (PackType)config.PackType;
+                    BasicPack = (BasicPack)config.BasicPack;
+                    Availability = (TaskState)config.Availability;
+                    MarkMessage = config.MarkMessage;
+                    CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无 : (CertificatePosition)config.CertificatePosition.Value;
+                    // Increment1 = config.Increment1;
+                    string[] increateDatas = config.Increment1.Split(',');
+
+                    IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要;
+                    IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要;
+
+
+                    IsSetBarCode = !config.NeedBar;
+                    IsSetCertificate = !config.NeedCer;
+                    bool isSelected = false;
+                    foreach (var item in increates)
+                    {
+                        isSelected = false;
+                        if (increateDatas.Contains(item))
+                        {
+                            isSelected = true;
+                        }
+                        App.Current.Dispatcher.Invoke(() =>
+                        {
+                            IncreateList.Add(new IncreateModel
+                            {
+                                IncreateName = item,
+                                IsSelected = isSelected
+                            });
+                        });
+                    }
+
+                }
             }
             else
             {

BBWY.Client/ViewModels/BatchPurchase/BatchPublishTaskViewModel.cs

@@ -99,7 +99,9 @@ namespace BBWY.Client.ViewModels
                     ShopId = PurchaserId,
                     //IsWorry = task.IsWorry,
                     OrderId = orderId,
-                    Platform =platform
+                    Platform =platform,
+                    NeedBar = task.IsNeedBarCode == Need.需要,
+                    NeedCer = task.IsNeedCertificateModel == Need.需要
                 };
                 if (task.IsNeedBarCode == Need.需要)
                 {

BBWY.Client/Views/BatchPurchase/BatchPublishTaskWindow.xaml

@@ -244,7 +244,7 @@
                                         </ComboBox>
                                     </Grid>
                                     <Grid Grid.Row="1" Grid.Column="6" >
-                                        <ComboBox VerticalContentAlignment="Center" Margin="1" BorderThickness="0" ItemsSource="{Binding IsNeedBarCodeList}"   Text="{Binding IsNeedCertificateModel,Mode=TwoWay}">
+                                        <ComboBox VerticalContentAlignment="Center" Margin="1" BorderThickness="0" ItemsSource="{Binding IsNeedCertificateList}"   Text="{Binding IsNeedCertificateModel,Mode=TwoWay}">
 
                                         </ComboBox>
                                     </Grid>