Browse Source

更新版本

FoShanPG
Administrator 3 years ago
parent
commit
4b2a61bced
  1. 11
      src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs
  2. 5
      src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs

11
src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/KanbanUnSettledDapperRepository.cs

@ -159,11 +159,20 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
" Set_WMSKanBanSettle A \n" + " Set_WMSKanBanSettle A \n" +
" LEFT JOIN ( SELECT * FROM Set_KanBanSettle ) B ON A.Kanban = B.Kanban \n" + " LEFT JOIN ( SELECT * FROM Set_KanBanSettle ) B ON A.Kanban = B.Kanban \n" +
" AND A.MaterialCode = B.MaterialCode\n" + " AND A.MaterialCode = B.MaterialCode\n" +
" LEFT JOIN Set_material AS C ON a.MaterialCode = C.CustomerPartCode \n" + " LEFT JOIN Set_material AS C ON a.MaterialCode = C.CustomerPartCode {0}\n" +
" ) TEMP1\n" + " ) TEMP1\n" +
" LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT MAX( Version ) FROM Set_PriceList ) ) TEMP2 ON TEMP1.SapCode = TEMP2.MaterialCode"; " LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE version = ( SELECT MAX( Version ) FROM Set_PriceList ) ) TEMP2 ON TEMP1.SapCode = TEMP2.MaterialCode";
string str = string.Empty; string str = string.Empty;
str += " where 1=1 "; str += " where 1=1 ";
if (!string.IsNullOrEmpty(begintime))
{
str += string.Format(" and BeginDate >='{0}'", begintime);
}
if (string.IsNullOrEmpty(endtime))
{
str += string.Format(" and BeginDate<='{0}'", endtime);
}
sql = string.Format(sql, str);
var _query = DbConnection.Query<KanbanUnSettled>(sql, null, null, true, 1200, null); var _query = DbConnection.Query<KanbanUnSettled>(sql, null, null, true, 1200, null);
var _list = _query.ToList(); var _list = _query.ToList();
return _list; return _list;

5
src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/KanBanUnSettledExport.cs

@ -75,6 +75,11 @@ namespace SettleAccount.Job.Services.Report
_ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList(); _ls = _ls.Where(p => _groupList.Contains(p.MaterialGroup)).ToList();
} }
} }
//if (!string.IsNullOrEmpty(materialCode)) //if (!string.IsNullOrEmpty(materialCode))
//{ //{
// var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList(); // var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList();

Loading…
Cancel
Save