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

@@ -369,10 +369,12 @@ namespace FPJ0000
if (dlg != DialogResult.Yes) return;
var cnt = 0;
var db = new EEEntities();
var db = new dsJobReportTableAdapters.HolidayLIstTableAdapter();// EEEntities();
var taJobReportQuery = new dsJobReportTableAdapters.QueriesTableAdapter();
var taJobReport = new dsPRJTableAdapters.JobReportTableAdapter();
//근무일자 확인
var holilist = db.HolidayLIst.ToList();
var dt = new FPJ0000.dsPRJ.JobReportDataTable();
foreach (dsPRJ.EETGW_JobReport_AutoInputRow dr in this.dsMSSQL.EETGW_JobReport_AutoInput)
{
if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
@@ -380,11 +382,11 @@ namespace FPJ0000
//시작일자부텅 오늘까지 데이터를 확인한다.
var sd = DateTime.Parse(dr.pdate);
while(true)
while (true)
{
if (sd > DateTime.Now) break;
//이날짜가 일반 날짜라면 데이터를 기록한다.
var dayinfo = holilist.Where(t => t.pdate == sd.ToShortDateString()).FirstOrDefault();
var dayinfo = db.GetOne(sd.ToShortDateString()).FirstOrDefault();// holilist.Where(t => t.pdate == sd.ToShortDateString()).FirstOrDefault();
if (dayinfo.free == true)
{
sd = sd.AddDays(1);
@@ -393,14 +395,14 @@ namespace FPJ0000
//그냥 생성된자료가 없어야한다
var vPdate = sd.ToShortDateString();
if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == vPdate && t.uid == dr.uid).Any())
if (taJobReportQuery.ExistUserData(FCOMMON.info.Login.gcode, vPdate, dr.uid) > 0)// db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == vPdate && t.uid == dr.uid).Any())
{
sd = sd.AddDays(1);
continue;
}
//이데이터를 그대로 생성해준다.
var newdr = new JobReport();
var newdr = dt.NewJobReportRow();// new JobReport();
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
@@ -420,22 +422,26 @@ namespace FPJ0000
newdr.status = dr.status;
newdr.tag = dr.tag;
newdr.uid = dr.uid;
db.JobReport.Add(newdr);
cnt += 1;
dt.AddJobReportRow(newdr);// db.JobReport.Add(newdr);
cnt += 1;//
sd = sd.AddDays(1);
}
}
if (cnt > 0)
{
db.SaveChanges();
cnt = taJobReport.Update(dt);
dt.AcceptChanges();
FCOMMON.Util.MsgI($"{cnt} 건의 업무일지가 자동 생성 되었습니다");
}
taJobReport.Dispose();
taJobReportQuery.Dispose();
}
}
}