전자실 report 초안 완료

SubProject/FPJ0000/EBoard/fEboardData.cs

@@ -105,7 +105,45 @@ namespace FPJ0000
             }));
 
 
+            ///원인
+            if (string.IsNullOrEmpty(dr.원인2))
+            {
+                this.richTextBoxEx1.Text = dr.원인;
+            }
+            else
+            {
+                try
+                {
+                    this.richTextBoxEx1.Rtf = dr.원인2;
+                }
+                catch (Exception ex)
+                {
+                    this.richTextBoxEx1.Text = dr.원인;
+                }
+            }
 
+            ///결과
+            if (string.IsNullOrEmpty(dr.결과2))
+            {
+                this.richTextBoxEx2.Text = dr.결과;
+            }
+            else
+            {
+                try
+                {
+                    this.richTextBoxEx2.Rtf = dr.결과2;
+                }
+                catch (Exception ex)
+                {
+                    this.richTextBoxEx2.Text = dr.결과;
+                }
+            }
+
+
+
+
+            this.tbSdate.Text = dr.pdate;
+            this.tbEdate.Text = dr.수리완료일;
             this.tbQty.Text = dr.QTY.ToString();
             this.tbCostNew.Text = dr.NPrice.ToString();
             this.tbCostOutSource.Text = dr.OPrice.ToString();
@@ -122,7 +160,6 @@ namespace FPJ0000
             this.Validate();
             this.bs.EndEdit();
 
-
             var s1 = tbCostOutSource.Text.Trim();
             var s2 = tbCostRepair.Text.Trim();
             float v1;
@@ -145,12 +182,38 @@ namespace FPJ0000
                 tbCostRepair.Focus();
                 return;
             }
-            if(remark_reqTextBox.Text.isEmpty())
+          
+
+            if(tbSdate.Text.isEmpty()==false)
             {
-                FCOMMON.Util.MsgE("요청 사항을 입력하세요");
-                remark_reqTextBox.Focus();
-                return;
+                if(tbSdate.Text.isDate()==false)
+                {
+                    FCOMMON.Util.MsgE("날짜형태로 입력하세요\n\n예) 2000-01-01");
+                    tbSdate.SelectAll();
+                    tbSdate.Focus();
+                    return;
+                }
             }
+            if (tbEdate.Text.isEmpty() == false)
+            {
+                if (tbEdate.Text.isDate() == false)
+                {
+                    FCOMMON.Util.MsgE("날짜형태로 입력하세요\n\n예) 2000-01-01");
+                    tbEdate.SelectAll();
+                    tbEdate.Focus();
+                    return;
+                }
+            }
+
+            this.dr.원인 = richTextBoxEx1.Text;
+            this.dr.원인2 = richTextBoxEx1.Rtf;
+
+            this.dr.결과 = richTextBoxEx2.Text;
+            this.dr.결과2 = richTextBoxEx2.Rtf;
+
+
+            this.dr.pdate = tbSdate.Text.Trim();
+            this.dr.수리완료일 = tbEdate.Text.Trim();
             this.dr.QTY = tbQty.Text.ToInt();
             this.dr.NPrice = tbCostNew.Text.ToDecimal();
             this.dr.OPrice = tbCostOutSource.Text.ToDecimal();
@@ -191,14 +254,14 @@ namespace FPJ0000
         }
         private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            SelectDate(sdateTextBox);
+            SelectDate(tbSdate);
         }
 
 
 
         private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            SelectDate(edateTextBox);
+            SelectDate(tbEdate);
             //if (edateTextBox.Text.isEmpty() == false)
             //    cmbStatus.Text = "완료";
         }