Browse Source

更新版本

branch_ccpg_220107
Administrator 3 years ago
parent
commit
9ee34bf1bd
  1. 2
      src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/ReportDetailBase.cs
  2. 6
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs
  3. 6
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs
  4. 12
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs

2
src/Modules/SettleAccount/src/SettleAccount.Domain/Reports/ReportDetailBase.cs

@ -41,6 +41,8 @@ namespace Win.Sfs.SettleAccount.Reports
[ExporterHeader(DisplayName = "结算日期")] [ExporterHeader(DisplayName = "结算日期")]
public virtual DateTime CP7Time { set; get; } public virtual DateTime CP7Time { set; get; }
[ExporterHeader(DisplayName = "开票单价")]
public virtual decimal InvoicePrice { set; get; }

6
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/ErpPartDapperRepository.cs

@ -98,12 +98,6 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
Amt = tm1.SapPrice, Amt = tm1.SapPrice,
MaterialGroup = tm2.EstimateTypeDesc, MaterialGroup = tm2.EstimateTypeDesc,
CP7Time=itm1.CP7Time, CP7Time=itm1.CP7Time,
}; };
tmpList = query.ToList(); tmpList = query.ToList();

6
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs

@ -68,7 +68,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
public decimal InvoiceQty { set; get; } public decimal InvoiceQty { set; get; }
//开票单价 //开票单价
[ExporterHeader(DisplayName = "开票单价")] [ExporterHeader(DisplayName = "开票单价")]
public decimal InvoicePrice { set; get; } public override decimal InvoicePrice { set; get; }
//开票金额 //开票金额
[ExporterHeader(DisplayName = "开票金额")] [ExporterHeader(DisplayName = "开票金额")]
public decimal InvocieAmt { set; get; } public decimal InvocieAmt { set; get; }
@ -79,8 +79,8 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
[ExporterHeader(DisplayName = "单价差异")] [ExporterHeader(DisplayName = "单价差异")]
public decimal DiffPrice { set; get; } public decimal DiffPrice { set; get; }
//总金额差异 //总金额差异
[ExporterHeader(DisplayName = "总金额差异")] //[ExporterHeader(DisplayName = "总金额差异")]
public decimal AmtDiffPrice { set; get; } //public decimal AmtDiffPrice { set; get; }

12
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/InvoiceSettledDetailDiffExportService.cs

@ -77,18 +77,20 @@ namespace SettleAccount.Job.Services
}); });
foreach (var itm in diffList)
foreach (var itm in diffList)
{ {
var _first= _ls.FirstOrDefault(p => p.MaterialCode == itm.MaterialCode); var _first= _ls.FirstOrDefault(p => p.MaterialCode == itm.MaterialCode);
_first.InvoiceQty= _first.SettledQty + itm.DiffQty; _first.InvoiceQty= _first.SettledQty + itm.DiffQty;
_first.DiffSettleInvQty = itm.DiffQty; _first.DiffSettleInvQty = itm.DiffQty;
} }
foreach (var itm in _ls)
{
itm.InvocieAmt = itm.InvoiceQty * itm.InvoicePrice;
}
_ls.AddRange(rangeList); _ls.AddRange(rangeList);
_ls=_ls.OrderBy(p => p.ChassisNumber).ThenBy(p=>p.KENNCode).ThenBy(p=>p.SapMaterialCode).ToList(); _ls=_ls.OrderBy(p => p.ChassisNumber).ThenBy(p=>p.KENNCode).ThenBy(p=>p.SapMaterialCode).ToList();

Loading…
Cancel
Save