From 0d46bc87c03db97effb0c0131c854049e89f1b89 Mon Sep 17 00:00:00 2001
From: chi <chikyun.kim@amkor.co.kr>
Date: Fri, 27 May 2022 23:34:30 +0900
Subject: [PATCH] ..

---
 JobReportMailService/Properties/AssemblyInfo.cs | 4 ++--
 JobReportMailService/fJobReportDay.cs           | 7 +++----
 Project/Properties/AssemblyInfo.cs              | 4 ++--
 SubProject/FPJ0000/JobReport_/fJobReport.cs     | 7 +++++++
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/JobReportMailService/Properties/AssemblyInfo.cs b/JobReportMailService/Properties/AssemblyInfo.cs
index c4fd431..f423b6b 100644
--- a/JobReportMailService/Properties/AssemblyInfo.cs
+++ b/JobReportMailService/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를
 // 기본값으로 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("22.05.24.0850")]
-[assembly: AssemblyFileVersion("22.05.24.0850")]
+[assembly: AssemblyVersion("22.05.26.1150")]
+[assembly: AssemblyFileVersion("22.05.26.1150")]
diff --git a/JobReportMailService/fJobReportDay.cs b/JobReportMailService/fJobReportDay.cs
index 97e8988..a7a7279 100644
--- a/JobReportMailService/fJobReportDay.cs
+++ b/JobReportMailService/fJobReportDay.cs
@@ -116,10 +116,9 @@ namespace JobReportMailService
 
 			//기준일자는 오늘부터 -15일이다
 			//var basedate = new DateTime(2022, 05, 20);// DateTime.Now;
-													  var basedate = DateTime.Now;
-
+			var basedate = DateTime.Now;
 			var sd = basedate.AddDays(-15);
-			var ed = basedate;
+			var ed = basedate.AddDays(-1);
 			var str_sd = sd.ToShortDateString();
 			var str_ed = ed.ToShortDateString();
 			var str_dt = basedate.ToShortDateString();
@@ -143,7 +142,7 @@ namespace JobReportMailService
 
 
 			var gcodelist = dtMailForm.GroupBy(t => t.gcode).Select(t => t.Key).ToList();
-			gcodelist = new List<string>();
+			//gcodelist = new List<string>();
 			//gcodelist.Add("EETK5");
 
 			foreach (var gcodedata in gcodelist)
diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 636f558..1bd7973 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.05.22.1100")]
-[assembly: AssemblyFileVersion("22.05.22.1100")]
+[assembly: AssemblyVersion("22.05.27.2330")]
+[assembly: AssemblyFileVersion("22.05.27.2330")]
diff --git a/SubProject/FPJ0000/JobReport_/fJobReport.cs b/SubProject/FPJ0000/JobReport_/fJobReport.cs
index 0a06072..d86815f 100644
--- a/SubProject/FPJ0000/JobReport_/fJobReport.cs
+++ b/SubProject/FPJ0000/JobReport_/fJobReport.cs
@@ -564,8 +564,15 @@ namespace FPJ0000
             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();
 
             //var newdr = this.dsMSSQL.JobReport.NewJobReportRow();