Browse Source

修复1688 的skuid 被下架配置任务信息无法显示

updatebug
506583276@qq.com 2 years ago
parent
commit
373ebd58b5
  1. 26
      BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs
  2. 4
      BBWYB.Client/appsettings.json

26
BBWYB.Client/ViewModels/PackPurchaseTask/UpdatePurchaseTaskViewModel.cs

@ -304,7 +304,7 @@ namespace BBWYB.Client.ViewModels
SetCertificateCommand = new RelayCommand<Models.PackPurchaseTask.PurchaseSku>(SetCertificate); SetCertificateCommand = new RelayCommand<Models.PackPurchaseTask.PurchaseSku>(SetCertificate);
LookBarCommand = new RelayCommand(LookBar); LookBarCommand = new RelayCommand(LookBar);
LookCerCommand = new RelayCommand<string>(LookCer); LookCerCommand = new RelayCommand<string>(LookCer);
IncreateList = new ObservableCollection<IncreateModel>(); IncreateList = new ObservableCollection<IncreateModel>();
foreach (var item in increates) foreach (var item in increates)
{ {
@ -501,12 +501,17 @@ namespace BBWYB.Client.ViewModels
var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId); var list = purchaseService.GetPurchaseSkuBasicInfo(item.PurchaseProductId);
if (list == null) continue; if (list == null) continue;
var skuItem = list.Data.ItemList.FirstOrDefault(f => f.PurchaseSkuId == item.PurchaseSkuId); 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(() => App.Current.Dispatcher.Invoke(new Action(() =>
{ {
PurchaseSkuList.Add(new Models.PackPurchaseTask.PurchaseSku PurchaseSkuList.Add(new Models.PackPurchaseTask.PurchaseSku
{ {
Logo = skuItem.Logo, Logo = skuItem?.Logo,
Title = skuItem.Title, Title = skuItem?.Title,
IsNeedCer = item.IsNeedCer, IsNeedCer = item.IsNeedCer,
PurchaseSkuId = item.PurchaseSkuId, PurchaseSkuId = item.PurchaseSkuId,
CerDTO = item.CerDTO, CerDTO = item.CerDTO,
@ -530,13 +535,13 @@ namespace BBWYB.Client.ViewModels
//MarkMessage = config.MarkMessage; //MarkMessage = config.MarkMessage;
CertificatePosition = config.CertificatePosition == null ? CertificatePosition. : (CertificatePosition)config.CertificatePosition.Value; CertificatePosition = config.CertificatePosition == null ? CertificatePosition. : (CertificatePosition)config.CertificatePosition.Value;
// Increment1 = config.Increment1; // Increment1 = config.Increment1;
IsNeedBarCode = config.NeedBar ? Need. : Need.; IsNeedBarCode = config.NeedBar ? Need. : Need.;
IsNeedCertificateModel = config.NeedCer ? Need. : Need.; IsNeedCertificateModel = config.NeedCer ? Need. : Need.;
IsSetBarCode = !config.NeedBar; IsSetBarCode = !config.NeedBar;
IsSetCertificate = !config.NeedCer; IsSetCertificate = !config.NeedCer;
string[] increateDatas = config.Increment1?.Split(','); string[] increateDatas = config.Increment1?.Split(',');
bool isSelected = false; bool isSelected = false;
@ -618,7 +623,7 @@ namespace BBWYB.Client.ViewModels
BasicPack = BasicPack.; BasicPack = BasicPack.;
SkuPurchaseSchemeId = ""; SkuPurchaseSchemeId = "";
SkuTitle = ""; SkuTitle = "";
BarCodeModel= null; BarCodeModel = null;
OriginShopName = ""; OriginShopName = "";
// Availability = (TaskState.)config.Availability; // Availability = (TaskState.)config.Availability;
@ -716,7 +721,14 @@ namespace BBWYB.Client.ViewModels
} }
if (IsNeedCertificateModel == Need.) if (IsNeedCertificateModel == Need.)
{ {
var cerList = purchaseSkuList.Where(p => p.IsNeedCer&&p.CerDTO!=null).Select(p => p.CerDTO).Select(c => c.Id).Where(c => c > 0).ToList();
if (purchaseSkuList.Any(p => p.IsNeedCer && p.CerDTO == null))
{
MessageBox.Show("有未设置的合格证,请设置完所有的合格证再保存");
return;
}
var cerList = purchaseSkuList.Where(p => p.IsNeedCer).Select(p => p.CerDTO).Select(c => c.Id).Where(c => c > 0).ToList();
if (purchaseSkuList.Count() <= 0 || cerList.Count <= 0) if (purchaseSkuList.Count() <= 0 || cerList.Count <= 0)
{ {
MessageBox.Show("请设置合格证模板"); MessageBox.Show("请设置合格证模板");

4
BBWYB.Client/appsettings.json

@ -3,6 +3,6 @@
"BBWYApiHost": "http://bbwyb.qiyue666.com", "BBWYApiHost": "http://bbwyb.qiyue666.com",
"MDSApiHost": "http://mdsapi.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com",
"BBWYCApiHost": "http://bbwytest.qiyue666.com", "BBWYCApiHost": "http://bbwytest.qiyue666.com",
//"QKApiHost": "http://localhost:8080" "QKApiHost": "http://localhost:8080"
"QKApiHost": "http://qiku.qiyue666.com" // "QKApiHost": "http://qiku.qiyue666.com"
} }
Loading…
Cancel
Save