diff --git a/Project/Controller/APIController.cs b/Project/Controller/APIController.cs index be3c5ca..3d1c638 100644 --- a/Project/Controller/APIController.cs +++ b/Project/Controller/APIController.cs @@ -57,8 +57,6 @@ namespace Project }; return resp; - - } [HttpGet] diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 1498f6c..dc9524e 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("22.07.22.0830")] -[assembly: AssemblyFileVersion("22.07.22.0830")] +[assembly: AssemblyVersion("22.07.28.1350")] +[assembly: AssemblyFileVersion("22.07.28.1350")] diff --git a/SubProject/FBS0000/dsReport.Designer.cs b/SubProject/FBS0000/dsReport.Designer.cs index 5b6810d..d47b8c0 100644 --- a/SubProject/FBS0000/dsReport.Designer.cs +++ b/SubProject/FBS0000/dsReport.Designer.cs @@ -2963,7 +2963,7 @@ SELECT idx, sdate, uid, cate, dbo.GetKuntaeJan_Day(gcode, uid, sdate, idx - 1) A FROM Holyday LEFT OUTER JOIN EETGW_GroupUser ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users ON Holyday.uid = Users.id -WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.termDr, 0) + ISNULL(Holyday.term, 0) <> 0) +WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) = 0) ORDER BY Holyday.sdate, Holyday.idx"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); diff --git a/SubProject/FBS0000/dsReport.cs b/SubProject/FBS0000/dsReport.cs index d547a88..b33dd82 100644 --- a/SubProject/FBS0000/dsReport.cs +++ b/SubProject/FBS0000/dsReport.cs @@ -2,9 +2,9 @@ { - partial class dsReport - { - } + partial class dsReport + { + } } namespace FBS0000.dsReportTableAdapters { diff --git a/SubProject/FBS0000/dsReport.xsd b/SubProject/FBS0000/dsReport.xsd index e28d503..290662c 100644 --- a/SubProject/FBS0000/dsReport.xsd +++ b/SubProject/FBS0000/dsReport.xsd @@ -68,7 +68,7 @@ ORDER BY Holyday.uid, CrDay FROM Holyday LEFT OUTER JOIN EETGW_GroupUser ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users ON Holyday.uid = Users.id -WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.termDr, 0) + ISNULL(Holyday.term, 0) <> 0) +WHERE (Holyday.gcode = @gcode) AND (Holyday.uid LIKE @uid) AND (Holyday.sdate BETWEEN @sd AND @ed) AND (ISNULL(Holyday.DrTime, 0) + ISNULL(Holyday.CrTime, 0) = 0) ORDER BY Holyday.sdate, Holyday.idx @@ -166,7 +166,7 @@ ORDER BY Holyday.sdate, Holyday.idx - + @@ -211,7 +211,7 @@ ORDER BY Holyday.sdate, Holyday.idx - + @@ -265,7 +265,7 @@ ORDER BY Holyday.sdate, Holyday.idx - + diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs index 6e1080d..6a802c1 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs @@ -283,6 +283,8 @@ namespace FPJ0000 var cnt = ta.Update(this.dSKuntae.EETGW_HolydayRequest); dSKuntae.EETGW_HolydayRequest.AcceptChanges(); FCOMMON.Util.MsgI($"{cnt}건의 자료가 저장 되었습니다"); + + refreshData(); } catch (Exception ex) { diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index 2c2beee..7e921a6 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -178,10 +178,10 @@ namespace FPJ0000.OtConfirm return; } - if (vDay < 1 && vTime < 0.1) + if (vDay < 1 && vTime < 0.1 && curLevel < 5) { - FCOMMON.Util.MsgE("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요"); - return; + var dlg = FCOMMON.Util.MsgQ("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요\n값을 입력하지 않고 계속할까요?"); + if (dlg != DialogResult.Yes) return; } //하나도 입력안했다면 경고한다