From 9d3e0a9ad5a11f936c627952a184ae3a4b42c74f Mon Sep 17 00:00:00 2001
From: "chikyun.kim" <Chikyun.kim@amkor.co.kr>
Date: Tue, 28 May 2019 13:58:21 +0900
Subject: [PATCH] ..

---
 Project/Properties/AssemblyInfo.cs             |  4 ++--
 SubProject/FEQ0000/Purchase/fPurchase_Add.cs   |  2 +-
 SubProject/FPJ0000/JobReport/fJobReport_Add.cs | 14 ++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs
index 3ef857b..55fdfc9 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("19.05.17.1700")]
-[assembly: AssemblyFileVersion("19.05.17.1700")]
+[assembly: AssemblyVersion("19.05.28.1350")]
+[assembly: AssemblyFileVersion("19.05.28.1350")]
diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs
index f7dae77..023f747 100644
--- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs
+++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs
@@ -413,7 +413,7 @@ namespace FEQ0000
 
             if (tbPumModel.Text == "")
             {
-                FCOMMON.Util.MsgE("제품 모델을 입력하세요.");
+                FCOMMON.Util.MsgE("제품 규격을 입력하세요.");
                 tbPumModel.Focus();
                 return false;
             }
diff --git a/SubProject/FPJ0000/JobReport/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport/fJobReport_Add.cs
index 4ba16a8..77b49d4 100644
--- a/SubProject/FPJ0000/JobReport/fJobReport_Add.cs
+++ b/SubProject/FPJ0000/JobReport/fJobReport_Add.cs
@@ -202,12 +202,12 @@ namespace FPJ0000.JobReport
         private void button1_Click(object sender, EventArgs e)
         {
             this.Invalidate();
-            //if(tbProject.Text.Trim() == "")
-            //{
-            //    FCOMMON.Util.MsgE("프로젝트(아이템) 명칭이 없습니다.");
-            //    tbProject.Focus();                
-            //    return;
-            //}
+            if(tbProject.Text.Trim() == "")
+            {
+                FCOMMON.Util.MsgE("프로젝트(아이템) 명칭이 없습니다.");
+                tbProject.Focus();                
+                return;
+            }
             if (cmbType.Text != "휴가" && tbDescription.Text.Trim() == "")
             {
                 FCOMMON.Util.MsgE("진행 내용이 없습니다.");
@@ -252,6 +252,7 @@ namespace FPJ0000.JobReport
                 {
                     FCOMMON.Util.MsgI("입력일자는 휴일로 등록되어 있습니다.\n\n근무시간은 OT에 입력하시기 바랍니다.");
                     //tbOt.Text = tbHrs.Text;
+                    dr.hrs = 0;
                     tbHrs.Text = "0";
                     tbHrs.Focus();
                     return;
@@ -318,6 +319,7 @@ namespace FPJ0000.JobReport
                 if (hrs != 0)
                 {
                     FCOMMON.Util.MsgI("공휴일에는 근무시간을 입력할 수 없습니다.\n초과시간에 입력하세요.\n\n해당 값은 삭제 됩니다.");
+                    dr.hrs = 0;                    
                     tbHrs.Text = "0";
                     if (hrs != 8) tbOt.Text = hrs.ToString();
                     tbOt.Focus();