diff --git a/BBWYB.Client/Models/PackPurchaseTask/PurchaseSku.cs b/BBWYB.Client/Models/PackPurchaseTask/PurchaseSku.cs
index 3895817..493f428 100644
--- a/BBWYB.Client/Models/PackPurchaseTask/PurchaseSku.cs
+++ b/BBWYB.Client/Models/PackPurchaseTask/PurchaseSku.cs
@@ -10,7 +10,7 @@ namespace BBWYB.Client.Models.PackPurchaseTask
///
/// 配件sku
///
- public class PurchaseSku:ObservableObject
+ public class PurchaseSku : ObservableObject
{
///
@@ -32,7 +32,7 @@ namespace BBWYB.Client.Models.PackPurchaseTask
///
/// 配件图
///
- public string Logo { get=>logo; set { SetProperty(ref logo, value); } }
+ public string Logo { get => logo; set { SetProperty(ref logo, value); } }
///
/// 配件商品Id
///
@@ -48,21 +48,16 @@ namespace BBWYB.Client.Models.PackPurchaseTask
///
/// 合格证配置信息
///
- public CertificateModel CerDTO { get ; set ; }
+ public CertificateModel CerDTO { get; set; }
private bool isSetCertificate;
///
/// 设置显示(合格证)
///
- public bool IsSetCertificate
- {
- get => isSetCertificate; set
- {
-
- SetProperty(ref isSetCertificate, value);
- //IsNeedCertificateModel = IsSetCertificate ? Need.不需要 : Need.需要;
- }
- }
+ public bool IsSetCertificate { get => isSetCertificate; set { SetProperty(ref isSetCertificate, value); } }
}
+
+
+
}
diff --git a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
index beed8bb..f10991b 100644
--- a/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
+++ b/BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
@@ -472,17 +472,101 @@ namespace BBWYB.Client.ViewModels
Brand = productApiResponse.Data.Items[0].BrandName;
}
+
+ IsNeedBarCode = Need.需要;
+ IsSetBarCode = true;
+ IsSetCertificate = true;
var productSku = packPurchaseTaskService.GetConfigPack(SkuId, "", OrderId);
- if (productSku == null || !productSku.Success || productSku.Data == null)
+ if (productSku == null)
{
- MessageBox.Show(productSku.Msg);
+ MessageBox.Show("网络异常!");
return false;
}
+ PurchaseSkuList = new ObservableCollection();
+ SkuPurchaseSchemeId = null;
+ if (productSku.Success && productSku.Data != null && !string.IsNullOrEmpty(productSku.Data.SkuPurchaseSchemeId))
+ {
+ SkuPurchaseSchemeId = productSku.Data.SkuPurchaseSchemeId;
+ BarCodeModel = productSku.Data.BarCode;
+
+ foreach (var item in productSku.Data.PurchaseSkus)
+ {
+ var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
+ if (list == null || !list.Success || list.Data == null) continue;
+ var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
+ if (skuItem == null)
+ {
+ MessageBox.Show($"{item.PurchaseProductId}采购商品列表不存在skuid:{item.PurchaseSkuId},sku商品可能被下架了.");
+ //return false;
+ }
+ App.Current.Dispatcher.Invoke(new Action(() =>
+ {
+ PurchaseSkuList.Add(new Models.PackPurchaseTask.PurchaseSku
+ {
+ Logo = skuItem?.Logo,
+ Title = skuItem?.Title,
+ IsNeedCer = item.IsNeedCer,
+ PurchaseSkuId = item.PurchaseSkuId,
+ CerDTO = item.CerDTO,
+ IsSetCertificate = item.CerDTO == null ? true : false,
+ });
+ }));
+ }
+
+
+ if (productSku.Data.PackConfig != null)
+ {
+ var config = productSku.Data.PackConfig;
+ SkuTitle = config.SkuGoodsTitle;
+ BrandName = config.BrandName;
+ 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;
+
+ IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要;
+ IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要;
+
+ IsSetBarCode = !config.NeedBar;
+ IsSetCertificate = !config.NeedCer;
+
+ string[] increateDatas = config.Increment1?.Split(',');
+ bool isSelected = false;
+
+ IncreateList = new ObservableCollection();
+ foreach (var item in increates)
+ {
+ isSelected = false;
+ if (increateDatas != null && increateDatas.Count() > 0 && increateDatas.Contains(item))
+ {
+ isSelected = true;
+ }
+ App.Current.Dispatcher.Invoke(() =>
+ {
+ IncreateList.Add(new IncreateModel
+ {
+ IncreateName = item,
+ IsSelected = isSelected
+ });
+ });
+ }
+
+ }
+ }
+ else
+ {
+ PurchaseSkuList.Add(new Models.PackPurchaseTask.PurchaseSku
+ {
+ CerDTO = new CertificateModel { }
+ });
+ }
+
- SkuPurchaseSchemeId = productSku.Data.SkuPurchaseSchemeId;
- BarCodeModel = productSku.Data.BarCode;
if (BarCodeModel == null)
{
BarCodeModel = new BarCodeModel();
@@ -495,75 +579,7 @@ namespace BBWYB.Client.ViewModels
BarCodeModel.ProductNo = ProductNo;
BarCodeModel.SkuId = SkuId;
BarCodeModel.SkuName = SkuName;
- PurchaseSkuList = new ObservableCollection();
- foreach (var item in productSku.Data.PurchaseSkus)
- {
- var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
- if (list == null) continue;
- var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId);
- if (skuItem == null)
- {
- MessageBox.Show($"{item.PurchaseProductId}采购商品列表不存在skuid:{item.PurchaseSkuId},sku商品可能被下架了.");
- //return false;
- }
- App.Current.Dispatcher.Invoke(new Action(() =>
- {
- PurchaseSkuList.Add(new Models.PackPurchaseTask.PurchaseSku
- {
- Logo = skuItem?.Logo,
- Title = skuItem?.Title,
- IsNeedCer = item.IsNeedCer,
- PurchaseSkuId = item.PurchaseSkuId,
- CerDTO = item.CerDTO,
- IsSetCertificate = item.CerDTO == null ? true : false,
- });
- }));
- }
- IsNeedBarCode = Need.需要;
- IsSetBarCode = true;
- IsSetCertificate = true;
- if (productSku.Data.PackConfig != null)
- {
- var config = productSku.Data.PackConfig;
- SkuTitle = config.SkuGoodsTitle;
- BrandName = config.BrandName;
- 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;
-
- IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要;
- IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要;
-
- IsSetBarCode = !config.NeedBar;
- IsSetCertificate = !config.NeedCer;
-
- string[] increateDatas = config.Increment1?.Split(',');
- bool isSelected = false;
-
- IncreateList = new ObservableCollection();
- foreach (var item in increates)
- {
- isSelected = false;
- if (increateDatas != null && increateDatas.Count() > 0 && increateDatas.Contains(item))
- {
- isSelected = true;
- }
- App.Current.Dispatcher.Invoke(() =>
- {
- IncreateList.Add(new IncreateModel
- {
- IncreateName = item,
- IsSelected = isSelected
- });
- });
- }
-
- }
return true;
diff --git a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml
index 12c5fcc..85f5526 100644
--- a/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml
+++ b/BBWYB.Client/Views/PackPurchaseTask/UpdatePurchaseTaskWindow.xaml
@@ -126,15 +126,16 @@
-
+ Foreground="{StaticResource Text.Color}"
+ Visibility="{Binding SkuPurchaseSchemeId,Converter={StaticResource objConverter},ConverterParameter=#null:Collapsed:Visible}"
+ >
@@ -236,6 +237,104 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+