From 620c0e6d2014625ee79ae83599b70aee86438c9c Mon Sep 17 00:00:00 2001 From: chi Date: Thu, 21 Apr 2022 13:28:55 +0900 Subject: [PATCH] .... --- Project/Setting.cs | 3 +++ Project/fMain.cs | 4 ++++ SubProject/FCOMMON/Info.cs | 1 + SubProject/FPJ0000/JobReport_/fJobReport_Add.cs | 15 +++++++++++++++ 4 files changed, 23 insertions(+) diff --git a/Project/Setting.cs b/Project/Setting.cs index 19be4eb..535da1c 100644 --- a/Project/Setting.cs +++ b/Project/Setting.cs @@ -32,6 +32,9 @@ namespace Project public Boolean Log_IO { get; set; } #endregion + + [DisplayName("업무일지8시간초과입력불가"),Description("업무일지 근무시간 란에 8시간을 초과 입력 할 수 없게 합니다")] + public Boolean Disable8HourOver { get; set; } [DisplayName("원달러환율")] public double wondoller { get; set; } diff --git a/Project/fMain.cs b/Project/fMain.cs index 68b1143..5a1ae3a 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -199,6 +199,9 @@ namespace Project this.mn_docu.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_docu); //this.mn_logdata.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_logdata); + //220421 + FCOMMON.info.Disable_8hourover = Pub.setting.Disable8HourOver; + if (FCOMMON.info.Login.level >= 10) btDev.Visible = true; sbLogin.Text = string.Format("[{0}] ({1}-{2} T:{3}) - ({5}){4}", @@ -289,6 +292,7 @@ namespace Project if (f.ShowDialog() == DialogResult.OK) { FCOMMON.info.camIndex = Pub.setting.CamIndex; + FCOMMON.info.Disable_8hourover = Pub.setting.Disable8HourOver; Pub.setting.Save(); Pub.log.AddI("Setting Save"); Pub.log.Add(Pub.setting.ToString()); diff --git a/SubProject/FCOMMON/Info.cs b/SubProject/FCOMMON/Info.cs index d853ea9..54f569b 100644 --- a/SubProject/FCOMMON/Info.cs +++ b/SubProject/FCOMMON/Info.cs @@ -54,6 +54,7 @@ namespace FCOMMON public static Boolean NotShowJobReportview = false; public static double dollertowon = 1200; public static Boolean ShowBuyerror = true; + public static Boolean Disable_8hourover = false; public static sUserInfo Login; public static string Path; public static string CS; diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index 1d30c42..85c5522 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -417,6 +417,21 @@ namespace FPJ0000.JobReport_ return; } + if(dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached ) + { + if(FCOMMON.info.Disable_8hourover) + { + var h = Single.Parse(tbHrs.Text); + if (h > 8) + { + FCOMMON.Util.MsgE("근무시간은 8시간을 초과할 수 없습니다. 초과 근무는 [초과시간] 을 사용하세요"); + tbHrs.Focus(); + tbHrs.SelectAll(); + return; + } + } + } + if (cmbType.Text.Trim() == "") { FCOMMON.Util.MsgE("업무형태를 선택하세요");