|
|
|
@ -449,7 +449,7 @@ namespace DS.WMS.Core.Settlement.Method
|
|
|
|
|
|
|
|
|
|
protected override async Task<DataResult> PreSaveAsync(ApplicationSettlement settlement)
|
|
|
|
|
{
|
|
|
|
|
var appIds = settlement.Details.Select(x => x.ApplicationId).Distinct();
|
|
|
|
|
var appIds = settlement.Details.Select(x => x.RefId).Distinct();
|
|
|
|
|
var appList = await TenantDb.Queryable<PaymentApplication>().Where(x => appIds.Contains(x.Id))
|
|
|
|
|
.Select(x => new
|
|
|
|
|
{
|
|
|
|
@ -500,7 +500,7 @@ namespace DS.WMS.Core.Settlement.Method
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
detail.Category = DetailCategory.PaidFreeSettlement;
|
|
|
|
|
detail.Category = settlement.BillType == SettlementBillType.Payment ? DetailCategory.PaidApplicationSettlement : DetailCategory.ChargeApplicationSettlement;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return sb.Length > 0 ? DataResult.Failed(sb.ToString()) : DataResult.Success;
|
|
|
|
|