Browse Source

更新版本

FoShanPG
Administrator 2 years ago
parent
commit
b59bbd5465
  1. 13
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs

13
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/UnSettledDetailDapperRepository.cs

@ -48,6 +48,13 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
{ {
str += string.Format(" and beginTime<='{0}' ", end); str += string.Format(" and beginTime<='{0}' ", end);
} }
else
{
var datestr = version.Substring(0, 4) + "-" + version.Substring(4, 2) + "-01";
var date = DateTime.Parse(datestr).AddMonths(1).AddDays(-1);
var datetime = date.ToShortDateString() + " 23:59:59 ";
str += string.Format(" and beginTime<='{0}' ", datetime);
}
var sqlString = var sqlString =
" SELECT\n" + " SELECT\n" +
@ -358,7 +365,11 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
//"temp1.SapMaterialCode = temp2.MaterialCode\n"; //"temp1.SapMaterialCode = temp2.MaterialCode\n";
string _sql= string.Format("exec [dbo].[p_SystemR3Diff] '{0}','{1}'",string.IsNullOrEmpty(end)?DateTime.Now.ToShortDateString():end var datestr = version.Substring(0, 4) + "-" + version.Substring(4, 2) + "-01";
var date = DateTime.Parse(datestr).AddMonths(1).AddDays(-1);
var datetime = date.ToShortDateString() + " 23:59:59 ";
string _sql= string.Format("exec [dbo].[p_SystemR3Diff] '{0}','{1}'",string.IsNullOrEmpty(end)? datetime : end
, version); , version);
var _query = DbConnection.Query<UnSettleDetailReport1>(_sql, null, null, true, 1200,System.Data.CommandType.Text); var _query = DbConnection.Query<UnSettleDetailReport1>(_sql, null, null, true, 1200,System.Data.CommandType.Text);
var _list = _query.ToList(); var _list = _query.ToList();

Loading…
Cancel
Save