..

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -114,7 +114,7 @@ namespace FPJ0000.JobReport_
             this.cmbProcess.ValueMember = "Value";
             this.cmbProcess.DataSource = dt_process;
 
-            if(getKisulInput)
+            if (getKisulInput)
             {
                 //기술분류
                 var dt_kisuldiv = FCOMMON.DBM.getCodeTable("50");
@@ -148,9 +148,9 @@ namespace FPJ0000.JobReport_
             tbTag.Text = dr.tag;
 
 
-            if(dr.ot > 0)
+            if (dr.ot > 0)
             {
-                if(dr.ot2  == 0)
+                if (dr.ot2 == 0)
                 {
                     lbOt2.Text = "관리자 연장/휴일 근무 승인이 완료되지 않았습니다";
                     lbOt2.ForeColor = Color.Blue;
@@ -161,14 +161,14 @@ namespace FPJ0000.JobReport_
                     lbOt2.Text = $"승인시간:{dr.ot2}";
                     lbotReason.Text = $"사유:{dr.otReason}";
                 }
-                
+
             }
             else
             {
                 lbOt2.Visible = false;
                 lbotReason.Visible = false;
             }
-            
+
 
             if (getKisulInput)
             {
@@ -223,7 +223,7 @@ namespace FPJ0000.JobReport_
                 {
                     this.richTextBoxEx1.Rtf = dr.description2;
                 }
-                catch 
+                catch
                 {
                     this.richTextBoxEx1.Text = dr.description;
                 }
@@ -232,7 +232,7 @@ namespace FPJ0000.JobReport_
             this.Show();
             Application.DoEvents();
 
-           if(dr.ot > 0 && dr.ot2 > 0)
+            if (dr.ot > 0 && dr.ot2 > 0)
             {
                 tbOt.Enabled = false;
                 FCOMMON.Util.MsgE("휴일/연장 근무시간이 관리자에의해 확정되었으므로 초과시간을 변경할 수 없습니다");
@@ -259,12 +259,25 @@ namespace FPJ0000.JobReport_
 
             //ed.DisplayEditForm(this.panel1);
             //ed.AllowRtf = true;
-            if(ReadMode)
+            if (ReadMode)
             {
                 panel1.Enabled = false;
                 this.Text += "(읽기전용)";
-                
-            }    
+
+            }
+
+            //신규데이터라면 양식을 처리한다.
+            if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added)
+            {
+                //해당 데이터의 메일 양식을 검사해서 데이터를 적용해준다.
+                var db = new EEEntities();
+                var dr0 = db.EETGW_DocuForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "J0").FirstOrDefault();
+                if (dr0 != null)
+                {
+                    richTextBoxEx1.Rtf = dr0.body;
+                }
+                db.Dispose();
+            }
 
 
             bInit = true;
@@ -510,13 +523,13 @@ namespace FPJ0000.JobReport_
             this.dr.process = cmbProcess.Text;
             this.dr.tag = tbTag.Text.Trim();
 
-            if(getKisulInput)
+            if (getKisulInput)
             {
                 this.dr.kisuldiv = cmb_kisuldiv.Text;
                 this.dr.kisullv = cmb_kisullv.Text;
                 this.dr.kisulamt = Decimal.Parse(textBox1.Text);
             }
-            
+
             if (tbHrs.Text != "") this.dr.hrs = double.Parse(tbHrs.Text);
             else this.dr.hrs = 0;