This commit is contained in:
chi
2024-02-06 09:16:54 +09:00
parent fd5b64ca32
commit 16793303e9
9 changed files with 507 additions and 171 deletions

View File

@@ -49,7 +49,7 @@ namespace FPJ0000
if (String.IsNullOrEmpty(dr.outdate) == false)
{
var odt = DateTime.Parse(dr.outdate);
if(odt <= DateTime.Now) continue; //퇴사자제외 211221
if (odt <= DateTime.Now) continue; //퇴사자제외 211221
}
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
this.cmbUser.Items.Add(cmbdata);
@@ -546,7 +546,7 @@ namespace FPJ0000
| FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered
| FarPoint.Excel.ExcelSaveFlags.NoFormulas
| FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders);
var dlg =FCOMMON.Util.MsgQ("다음 파일이 생성 되었습니다.\n\n" + sd.FileName + "\n파일을 확인 할까요?");
var dlg = FCOMMON.Util.MsgQ("다음 파일이 생성 되었습니다.\n\n" + sd.FileName + "\n파일을 확인 할까요?");
if (dlg == DialogResult.Yes)
util.RunExplorer(sd.FileName);
}
@@ -573,7 +573,7 @@ namespace FPJ0000
newdr.idx = -1;
newdr.hrs = 8.0;
newdr.ot = 0.0;
newdr.Setot2Null();
newdr.SetotwuidNull();
newdr.SetotReasonNull();
@@ -585,7 +585,7 @@ namespace FPJ0000
newdr.EndEdit();
//var newdr = this.dsMSSQL.JobReport.NewJobReportRow();
JobReport_.fJobReport_Add f = new JobReport_.fJobReport_Add(newdr,true);
JobReport_.fJobReport_Add f = new JobReport_.fJobReport_Add(newdr, true);
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.JobReport.AddJobReportRow(newdr);
@@ -620,7 +620,7 @@ namespace FPJ0000
}
if (ta.CheckOt2Input(dr.gcode, dr.idx) > 0 && FCOMMON.info.Login.level < 5)
if (ta.CheckOt2Input(dr.gcode, dr.idx) > 0 && FCOMMON.info.Login.level < 5)
{
FCOMMON.Util.MsgE("연장/휴일 근무 시간이 승인된 자료이므로 삭제할 수 없습니다");
return;
@@ -653,7 +653,7 @@ namespace FPJ0000
private void btReport_Click(object sender, EventArgs e)
{
}
private void cmbUser_Click(object sender, EventArgs e)
@@ -683,12 +683,12 @@ namespace FPJ0000
private void btReportDay_Click(object sender, EventArgs e)
{
}
private void toolStripButton1_Click(object sender, EventArgs e)
{
}
private void toolStripButton2_Click(object sender, EventArgs e)
@@ -698,7 +698,7 @@ namespace FPJ0000
private void toolStripButton3_Click(object sender, EventArgs e)
{
}
private void btSearch_ButtonClick(object sender, EventArgs e)
@@ -752,7 +752,7 @@ namespace FPJ0000
private void toolStripButton5_Click(object sender, EventArgs e)
{
}
private void btOpenFolder_Click(object sender, EventArgs e)
@@ -780,7 +780,7 @@ namespace FPJ0000
var ed = sd.AddMonths(1).AddDays(-1);
dtSD.Text = sd.ToShortDateString();
dtED.Text = ed.ToShortDateString();
}
private void toolStripButton7_Click(object sender, EventArgs e)
@@ -792,20 +792,20 @@ namespace FPJ0000
dtED.Text = ed.ToShortDateString();
}
private void toolStripButton10_Click(object sender, EventArgs e)
{
private void toolStripButton10_Click(object sender, EventArgs e)
{
var f = new JobReport_.rK5Dailyform();
f.Show();
}
private void toolStripButton11_Click(object sender, EventArgs e)
{
private void toolStripButton11_Click(object sender, EventArgs e)
{
var f = new JobReport_.rJobReportUser();
f.Show();
}
private void toolStripButton12_Click(object sender, EventArgs e)
{
private void toolStripButton12_Click(object sender, EventArgs e)
{
//string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1);
//request = request.Substring(0, request.Length - 1);
//string name = cmbUser.Text.Substring(0, cmbUser.Text.IndexOf('('));
@@ -813,29 +813,29 @@ namespace FPJ0000
f.ShowDialog();
}
private void toolStripButton13_Click(object sender, EventArgs e)
{
private void toolStripButton13_Click(object sender, EventArgs e)
{
var f = new JobReport_.rJobReportDay(dtSD.Text);
f.Show();
}
private void toolStripButton14_Click(object sender, EventArgs e)
{
private void toolStripButton14_Click(object sender, EventArgs e)
{
var f = new JobReport_.rJobReport();
f.Show();
}
private void toolStripButton1_Click_1(object sender, EventArgs e)
{
private void toolStripButton1_Click_1(object sender, EventArgs e)
{
var f = new JobReport_.rJobReportPrj(dtSD.Text);
f.Show();
}
private void toolStripButton3_Click_1(object sender, EventArgs e)
{
var f = new JobReport_.fProjectConnect(dtSD.Text,dtED.Text);
private void toolStripButton3_Click_1(object sender, EventArgs e)
{
var f = new JobReport_.fProjectConnect(dtSD.Text, dtED.Text);
f.ShowDialog();
}
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -848,5 +848,61 @@ namespace FPJ0000
var f = new JobReport_.rJobReportType();
f.Show();
}
private void qlToolStripMenuItem_Click(object sender, EventArgs e)
{
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
var dr = drv.Row as dsPRJ.JobReportRow;
var f = new FCOMMON.fSelectDays(DateTime.Now, DateTime.Now);
if (f.ShowDialog() != DialogResult.OK) return;
var sd = f.dts.SelectionStart;
var ed = f.dte.SelectionEnd;
DateTime d = sd;
var ucnt = 0;
while (true)
{
//종료일보다 작으면 넘어간다
if (d > ed) break;
if (d.DayOfWeek == DayOfWeek.Sunday || d.DayOfWeek == DayOfWeek.Saturday)
{
d = d.AddDays(1);
continue;
}
//현재 데이터를 입력하여 신규 추가를 한다.
var newdr = this.dsMSSQL.JobReport.NewJobReportRow();
FCOMMON.Util.CopyData((System.Data.DataRow)dr, (System.Data.DataRow)newdr);
newdr.wdate = DateTime.Now;
newdr.wuid = FCOMMON.info.Login.no;
newdr.uid = FCOMMON.info.Login.no;
newdr.pdate = d.ToShortDateString(); //190509
newdr.idx = -1;
newdr.hrs = 8.0;
newdr.ot = 0.0;
newdr.Setot2Null();
newdr.SetotwuidNull();
newdr.SetotReasonNull();
newdr.SetottimeNull();
newdr.SetotEndNull();
newdr.SetotStartNull();
newdr.EndEdit();
this.dsMSSQL.JobReport.AddJobReportRow(newdr);
ucnt += ta.Update(dsMSSQL.JobReport);
d = d.AddDays(1);
}
util.MsgI($"토/일은 제외되었습니다. 기타 휴일은 적용되지 않았으니 데이터를 확인하세요\nupdate count : {ucnt}");
}
}
}