Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
chi
2022-07-28 14:03:24 +09:00
parent 8a4a7ef763
commit 4d7e6aeb63
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Project/Controller/APIController.cs
View File

@@ -57,8 +57,6 @@ namespace Project
}; };
return resp; return resp;
} }
[HttpGet] [HttpGet]

4
Project/Properties/AssemblyInfo.cs
View File

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
// 지정되도록 할 수 있습니다. // 지정되도록 할 수 있습니다.
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("22.07.22.0830")] [assembly: AssemblyVersion("22.07.28.1350")]
[assembly: AssemblyFileVersion("22.07.22.0830")] [assembly: AssemblyFileVersion("22.07.28.1350")]

2
SubProject/FBS0000/dsReport.Designer.cs generated
View File

@@ -2963,7 +2963,7 @@ SELECT idx, sdate, uid, cate, dbo.GetKuntaeJan_Day(gcode, uid, sdate, idx - 1) A
FROM Holyday LEFT OUTER JOIN FROM Holyday LEFT OUTER JOIN
EETGW_GroupUser ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid 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 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"; ORDER BY Holyday.sdate, Holyday.idx";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; 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, "", "", "")); 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, "", "", ""));

6
SubProject/FBS0000/dsReport.cs
View File

@@ -2,9 +2,9 @@
{ {
partial class dsReport partial class dsReport
{ {
} }
} }
namespace FBS0000.dsReportTableAdapters { namespace FBS0000.dsReportTableAdapters {

8
SubProject/FBS0000/dsReport.xsd
View File

@@ -68,7 +68,7 @@ ORDER BY Holyday.uid, CrDay</CommandText>
FROM Holyday LEFT OUTER JOIN FROM Holyday LEFT OUTER JOIN
EETGW_GroupUser ON Holyday.gcode = EETGW_GroupUser.gcode AND Holyday.uid = EETGW_GroupUser.uid 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 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) &lt;&gt; 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</CommandText> ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<Parameters> <Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" /> <Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.Holyday" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -166,7 +166,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
<xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport"> <xs:element name="dsReport" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="dsReport" msprop:Generator_UserDSName="dsReport">
<xs:complexType> <xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="holydata" msprop:Generator_TableClassName="holydataDataTable" msprop:Generator_TableVarName="tableholydata" msprop:Generator_RowChangedName="holydataRowChanged" msprop:Generator_TablePropName="holydata" msprop:Generator_RowDeletingName="holydataRowDeleting" msprop:Generator_RowChangingName="holydataRowChanging" msprop:Generator_RowEvHandlerName="holydataRowChangeEventHandler" msprop:Generator_RowDeletedName="holydataRowDeleted" msprop:Generator_RowClassName="holydataRow" msprop:Generator_UserTableName="holydata" msprop:Generator_RowEvArgName="holydataRowChangeEvent"> <xs:element name="holydata" msprop:Generator_TableClassName="holydataDataTable" msprop:Generator_TableVarName="tableholydata" msprop:Generator_TablePropName="holydata" msprop:Generator_RowDeletingName="holydataRowDeleting" msprop:Generator_RowChangingName="holydataRowChanging" msprop:Generator_RowEvHandlerName="holydataRowChangeEventHandler" msprop:Generator_RowDeletedName="holydataRowDeleted" msprop:Generator_UserTableName="holydata" msprop:Generator_RowChangedName="holydataRowChanged" msprop:Generator_RowEvArgName="holydataRowChangeEvent" msprop:Generator_RowClassName="holydataRow">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0"> <xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
@@ -211,7 +211,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="Holydata_Day" msprop:Generator_TableClassName="Holydata_DayDataTable" msprop:Generator_TableVarName="tableHolydata_Day" msprop:Generator_TablePropName="Holydata_Day" msprop:Generator_RowDeletingName="Holydata_DayRowDeleting" msprop:Generator_RowChangingName="Holydata_DayRowChanging" msprop:Generator_RowEvHandlerName="Holydata_DayRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_DayRowDeleted" msprop:Generator_UserTableName="Holydata_Day" msprop:Generator_RowChangedName="Holydata_DayRowChanged" msprop:Generator_RowEvArgName="Holydata_DayRowChangeEvent" msprop:Generator_RowClassName="Holydata_DayRow"> <xs:element name="Holydata_Day" msprop:Generator_TableClassName="Holydata_DayDataTable" msprop:Generator_TableVarName="tableHolydata_Day" msprop:Generator_RowChangedName="Holydata_DayRowChanged" msprop:Generator_TablePropName="Holydata_Day" msprop:Generator_RowDeletingName="Holydata_DayRowDeleting" msprop:Generator_RowChangingName="Holydata_DayRowChanging" msprop:Generator_RowEvHandlerName="Holydata_DayRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_DayRowDeleted" msprop:Generator_RowClassName="Holydata_DayRow" msprop:Generator_UserTableName="Holydata_Day" msprop:Generator_RowEvArgName="Holydata_DayRowChangeEvent">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" /> <xs:element name="idx" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -265,7 +265,7 @@ ORDER BY Holyday.sdate, Holyday.idx</CommandText>
</xs:sequence> </xs:sequence>
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
<xs:element name="Holydata_Time" msprop:Generator_TableClassName="Holydata_TimeDataTable" msprop:Generator_TableVarName="tableHolydata_Time" msprop:Generator_TablePropName="Holydata_Time" msprop:Generator_RowDeletingName="Holydata_TimeRowDeleting" msprop:Generator_RowChangingName="Holydata_TimeRowChanging" msprop:Generator_RowEvHandlerName="Holydata_TimeRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimeRowDeleted" msprop:Generator_UserTableName="Holydata_Time" msprop:Generator_RowChangedName="Holydata_TimeRowChanged" msprop:Generator_RowEvArgName="Holydata_TimeRowChangeEvent" msprop:Generator_RowClassName="Holydata_TimeRow"> <xs:element name="Holydata_Time" msprop:Generator_TableClassName="Holydata_TimeDataTable" msprop:Generator_TableVarName="tableHolydata_Time" msprop:Generator_RowChangedName="Holydata_TimeRowChanged" msprop:Generator_TablePropName="Holydata_Time" msprop:Generator_RowDeletingName="Holydata_TimeRowDeleting" msprop:Generator_RowChangingName="Holydata_TimeRowChanging" msprop:Generator_RowEvHandlerName="Holydata_TimeRowChangeEventHandler" msprop:Generator_RowDeletedName="Holydata_TimeRowDeleted" msprop:Generator_RowClassName="Holydata_TimeRow" msprop:Generator_UserTableName="Holydata_Time" msprop:Generator_RowEvArgName="Holydata_TimeRowChangeEvent">
<xs:complexType> <xs:complexType>
<xs:sequence> <xs:sequence>
<xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode"> <xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">

2
SubProject/FPJ0000/OtConfirm/fHolyRequest.cs
View File

@@ -283,6 +283,8 @@ namespace FPJ0000
var cnt = ta.Update(this.dSKuntae.EETGW_HolydayRequest); var cnt = ta.Update(this.dSKuntae.EETGW_HolydayRequest);
dSKuntae.EETGW_HolydayRequest.AcceptChanges(); dSKuntae.EETGW_HolydayRequest.AcceptChanges();
FCOMMON.Util.MsgI($"{cnt}건의 자료가 저장 되었습니다"); FCOMMON.Util.MsgI($"{cnt}건의 자료가 저장 되었습니다");
refreshData();
} }
catch (Exception ex) catch (Exception ex)
{ {

6
SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs
View File

@@ -178,10 +178,10 @@ namespace FPJ0000.OtConfirm
return; return;
} }
if (vDay < 1 && vTime < 0.1) if (vDay < 1 && vTime < 0.1 && curLevel < 5)
{ {
FCOMMON.Util.MsgE("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요"); var dlg = FCOMMON.Util.MsgQ("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요\n값을 입력하지 않고 계속할까요?");
return; if (dlg != DialogResult.Yes) return;
} }
//하나도 입력안했다면 경고한다 //하나도 입력안했다면 경고한다