migratino complete

This commit is contained in:
chi
2025-04-07 00:54:29 +09:00
parent 2b22ca9c51
commit 8ac3600ec1
158 changed files with 39098 additions and 21257 deletions

View File

@@ -51,7 +51,7 @@ namespace FPJ0000.JobReport_
//자료를 불러온다
var sd = DateTime.Parse(dtSD.Text).ToShortDateString();
var ed = DateTime.Parse(dtED.Text).ToShortDateString();
var db = new EEEntities();
var db = new dsReportTableAdapters.vJobReportForUserTableAdapter();// EEEntities();
var gcode = "EET1P";
if (String.IsNullOrEmpty(FCOMMON.info.Login.gcode) == false)
@@ -59,9 +59,9 @@ namespace FPJ0000.JobReport_
//var ta = new dsReportTableAdapters.vJobReportForUserTableAdapter();
//var rawdata0 = ta.GetData(FCOMMON.info.Login.gcode, sd, ed);
var rawdata = db.vJobReportForUser.AsNoTracking()
.Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 0)
.OrderBy(t => t.pdate).GroupBy(t => t.pdate);
var rawdata = db.GetByDate(FCOMMON.info.Login.gcode, sd, ed).GroupBy(t => t.pdate);//.vJobReportForUser.AsNoTracking()
//.Where(t => t.gcode == gcode && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 0)
//.OrderBy(t => t.pdate).GroupBy(t => t.pdate);
//ta.Fill(this.dsReport.vJobReportForUser, FCOMMON.info.Login.gcode, sd.ToShortDateString(), ed.ToShortTimeString());
// var rawdata = rawdata0.GroupBy(t => t.pdate);