..

SubProject/FBS0000/Holiday/fHolyday_Add.cs

@@ -17,10 +17,10 @@ namespace FBS0000
         public fHolyday_Add(int idx)
         {
             InitializeComponent();
-            if(idx == -1)
+            if (idx == -1)
             {
                 dr = this.dsMSSQL.Holyday.NewHolydayRow();
-                dr.sdate = DateTime.Parse( DateTime.Now.Year.ToString() + "-01-01");
+                dr.sdate = DateTime.Parse(DateTime.Now.Year.ToString() + "-01-01");
                 dr.edate = dr.sdate;
                 dr.wuid = FCOMMON.info.Login.no;
                 dr.wdate = DateTime.Now;
@@ -29,16 +29,16 @@ namespace FBS0000
                 dr.gcode = FCOMMON.info.Login.gcode;
                 dr.uid = FCOMMON.info.Login.no;
                 this.dsMSSQL.Holyday.AddHolydayRow(dr);
-            }   
+            }
             else
             {
                 ta.FillByIdx(this.dsMSSQL.Holyday, FCOMMON.info.Login.gcode, idx);
                 this.dr = this.dsMSSQL.Holyday.Rows[0] as dsMSSQL.HolydayRow;
-                if (dr.cate == "10") radNormall.Checked = true;
-                else radEtc.Checked = true;
+                if (dr.term > 0 || dr.CrTime > 0) radCR.Checked = true;
+                else radDR.Checked = true;
             }
 
-            this.cmbUser.DataSource = FCOMMON.DBM.getUserTable(); 
+            this.cmbUser.DataSource = FCOMMON.DBM.getUserTable();
             this.cmbUser.DisplayMember = "dispName";
             this.cmbUser.ValueMember = "id";
             this.bs.DataSource = dr;
@@ -50,13 +50,35 @@ namespace FBS0000
         {
             bInit = true;
             this.Show();
+
+            if (radCR.Checked)
+            {
+                this.numericUpDown1.Value = (decimal)dr.term;
+                this.numericUpDown2.Value = (decimal)dr.CrTime;
+            }
+            else
+            {
+                this.numericUpDown1.Value = (decimal)dr.termDr;
+                this.numericUpDown2.Value = (decimal)dr.DrTime;
+            }
             Application.DoEvents();
         }
 
         private void btOK_Click(object sender, EventArgs e)
         {
-            if (radEtc.Checked) dr.cate = "11"; //OT년차발생
-            else dr.cate = "10";//일반 년차발생
+            if (radCR.Checked)
+            {
+                dr.CrTime = (double)numericUpDown2.Value;
+                dr.term = (double)numericUpDown1.Value;
+                dr.cate = "20"; //OT년차발생
+            }
+            else
+            {
+                dr.DrTime = (double)numericUpDown2.Value;
+                dr.termDr = (double)numericUpDown1.Value;
+                dr.cate = "10";//일반 년차발생
+            }
+            
             //기본값처리
             this.Validate();
             this.bs.EndEdit();
@@ -64,7 +86,7 @@ namespace FBS0000
 
             try
             {
-                
+
                 this.ta.Update(this.dr);
                 dr.AcceptChanges();
                 DialogResult = System.Windows.Forms.DialogResult.OK;
@@ -74,19 +96,19 @@ namespace FBS0000
                 FCOMMON.Util.MsgE(eX.Message);
             }
 
-            
-            
+
+
         }
 
         private void dateTimePicker1_ValueChanged(object sender, EventArgs e)
         {
             if (!bInit) return;
 
-            
+
             //if(dateTimePicker1.Value > this.dateTimePicker2.Value)
             //    this.dateTimePicker2.Value = dateTimePicker1.Value;
             //RefreshTerm();
-          
+
 
         }