diff --git a/JobReportMailService/fJobReportDay.Designer.cs b/JobReportMailService/fJobReportDay.Designer.cs index 2c4fb36..66d9b87 100644 --- a/JobReportMailService/fJobReportDay.Designer.cs +++ b/JobReportMailService/fJobReportDay.Designer.cs @@ -32,6 +32,7 @@ namespace JobReportMailService System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReportDay)); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.btRun = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.toolStrip1.SuspendLayout(); this.SuspendLayout(); // @@ -42,7 +43,8 @@ namespace JobReportMailService // toolStrip1 // this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.btRun}); + this.btRun, + this.toolStripButton1}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; this.toolStrip1.Size = new System.Drawing.Size(473, 25); @@ -58,6 +60,15 @@ namespace JobReportMailService this.btRun.Text = "Run"; this.btRun.Click += new System.EventHandler(this.toolStripButton1_Click); // + // toolStripButton1 + // + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(67, 22); + this.toolStripButton1.Text = "manual"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1); + // // fJobReportDay // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -79,5 +90,6 @@ namespace JobReportMailService private System.Windows.Forms.ToolStrip toolStrip1; private System.Windows.Forms.ToolStripButton btRun; + private System.Windows.Forms.ToolStripButton toolStripButton1; } } \ No newline at end of file diff --git a/JobReportMailService/fJobReportDay.cs b/JobReportMailService/fJobReportDay.cs index 3e30863..2bbf33d 100644 --- a/JobReportMailService/fJobReportDay.cs +++ b/JobReportMailService/fJobReportDay.cs @@ -102,6 +102,8 @@ namespace JobReportMailService var vGcode = gcodedata.Key; if (string.IsNullOrEmpty(vGcode)) continue; + //if (vGcode.Contains("K5") == false) continue; + var MailJD = db.MailForm.Where(t => t.gcode == vGcode & t.cate == "JD").FirstOrDefault(); if (MailJD == null) { @@ -314,5 +316,10 @@ namespace JobReportMailService } } + + private void toolStripButton1_Click_1(object sender, EventArgs e) + { + RunData(); + } } } diff --git a/JobReportMailService/fJobReportDay.resx b/JobReportMailService/fJobReportDay.resx index df60ad6..0f604e2 100644 --- a/JobReportMailService/fJobReportDay.resx +++ b/JobReportMailService/fJobReportDay.resx @@ -137,6 +137,21 @@ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== \ No newline at end of file diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index d9b786f..b80e5d6 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("22.02.08.1130")] -[assembly: AssemblyFileVersion("22.02.08.1130")] +[assembly: AssemblyVersion("22.02.09.0950")] +[assembly: AssemblyFileVersion("22.02.09.0950")] diff --git a/SubProject/FBS0000/FBS0000.csproj b/SubProject/FBS0000/FBS0000.csproj index 5faa26f..11c0864 100644 --- a/SubProject/FBS0000/FBS0000.csproj +++ b/SubProject/FBS0000/FBS0000.csproj @@ -126,6 +126,9 @@ True dsMSSQL.xsd + + dsReport.xsd + dsReport.xsd True diff --git a/SubProject/FBS0000/Holiday/fHolyDayData.cs b/SubProject/FBS0000/Holiday/fHolyDayData.cs index 4e66c4a..8c93d2d 100644 --- a/SubProject/FBS0000/Holiday/fHolyDayData.cs +++ b/SubProject/FBS0000/Holiday/fHolyDayData.cs @@ -62,12 +62,12 @@ namespace FBS0000 var uid = GetUIDValue(); if (cmbType.SelectedIndex == 0) { - taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortTimeString()); + taDay.Fill(this.dsReport.Holydata_Day, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString()); //this.reportViewer1.LocalReport.DataSources.Add(new Microsoft.Reporting.WinForms.ReportDataSource("DataSet1", bsDay)); } else { - taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortTimeString()); + taTime.Fill(this.dsReport.Holydata_Time, FCOMMON.info.Login.gcode, uid, sd.ToShortDateString(), ed.ToShortDateString()); dsReport.Holydata_Day.Clear(); dsReport.Holydata_Day.Merge(dsReport.Holydata_Time); dsReport.Holydata_Day.AcceptChanges(); diff --git a/SubProject/FBS0000/dsReport.cs b/SubProject/FBS0000/dsReport.cs new file mode 100644 index 0000000..d547a88 --- /dev/null +++ b/SubProject/FBS0000/dsReport.cs @@ -0,0 +1,15 @@ +namespace FBS0000 +{ + + + partial class dsReport + { + } +} + +namespace FBS0000.dsReportTableAdapters { + + + public partial class holydataTableAdapter { + } +} diff --git a/SubProject/FPJ0000/Auth.cs b/SubProject/FPJ0000/Auth.cs index 7694bfc..74ff9cd 100644 --- a/SubProject/FPJ0000/Auth.cs +++ b/SubProject/FPJ0000/Auth.cs @@ -25,5 +25,9 @@ namespace FPJ0000 public Nullable scheapp { get; set; } public Nullable equipment { get; set; } public Nullable kusul { get; set; } + public Nullable otconfirm { get; set; } + public Nullable kuntae { get; set; } + public Nullable holyreq { get; set; } + public Nullable account { get; set; } } } diff --git a/SubProject/FPJ0000/EETGW_HolydayRequest.cs b/SubProject/FPJ0000/EETGW_HolydayRequest.cs new file mode 100644 index 0000000..f34bee8 --- /dev/null +++ b/SubProject/FPJ0000/EETGW_HolydayRequest.cs @@ -0,0 +1,35 @@ +//------------------------------------------------------------------------------ +// +// 이 코드는 템플릿에서 생성되었습니다. +// +// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다. +// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다. +// +//------------------------------------------------------------------------------ + +namespace FPJ0000 +{ + using System; + using System.Collections.Generic; + + public partial class EETGW_HolydayRequest + { + public int idx { get; set; } + public string gcode { get; set; } + public string uid { get; set; } + public string cate { get; set; } + public string sdate { get; set; } + public string edate { get; set; } + public Nullable conf { get; set; } + public string Remark { get; set; } + public string Response { get; set; } + public string HolyReason { get; set; } + public string HolyBackup { get; set; } + public string HolyLocation { get; set; } + public Nullable HolyDays { get; set; } + public Nullable HolyTimes { get; set; } + public Nullable sendmail { get; set; } + public string wuid { get; set; } + public System.DateTime wdate { get; set; } + } +} diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 4b82cd9..74202e1 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -181,6 +181,9 @@ Model1.tt + + Model1.tt + Model1.tt diff --git a/SubProject/FPJ0000/JobReport.cs b/SubProject/FPJ0000/JobReport.cs index f3d6eda..a218398 100644 --- a/SubProject/FPJ0000/JobReport.cs +++ b/SubProject/FPJ0000/JobReport.cs @@ -40,5 +40,7 @@ namespace FPJ0000 public string kisullv { get; set; } public string kisuldiv { get; set; } public Nullable kisulamt { get; set; } + public Nullable ot2 { get; set; } + public string otReason { get; set; } } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs index d488bf8..dd879fd 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs @@ -569,7 +569,7 @@ namespace FPJ0000 newdr.EndEdit(); //var newdr = this.dsMSSQL.JobReport.NewJobReportRow(); - JobReport_.fJobReport_Add f = new JobReport_.fJobReport_Add(newdr); + JobReport_.fJobReport_Add f = new JobReport_.fJobReport_Add(newdr,true); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { this.dsMSSQL.JobReport.AddJobReportRow(newdr); diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index 80aa4aa..a7a8715 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -267,7 +267,7 @@ namespace FPJ0000.JobReport_ } //신규데이터라면 양식을 처리한다. - if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) + if (copyMOde==false && dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) { //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다. var db = new EEEntities(); diff --git a/SubProject/FPJ0000/Model1.Context.cs b/SubProject/FPJ0000/Model1.Context.cs index 88e0aab..976c53c 100644 --- a/SubProject/FPJ0000/Model1.Context.cs +++ b/SubProject/FPJ0000/Model1.Context.cs @@ -46,5 +46,6 @@ namespace FPJ0000 public virtual DbSet EETGW_Project_Layout { get; set; } public virtual DbSet EETGW_DocuForm { get; set; } public virtual DbSet EETGW_ProjectsSchedule { get; set; } + public virtual DbSet EETGW_HolydayRequest { get; set; } } } diff --git a/SubProject/FPJ0000/Model1.edmx b/SubProject/FPJ0000/Model1.edmx index 506bf9b..99017ac 100644 --- a/SubProject/FPJ0000/Model1.edmx +++ b/SubProject/FPJ0000/Model1.edmx @@ -20,6 +20,10 @@ + + + + @@ -48,6 +52,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -222,6 +248,8 @@ + + @@ -311,6 +339,7 @@ + @@ -427,6 +456,7 @@ + @@ -444,7 +474,7 @@ - + @@ -476,19 +506,22 @@ + + + - + - - + + @@ -496,6 +529,11 @@ + + + + + @@ -512,11 +550,14 @@ + + + @@ -603,7 +644,12 @@ [vJobReportForUser].[description] AS [description], [vJobReportForUser].[ww] AS [ww], [vJobReportForUser].[otStart] AS [otStart], - [vJobReportForUser].[otEnd] AS [otEnd] + [vJobReportForUser].[otEnd] AS [otEnd], + [vJobReportForUser].[ot2] AS [ot2], + [vJobReportForUser].[otReason] AS [otReason], + [vJobReportForUser].[grade] AS [grade], + [vJobReportForUser].[indate] AS [indate], + [vJobReportForUser].[outdate] AS [outdate] FROM [dbo].[vJobReportForUser] AS [vJobReportForUser] @@ -616,7 +662,9 @@ [vUserWorkTimeList].[hrs] AS [hrs], [vUserWorkTimeList].[ot] AS [ot], [vUserWorkTimeList].[UserProcess] AS [UserProcess], - [vUserWorkTimeList].[holyot] AS [holyot] + [vUserWorkTimeList].[holyot] AS [holyot], + [vUserWorkTimeList].[ot2] AS [ot2], + [vUserWorkTimeList].[holyot2] AS [holyot2] FROM [dbo].[vUserWorkTimeList] AS [vUserWorkTimeList] @@ -707,6 +755,8 @@ + + @@ -730,6 +780,7 @@ + @@ -950,6 +1001,8 @@ + + @@ -971,7 +1024,7 @@ - + @@ -987,13 +1040,13 @@ - + - - + + @@ -1001,6 +1054,11 @@ + + + + + @@ -1017,6 +1075,10 @@ + + + + @@ -1076,6 +1138,7 @@ + @@ -1145,6 +1208,28 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -1224,6 +1309,8 @@ + + @@ -1435,6 +1522,8 @@ + + @@ -1494,6 +1583,11 @@ + + + + + @@ -1519,6 +1613,10 @@ + + + + @@ -1536,6 +1634,7 @@ + @@ -1664,6 +1763,29 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/Model1.edmx.diagram b/SubProject/FPJ0000/Model1.edmx.diagram index 810fb83..b71ec78 100644 --- a/SubProject/FPJ0000/Model1.edmx.diagram +++ b/SubProject/FPJ0000/Model1.edmx.diagram @@ -26,6 +26,7 @@ + diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index 9ed298c..f9f881d 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -182,12 +182,24 @@ namespace FPJ0000.OtConfirm return; } - if(tbRemark.Text.StartsWith("테스트") && chkSendMail.Checked) + if (tbRemark.Text.StartsWith("테스트") && chkSendMail.Checked) { FCOMMON.Util.MsgI("테스트라 메일 체크를 끕니다"); chkSendMail.Checked = false; } + //동일날짜에 등록된 자료가있다면 오류로 처리한다. + var db = new EEEntities(); + string chkdt = tbSD.Value.ToShortDateString(); + var existdb = db.EETGW_HolydayRequest.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.uid == uid.ToString() && t.sdate == chkdt).Any(); + if(existdb) + { + FCOMMON.Util.MsgE("동일 날짜에 등록된 자료가 있습니다"); + return ; + } + + + if (dr.RowState == DataRowState.Detached) { var dlg = FCOMMON.Util.MsgQ("입력을 완료하시겠습니까?\r\n관리자에게 메일로 알림이 발생 합니다"); @@ -347,14 +359,14 @@ namespace FPJ0000.OtConfirm var perc = 0f; if (val[0] != "0") perc = float.Parse(val[1]) / float.Parse(val[0]); if (richTextBox1.TextLength > 0) richTextBox1.AppendText(","); - richTextBox1.AppendText($"[{item.Key}] {val[2]}일 남음({perc*100:N1}%사용)"); + richTextBox1.AppendText($"[{item.Key}] {val[2]}일 남음({perc * 100:N1}%사용)"); } else if (val[5] != "0") { var perc = 0f; if (val[3] != "0") perc = float.Parse(val[4]) / float.Parse(val[3]); if (richTextBox1.TextLength > 0) richTextBox1.AppendText(","); - richTextBox1.AppendText($"[{item.Key}] {val[5]}시간 남음({perc*100:N1}%사용)"); + richTextBox1.AppendText($"[{item.Key}] {val[5]}시간 남음({perc * 100:N1}%사용)"); } } diff --git a/SubProject/FPJ0000/Projects.cs b/SubProject/FPJ0000/Projects.cs index a209f68..8c50dab 100644 --- a/SubProject/FPJ0000/Projects.cs +++ b/SubProject/FPJ0000/Projects.cs @@ -68,5 +68,6 @@ namespace FPJ0000 public Nullable bAlert { get; set; } public string model { get; set; } public string serial { get; set; } + public string CMP_After2 { get; set; } } } diff --git a/SubProject/FPJ0000/vJobReportForUser.cs b/SubProject/FPJ0000/vJobReportForUser.cs index 8c88f5b..ef16982 100644 --- a/SubProject/FPJ0000/vJobReportForUser.cs +++ b/SubProject/FPJ0000/vJobReportForUser.cs @@ -33,5 +33,10 @@ namespace FPJ0000 public string ww { get; set; } public Nullable otStart { get; set; } public Nullable otEnd { get; set; } + public Nullable ot2 { get; set; } + public string otReason { get; set; } + public string grade { get; set; } + public string indate { get; set; } + public string outdate { get; set; } } } diff --git a/SubProject/FPJ0000/vUserWorkTimeList.cs b/SubProject/FPJ0000/vUserWorkTimeList.cs index 1603263..a191ac0 100644 --- a/SubProject/FPJ0000/vUserWorkTimeList.cs +++ b/SubProject/FPJ0000/vUserWorkTimeList.cs @@ -23,5 +23,7 @@ namespace FPJ0000 public Nullable ot { get; set; } public string UserProcess { get; set; } public Nullable holyot { get; set; } + public Nullable ot2 { get; set; } + public Nullable holyot2 { get; set; } } }