Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
9be369c114
  1. 7
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs
  2. 2
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/InvoiceSettledDetailDiffDapperRepository.cs

7
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsUnInterface.cs

@ -69,8 +69,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
[UnitOfWork(false)] [UnitOfWork(false)]
public async Task<string> ReportMake(string version) public async Task<string> ReportMake(string version)
{ {
var _ls= _dapper.GetWmsSumExtendList(version);//报表 var _ls= _dapper.GetWmsSumExtendList(version);//报表
var _count= _wmsRepository.Count(p => p.Version == version && p.State>0); var _count= _wmsRepository.Count(p => p.Version == version && p.State>0);
if (_count > 0) if (_count > 0)
{ {
@ -90,10 +89,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
List<WmsDetailReport> _lst = new List<WmsDetailReport>(); List<WmsDetailReport> _lst = new List<WmsDetailReport>();
if (_difflst != null && _difflst.Count() > 0) if (_difflst != null && _difflst.Count() > 0)
{ {
foreach (var itm in _difflst) foreach (var itm in _difflst)
{ {
_lst.Add(new WmsDetailReport(Guid.NewGuid(), _lst.Add(new WmsDetailReport(Guid.NewGuid(),
int.Parse(itm.), int.Parse(itm.),
itm., itm.,
@ -122,8 +119,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
} }
} }
await _wmsRepository.GetDbContext().BulkInsertAsync(_lst); await _wmsRepository.GetDbContext().BulkInsertAsync(_lst);
} }
else else
{ {

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

@ -120,7 +120,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" FROM\n" + " FROM\n" +
" Set_PriceList \n" + " Set_PriceList \n" +
" WHERE\n" + " WHERE\n" +
" version = ( SELECT Max( Version ) FROM Set_PriceList ) TEMP2 ON TEMP1.SapMaterialCode = TEMP2.MaterialCode"; " version = ( SELECT Max( Version ) FROM Set_PriceList ) and type=10 ) TEMP2 ON TEMP1.SapMaterialCode = TEMP2.MaterialCode";
var _sql = string.Format(str, version, condition); var _sql = string.Format(str, version, condition);
var _query = DbConnection.Query<InvoiceSettledDetailDiff>(_sql, null, null, true, 1200, null); var _query = DbConnection.Query<InvoiceSettledDetailDiff>(_sql, null, null, true, 1200, null);

Loading…
Cancel
Save