...

SubProject/FPJ0000/OtConfirm/fOTConfirm.cs

@@ -71,7 +71,7 @@ namespace FPJ0000
                 cmbUser.Text = namestr;
                 dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
             }
-            
+
 
             if (cmbUser.SelectedIndex < 0)
             {
@@ -99,7 +99,7 @@ namespace FPJ0000
 
 
             //일반사용자의경우에는 상태를 변경하지 못한다.
-      
+
             if (curLevel >= 5)
             {
 
@@ -247,7 +247,7 @@ namespace FPJ0000
 
 
             //사용자 목록다중선택으로 인해 처리
-            var sql = "SELECT *, dbo.getUserName(uid) AS username,  dbo.getWorkWeek(pdate) AS ww, dbo.getCodeSValue(gcode, '15',type) AS svalue";
+            var sql = "SELECT *, dbo.getUserName(uid) AS username,  dbo.getWorkWeek(pdate) AS ww, dbo.getCodeSValue(gcode, '15',type) AS svalue, dbo.IsHoliday(pdate) as FreeDay,dbo.[GetWeekName](pdate) as WeekName";
             sql += " FROM JobReport";
             sql += " WHERE (pdate BETWEEN @sd AND @ed) AND(gcode = @gcode)";
             sql += " and isnull(ot,0) > 0";
@@ -488,13 +488,17 @@ namespace FPJ0000
         private void toolStripButton1_Click(object sender, EventArgs e)
         {
             //전체승인
-            var dlg = util.MsgQ("미 입력된 승인시간을 일괄 입력할까요?");
+            var dlg = util.MsgQ("미 입력된 승인시간을 일괄 입력할까요?\n휴일에는 1.5x 가 적용 됩니다");
             if (dlg != DialogResult.Yes) return;
 
             foreach (dsPRJ.JobReportRow dr in this.dsMSSQL.JobReport)
             {
                 if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
-                if(dr.ot2 == 0) dr.ot2 = dr.ot;
+                if (dr.ot2 == 0)
+                {
+                    if (dr.FreeDay) dr.ot2 = dr.ot * 1.5;
+                    else dr.ot2 = dr.ot;
+                }
                 dr.EndEdit();
             }