Browse Source

1

AddValidOverTime
506583276@qq.com 2 years ago
parent
commit
f5631af506
  1. 4
      BBWY.Client/BBWYAppSettings.json
  2. 24
      BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs

4
BBWY.Client/BBWYAppSettings.json

@ -4,6 +4,6 @@
"MDSApiHost": "http://mdsapi.qiyue666.com", "MDSApiHost": "http://mdsapi.qiyue666.com",
"JOSApiHost": "", "JOSApiHost": "",
"1688ApiHost": "", "1688ApiHost": "",
"QKApiHost": "http://localhost:8080" // "QKApiHost": "http://localhost:8080"
// "QKApiHost": "http://qiku.qiyue666.com" "QKApiHost": "http://qiku.qiyue666.com"
} }

24
BBWY.Client/ViewModels/PackTask/PackDetailViewModel.cs

@ -116,10 +116,10 @@ namespace BBWY.Client.ViewModels.PackTask
get => processTaskCount; set get => processTaskCount; set
{ {
Set(ref processTaskCount, value); Set(ref processTaskCount, value);
if (PackProcessType == PackProcessType.&& SelectProcessComboIdV2>0&& ProcessTaskCount>0) if (PackProcessType == PackProcessType. && SelectProcessComboIdV2 > 0 && ProcessTaskCount > 0)
TotalPackFeesDetail(null, ProcessTaskCount, SelectProcessComboIdV2); TotalPackFeesDetail(null, ProcessTaskCount, SelectProcessComboIdV2);
if (PackProcessType == PackProcessType.&& !SelectProcessType.IsNullOrEmpty()&& ProcessTaskCount>0) if (PackProcessType == PackProcessType. && !SelectProcessType.IsNullOrEmpty() && ProcessTaskCount > 0)
TotalPackFeesDetail(SelectProcessType, ProcessTaskCount, null); TotalPackFeesDetail(SelectProcessType, ProcessTaskCount, null);
} }
} }
@ -317,7 +317,7 @@ namespace BBWY.Client.ViewModels.PackTask
} }
private void TotalPackFeesDetail(string processType, int taskCount, long? processComboId) private void TotalPackFeesDetail(string processType, int taskCount, long? processComboId)
{ {
var discountRes = processService.GetDiscountFactory(processType, taskCount, processComboId); var discountRes = processService.GetDiscountFactory(processType, taskCount, processComboId);
if (!discountRes.Success) if (!discountRes.Success)
@ -346,7 +346,7 @@ namespace BBWY.Client.ViewModels.PackTask
} }
//统计打包费用 //统计打包费用
} }
@ -788,13 +788,15 @@ namespace BBWY.Client.ViewModels.PackTask
foreach (var con in resData.ConsumableList) foreach (var con in resData.ConsumableList)
{ {
var condate = ConsumableServiceList.FirstOrDefault(c => c.ConsumableItem.IsNullOrEmpty() && c.ConsumableType == con.ConsumableTypeName); var condate = ConsumableServiceList.FirstOrDefault(c => c.ConsumableItem.IsNullOrEmpty() && c.ConsumableType == con.ConsumableTypeName);
App.Current.Dispatcher.Invoke(() => if (condate != null)
{
condate.ConsumablePrice = con.ConsumablePrice;
condate.SelectId = con.ConsumableId;
condate.TaskCount = con.TaskCount;
}); App.Current.Dispatcher.Invoke(() =>
{
condate.ConsumablePrice = con.ConsumablePrice;
condate.SelectId = con.ConsumableId;
condate.TaskCount = con.TaskCount;
});
} }
} }

Loading…
Cancel
Save