This commit is contained in:
chi
2022-04-21 13:28:55 +09:00
parent b6607dde2d
commit 620c0e6d20
4 changed files with 23 additions and 0 deletions

View File

@@ -32,6 +32,9 @@ namespace Project
public Boolean Log_IO { get; set; } public Boolean Log_IO { get; set; }
#endregion #endregion
[DisplayName("업무일지8시간초과입력불가"),Description("업무일지 근무시간 란에 8시간을 초과 입력 할 수 없게 합니다")]
public Boolean Disable8HourOver { get; set; }
[DisplayName("원달러환율")] [DisplayName("원달러환율")]
public double wondoller { get; set; } public double wondoller { get; set; }

View File

@@ -199,6 +199,9 @@ namespace Project
this.mn_docu.Visible = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.menu_docu); 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); //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; if (FCOMMON.info.Login.level >= 10) btDev.Visible = true;
sbLogin.Text = string.Format("[{0}] ({1}-{2} T:{3}) - ({5}){4}", sbLogin.Text = string.Format("[{0}] ({1}-{2} T:{3}) - ({5}){4}",
@@ -289,6 +292,7 @@ namespace Project
if (f.ShowDialog() == DialogResult.OK) if (f.ShowDialog() == DialogResult.OK)
{ {
FCOMMON.info.camIndex = Pub.setting.CamIndex; FCOMMON.info.camIndex = Pub.setting.CamIndex;
FCOMMON.info.Disable_8hourover = Pub.setting.Disable8HourOver;
Pub.setting.Save(); Pub.setting.Save();
Pub.log.AddI("Setting Save"); Pub.log.AddI("Setting Save");
Pub.log.Add(Pub.setting.ToString()); Pub.log.Add(Pub.setting.ToString());

View File

@@ -54,6 +54,7 @@ namespace FCOMMON
public static Boolean NotShowJobReportview = false; public static Boolean NotShowJobReportview = false;
public static double dollertowon = 1200; public static double dollertowon = 1200;
public static Boolean ShowBuyerror = true; public static Boolean ShowBuyerror = true;
public static Boolean Disable_8hourover = false;
public static sUserInfo Login; public static sUserInfo Login;
public static string Path; public static string Path;
public static string CS; public static string CS;

View File

@@ -417,6 +417,21 @@ namespace FPJ0000.JobReport_
return; 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() == "") if (cmbType.Text.Trim() == "")
{ {
FCOMMON.Util.MsgE("업무형태를 선택하세요"); FCOMMON.Util.MsgE("업무형태를 선택하세요");