Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

업무일지 메일 발송 로직에서. 휴일 체크 루틴 버그 수정

Browse Source
This commit is contained in:
chi
2021-05-28 11:34:30 +09:00
parent e1dce272bb
commit ba02049737
88 changed files with 7522 additions and 2224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
JobReportMailService/MDIParent1.Designer.cs generated
View File

@@ -77,12 +77,12 @@ namespace JobReportMailService
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.saveToolStripButton = new System.Windows.Forms.ToolStripButton();
this.printToolStripButton = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.statusStrip = new System.Windows.Forms.StatusStrip();
this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel();
this.toolTip = new System.Windows.Forms.ToolTip(this.components);
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.menuStrip.SuspendLayout();
this.toolStrip.SuspendLayout();
this.statusStrip.SuspendLayout();
@@ -487,6 +487,15 @@ namespace JobReportMailService
this.printToolStripButton.Text = "스케쥴(주)";
this.printToolStripButton.Click += new System.EventHandler(this.printToolStripButton_Click);
//
// toolStripButton2
//
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Black;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(107, 22);
this.toolStripButton2.Text = "스케쥴없음(주)";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
@@ -518,15 +527,6 @@ namespace JobReportMailService
this.toolStripStatusLabel.Size = new System.Drawing.Size(31, 17);
this.toolStripStatusLabel.Text = "상태";
//
// toolStripButton2
//
this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Black;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(107, 22);
this.toolStripButton2.Text = "스케쥴없음(주)";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// MDIParent1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -539,6 +539,7 @@ namespace JobReportMailService
this.MainMenuStrip = this.menuStrip;
this.Name = "MDIParent1";
this.Text = "MDIParent1";
this.Load += new System.EventHandler(this.MDIParent1_Load);
this.menuStrip.ResumeLayout(false);
this.menuStrip.PerformLayout();
this.toolStrip.ResumeLayout(false);

5
JobReportMailService/MDIParent1.cs
View File

@@ -133,5 +133,10 @@ namespace JobReportMailService
//childForm.Text = "창 " + childFormNumber++;
childForm.Show();
}
private void MDIParent1_Load(object sender, EventArgs e)
{
this.Text = "mail service " + Application.ProductVersion.ToString();
}
}
}

4
JobReportMailService/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
// 기본값으로 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("21.05.16.1600")]
[assembly: AssemblyFileVersion("21.05.16.1600")]
[assembly: AssemblyVersion("21.05.28.1120")]
[assembly: AssemblyFileVersion("21.05.28.1120")]

2
JobReportMailService/fJobReportDay.cs
View File

@@ -142,7 +142,7 @@ namespace JobReportMailService
//이 날짜가 휴일인지 체크한다.
db = new EEEntities();
var Holyinfo = db.HolidayLIst.Where(t => t.pdate == jobdata.package).FirstOrDefault();
var Holyinfo = db.HolidayLIst.Where(t => t.pdate == jobdata.pdate).FirstOrDefault();
if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) continue;
//이날짜에는 8시간을 근무 해야 한다

2
JobReportMailService/fNoScheduleDayWeek.cs
View File

@@ -144,7 +144,7 @@ namespace JobReportMailService
{
//스케쥴에서 데이터를 찾는다.
var cnt = db.EETGW_ProjectsSchedule.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.project == row.idx && t.appoval > 1).Any();
var cnt = db.EETGW_ProjectsSchedule.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.project == row.idx).Any();
if (cnt == true) continue; //등록되었다
body.AppendLine($"<tr>");