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

..

Browse Source
This commit is contained in:
chi
2021-06-17 09:36:17 +09:00
parent 71b362c05b
commit 139c48721f
25 changed files with 5556 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
JobReportMailService/JobReportMailService.csproj
View File

@@ -38,6 +38,8 @@
<Reference Include="ArSetting.Net4">
<HintPath>..\DLL\ArSetting.Net4.dll</HintPath>
</Reference>
<Reference Include="DevExpress.Data.v20.2, Version=20.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.Xpo.v20.2, Version=20.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
</Reference>
@@ -158,6 +160,7 @@
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
<Compile Include="Pub.cs" />
<Content Include="ReadMe.txt" />
<Compile Include="ReportUserData.cs" />
<Compile Include="vGroupUser.cs">
<DependentUpon>Model1.tt</DependentUpon>

4
JobReportMailService/Properties/AssemblyInfo.cs
View File

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

1
JobReportMailService/ReadMe.txt Normal file
View File

@@ -0,0 +1 @@
200607 EETGW_GroupUser 에 업무일지 미사용 체크된 인원은 sendmail 에서 제외하게 변경

3
JobReportMailService/fJobReportDay.cs
View File

@@ -117,6 +117,9 @@ namespace JobReportMailService
var userdata = db.vGroupUser.Where(t => t.id == userinfo.id).FirstOrDefault();
if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue;
//사용자 정보에 업무일지를 사용하지 않기로 했다면 처리하지 않는다. 퇴사자는 이값도 설정된다.
if (userdata.useJobReport != null && userdata.useJobReport == false) continue;
db = new EEEntities();
var Exists = db.MailData.Where(t => t.gcode == Pub.vGcode && t.wuid == userinfo.id && t.pdate == str_dt && t.cate == "JD").Any();
if (Exists == false) uids.Add(userinfo.id, userinfo.name); //자동생성된 자료가 없는 경우에만 처리한다

4
JobReportMailService/fJobReportWeek.cs
View File

@@ -123,6 +123,9 @@ namespace JobReportMailService
var userdata = db.vGroupUser.Where(t => t.id == userinfo.id).FirstOrDefault();
if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue;
//사용자 정보에 업무일지를 사용하지 않기로 했다면 처리하지 않는다. 퇴사자는 이값도 설정된다.
if (userdata.useJobReport != null && userdata.useJobReport == false) continue;
//이 대상의 이메일이 받는 사람에 제외되어있다면 처리하지 않는다.
var exxptolist = MailJW.exceptmail.ToUpper().Split(';');
if (exxptolist.Contains(userdata.email.ToUpper()) == false)
@@ -134,7 +137,6 @@ namespace JobReportMailService
else addmsg("주간 제외대상자임 " + userdata.email);
}
addmsg($"{uids.Count} 명의 전체 사용자가 확인 되었습니다");
//먼저 날짜목록을 가져온다

1
Project/AdoNetEFMain.Context.cs
View File

@@ -39,5 +39,6 @@ namespace Project
public virtual DbSet<ProjectsMailList> ProjectsMailList { get; set; }
public virtual DbSet<ProjectsPart> ProjectsPart { get; set; }
public virtual DbSet<Purchase> Purchase { get; set; }
public virtual DbSet<HolidayLIst> HolidayLIst { get; set; }
}
}

39
Project/AdoNetEFMain.edmx
View File

@@ -60,6 +60,17 @@
<Property Name="wuid" Type="varchar" MaxLength="20" />
<Property Name="wdate" Type="smalldatetime" />
</EntityType>
<EntityType Name="HolidayLIst">
<Key>
<PropertyRef Name="idx" />
</Key>
<Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="pdate" Type="varchar" MaxLength="10" />
<Property Name="free" Type="bit" />
<Property Name="memo" Type="nvarchar" MaxLength="255" />
<Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
<Property Name="wdate" Type="smalldatetime" Nullable="false" />
</EntityType>
<EntityType Name="JobReport">
<Key>
<PropertyRef Name="idx" />
@@ -141,6 +152,7 @@
<Property Name="EB_RepairTime" Type="float" />
<Property Name="EB_ConstNew" Type="float" />
<Property Name="EB_BoardName" Type="nvarchar" MaxLength="255" />
<Property Name="bAlert" Type="bit" />
</EntityType>
<EntityType Name="ProjectsHistory">
<Key>
@@ -350,6 +362,7 @@
<EntitySet Name="EETGW_GroupUser" EntityType="Self.EETGW_GroupUser" Schema="dbo" store:Type="Tables" />
<EntitySet Name="EETGW_JobReport_AutoInput" EntityType="Self.EETGW_JobReport_AutoInput" Schema="dbo" store:Type="Tables" />
<EntitySet Name="EETGW_LoginInfo" EntityType="Self.EETGW_LoginInfo" Schema="dbo" store:Type="Tables" />
<EntitySet Name="HolidayLIst" EntityType="Self.HolidayLIst" Schema="dbo" store:Type="Tables" />
<EntitySet Name="JobReport" EntityType="Self.JobReport" Schema="dbo" store:Type="Tables" />
<EntitySet Name="Projects" EntityType="Self.Projects" Schema="dbo" store:Type="Tables" />
<EntitySet Name="ProjectsHistory" EntityType="Self.ProjectsHistory" Schema="dbo" store:Type="Tables" />
@@ -430,6 +443,7 @@
<EntitySet Name="ProjectsMailList" EntityType="EEModelMain.ProjectsMailList" />
<EntitySet Name="ProjectsPart" EntityType="EEModelMain.ProjectsPart" />
<EntitySet Name="Purchase" EntityType="EEModelMain.Purchase" />
<EntitySet Name="HolidayLIst" EntityType="EEModelMain.HolidayLIst" />
</EntityContainer>
<EntityType Name="EETGW_LoginInfo">
<Key>
@@ -640,6 +654,7 @@
<Property Name="EB_RepairTime" Type="Double" />
<Property Name="EB_ConstNew" Type="Double" />
<Property Name="EB_BoardName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
<Property Name="bAlert" Type="Boolean" />
</EntityType>
<EntityType Name="ProjectsHistory">
<Key>
@@ -758,6 +773,17 @@
<Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
<Property Name="inqty" Type="Int32" />
</EntityType>
<EntityType Name="HolidayLIst">
<Key>
<PropertyRef Name="idx" />
</Key>
<Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="free" Type="Boolean" />
<Property Name="memo" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
<Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
</EntityType>
</Schema>
</edmx:ConceptualModels>
<!-- C-S mapping content -->
@@ -935,6 +961,7 @@
<EntitySetMapping Name="Projects">
<EntityTypeMapping TypeName="EEModelMain.Projects">
<MappingFragment StoreEntitySet="Projects">
<ScalarProperty Name="bAlert" ColumnName="bAlert" />
<ScalarProperty Name="EB_BoardName" ColumnName="EB_BoardName" />
<ScalarProperty Name="EB_ConstNew" ColumnName="EB_ConstNew" />
<ScalarProperty Name="EB_RepairTime" ColumnName="EB_RepairTime" />
@@ -1111,6 +1138,18 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="HolidayLIst">
<EntityTypeMapping TypeName="EEModelMain.HolidayLIst">
<MappingFragment StoreEntitySet="HolidayLIst">
<ScalarProperty Name="wdate" ColumnName="wdate" />
<ScalarProperty Name="wuid" ColumnName="wuid" />
<ScalarProperty Name="memo" ColumnName="memo" />
<ScalarProperty Name="free" ColumnName="free" />
<ScalarProperty Name="pdate" ColumnName="pdate" />
<ScalarProperty Name="idx" ColumnName="idx" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
</EntityContainerMapping>
</Mapping>
</edmx:Mappings>

1
Project/AdoNetEFMain.edmx.diagram
View File

@@ -19,6 +19,7 @@
<EntityTypeShape EntityType="EEModelMain.ProjectsMailList" Width="1.5" PointX="0.75" PointY="11.75" />
<EntityTypeShape EntityType="EEModelMain.ProjectsPart" Width="1.5" PointX="11.75" PointY="3.75" />
<EntityTypeShape EntityType="EEModelMain.Purchase" Width="1.5" PointX="5.75" PointY="11.75" />
<EntityTypeShape EntityType="EEModelMain.HolidayLIst" Width="1.5" PointX="12.375" PointY="11.75" />
</Diagram>
</edmx:Diagrams>
</edmx:Designer>

10
Project/DataSet1.xsd
View File

@@ -4,7 +4,7 @@
<xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
<DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<Connections>
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="gwcs" IsAppSettingsProperty="true" Modifier="Assembly" Name="gwcs (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.WebServer.Properties.Settings.GlobalReference.Default.gwcs" Provider="System.Data.SqlClient" />
<Connection AppSettingsObjectName="Settings" AppSettingsPropertyName="gwcs" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="gwcs (Settings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.WebServer.Properties.Settings.GlobalReference.Default.gwcs" Provider="System.Data.SqlClient" />
</Connections>
<Tables>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="vGroupUserTableAdapter" GeneratorDataComponentClassName="vGroupUserTableAdapter" Name="vGroupUser" UserDataComponentName="vGroupUserTableAdapter">
@@ -54,7 +54,7 @@ WHERE (gcode = @gcode) AND (ISNULL(dept, '') LIKE @dept) AND (ISNULL(processs,
<xs:element name="DataSet1" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DataSet1" msprop:Generator_UserDSName="DataSet1">
<xs:complexType>
<xs:choice minOccurs="0" maxOccurs="unbounded">
<xs:element name="ResultData" msprop:Generator_TableClassName="ResultDataDataTable" msprop:Generator_TableVarName="tableResultData" msprop:Generator_RowChangedName="ResultDataRowChanged" msprop:Generator_TablePropName="ResultData" msprop:Generator_RowDeletingName="ResultDataRowDeleting" msprop:Generator_RowChangingName="ResultDataRowChanging" msprop:Generator_RowEvHandlerName="ResultDataRowChangeEventHandler" msprop:Generator_RowDeletedName="ResultDataRowDeleted" msprop:Generator_RowClassName="ResultDataRow" msprop:Generator_UserTableName="ResultData" msprop:Generator_RowEvArgName="ResultDataRowChangeEvent">
<xs:element name="ResultData" msprop:Generator_TableClassName="ResultDataDataTable" msprop:Generator_TableVarName="tableResultData" msprop:Generator_TablePropName="ResultData" msprop:Generator_RowDeletingName="ResultDataRowDeleting" msprop:Generator_RowChangingName="ResultDataRowChanging" msprop:Generator_RowEvHandlerName="ResultDataRowChangeEventHandler" msprop:Generator_RowDeletedName="ResultDataRowDeleted" msprop:Generator_UserTableName="ResultData" msprop:Generator_RowChangedName="ResultDataRowChanged" msprop:Generator_RowEvArgName="ResultDataRowChangeEvent" msprop:Generator_RowClassName="ResultDataRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -68,7 +68,7 @@ WHERE (gcode = @gcode) AND (ISNULL(dept, '') LIKE @dept) AND (ISNULL(processs,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_RowClassName="UsersRow" msprop:Generator_UserTableName="Users" msprop:Generator_RowEvArgName="UsersRowChangeEvent">
<xs:element name="Users" msprop:Generator_TableClassName="UsersDataTable" msprop:Generator_TableVarName="tableUsers" msprop:Generator_TablePropName="Users" msprop:Generator_RowDeletingName="UsersRowDeleting" msprop:Generator_RowChangingName="UsersRowChanging" msprop:Generator_RowEvHandlerName="UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="UsersRowDeleted" msprop:Generator_UserTableName="Users" msprop:Generator_RowChangedName="UsersRowChanged" msprop:Generator_RowEvArgName="UsersRowChangeEvent" msprop:Generator_RowClassName="UsersRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -78,7 +78,7 @@ WHERE (gcode = @gcode) AND (ISNULL(dept, '') LIKE @dept) AND (ISNULL(processs,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="Model" msprop:Generator_TableClassName="ModelDataTable" msprop:Generator_TableVarName="tableModel" msprop:Generator_RowChangedName="ModelRowChanged" msprop:Generator_TablePropName="Model" msprop:Generator_RowDeletingName="ModelRowDeleting" msprop:Generator_RowChangingName="ModelRowChanging" msprop:Generator_RowEvHandlerName="ModelRowChangeEventHandler" msprop:Generator_RowDeletedName="ModelRowDeleted" msprop:Generator_RowClassName="ModelRow" msprop:Generator_UserTableName="Model" msprop:Generator_RowEvArgName="ModelRowChangeEvent">
<xs:element name="Model" msprop:Generator_TableClassName="ModelDataTable" msprop:Generator_TableVarName="tableModel" msprop:Generator_TablePropName="Model" msprop:Generator_RowDeletingName="ModelRowDeleting" msprop:Generator_RowChangingName="ModelRowChanging" msprop:Generator_RowEvHandlerName="ModelRowChangeEventHandler" msprop:Generator_RowDeletedName="ModelRowDeleted" msprop:Generator_UserTableName="Model" msprop:Generator_RowChangedName="ModelRowChanged" msprop:Generator_RowEvArgName="ModelRowChangeEvent" msprop:Generator_RowClassName="ModelRow">
<xs:complexType>
<xs:sequence>
<xs:element name="idx" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnidx" msprop:Generator_ColumnPropNameInRow="idx" msprop:Generator_ColumnPropNameInTable="idxColumn" msprop:Generator_UserColumnName="idx" type="xs:int" />
@@ -87,7 +87,7 @@ WHERE (gcode = @gcode) AND (ISNULL(dept, '') LIKE @dept) AND (ISNULL(processs,
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="vGroupUser" msprop:Generator_TableClassName="vGroupUserDataTable" msprop:Generator_TableVarName="tablevGroupUser" msprop:Generator_TablePropName="vGroupUser" msprop:Generator_RowDeletingName="vGroupUserRowDeleting" msprop:Generator_RowChangingName="vGroupUserRowChanging" msprop:Generator_RowEvHandlerName="vGroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vGroupUserRowDeleted" msprop:Generator_UserTableName="vGroupUser" msprop:Generator_RowChangedName="vGroupUserRowChanged" msprop:Generator_RowEvArgName="vGroupUserRowChangeEvent" msprop:Generator_RowClassName="vGroupUserRow">
<xs:element name="vGroupUser" msprop:Generator_TableClassName="vGroupUserDataTable" msprop:Generator_TableVarName="tablevGroupUser" msprop:Generator_RowChangedName="vGroupUserRowChanged" msprop:Generator_TablePropName="vGroupUser" msprop:Generator_RowDeletingName="vGroupUserRowDeleting" msprop:Generator_RowChangingName="vGroupUserRowChanging" msprop:Generator_RowEvHandlerName="vGroupUserRowChangeEventHandler" msprop:Generator_RowDeletedName="vGroupUserRowDeleted" msprop:Generator_RowClassName="vGroupUserRow" msprop:Generator_UserTableName="vGroupUser" msprop:Generator_RowEvArgName="vGroupUserRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="gcode" msprop:Generator_ColumnVarNameInTable="columngcode" msprop:Generator_ColumnPropNameInRow="gcode" msprop:Generator_ColumnPropNameInTable="gcodeColumn" msprop:Generator_UserColumnName="gcode">

96
Project/Dialog/fLogin.cs
View File

@@ -137,6 +137,23 @@ namespace Project.Dialog
return;
}
if (userdr.outdate.isEmpty() == false)
{
if (DateTime.TryParse(userdr.outdate, out DateTime dtout))
{
if (DateTime.Now > dtout)
{
Util.MsgE("퇴사정보로 인해 이 계정은 로그인할 수 없습니다");
return;
}
}
else
{
Util.MsgE("퇴사일자가 입력되었지만 정상 문자열이 아니라서 진행할 수 없습니다");
return;
}
}
FCOMMON.info.Login.no = userdr.id;
FCOMMON.info.Login.nameK = userdr.name;
FCOMMON.info.Login.dept = cmbDept.Text;// userdr.dept;// cmbDept.Text;
@@ -153,13 +170,13 @@ namespace Project.Dialog
FCOMMON.info.Login.permission = 0;
FCOMMON.info.Login.gpermission = int.Parse(gperm);
FCOMMON.info.datapath = Pub.setting.SharedDataPath;
if(FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
if (FCOMMON.info.datapath.isEmpty() && gCode == "EET1P") //210524
FCOMMON.info.datapath = @"\\k4fs3201n\k4bpartcenter$";
using (var dbEnity = new EEEntitiesMain())
{
var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault();
if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자":"");
if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자" : "");
else FCOMMON.info.Login.process = drGrpUser.Process;
}
@@ -167,7 +184,10 @@ namespace Project.Dialog
AddLoginInfo();
//210221
MakeAutoJobReport();
MakeAutoJobReportbyLogin();
//210613
MakeAutoJobReportByAuto();
DialogResult = DialogResult.OK;
}
@@ -178,7 +198,73 @@ namespace Project.Dialog
}
}
void MakeAutoJobReport()
/// <summary>
/// 무조건 업무일지를 자동으로 작성하는 경우
/// </summary>
void MakeAutoJobReportByAuto()
{
//누군가가 로그인하면 당일 자동 생성되어야할 유저의 데이터를 기록한다.
var dbi = new EEEntitiesMain();
var db = new EEEntitiesMain();
var nd = DateTime.Now.ToShortDateString();
//이 날짜가 휴일인지 체크한다.
var Holyinfo = db.HolidayLIst.Where(t => t.pdate == nd).FirstOrDefault();
if (Holyinfo != null && Holyinfo.free != null && (bool)(Holyinfo.free)) return;
//토,일은 처리하지 않음
if (DateTime.Now.DayOfWeek == DayOfWeek.Saturday || DateTime.Now.DayOfWeek == DayOfWeek.Sunday) return;
var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable==true && t.autoinput == "A" && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
foreach (var dr in rows)
{
//퇴사자 확인
var userdata = db.vGroupUser.Where(t => t.id == dr.uid).FirstOrDefault();
if (userdata != null && string.IsNullOrEmpty(userdata.outdate) == false) continue;
//오늘자 자동생성된 데이터가 있다면 처리하지 않는다
if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.pdate == nd && t.uid == dr.uid && t.autoinput == true).Any()) continue;
//이데이터를 그대로 생성해준다.
var newdr = new JobReport();
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.wuid = dr.uid;// FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = nd;
newdr.import = false;
newdr.hrs = dr.hrs;
newdr.type = dr.type;//210305 누락분 추가
newdr.ot = dr.ot;
newdr.process = dr.process;
newdr.projectName = dr.projectName;
newdr.pidx = dr.pidx;
newdr.package = dr.package;
newdr.autoinput = true;
newdr.description = dr.description;
newdr.description2 = dr.description2;
newdr.remark = dr.remark;
newdr.requestpart = dr.requestpart;
newdr.status = dr.status;
newdr.tag = dr.tag;
newdr.uid = dr.uid;
dbi.JobReport.Add(newdr);
dbi.SaveChanges();
}
dbi.Dispose();
db.Dispose();
}
/// <summary>
/// 로그인으로 업무일지를 작성하는 경우
/// </summary>
void MakeAutoJobReportbyLogin()
{
//자동로그인 업무일지 기록 기능 추가 = 210220
//select* from EETGW_JobReport_AutoInput where gcode = 'EET1P' and pdate <= '2021-02-20' and(edate is null or edate > '2021-02-20') and autoinput = 'L'
@@ -189,7 +275,7 @@ namespace Project.Dialog
t.uid == FCOMMON.info.Login.no &&
t.pdate == nd).Any() == false)
{
var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.autoinput == "L" && t.uid == FCOMMON.info.Login.no && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
var rows = db.EETGW_JobReport_AutoInput.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.enable == true && t.autoinput == "L" && t.uid == FCOMMON.info.Login.no && t.pdate.CompareTo(nd) <= 0 && (string.IsNullOrEmpty(t.edate) == true || t.edate.CompareTo(nd) > 0));
foreach (var dr in rows)
{
//이데이터를 그대로 생성해준다.

17
Project/EETGW.csproj
View File

@@ -395,11 +395,14 @@
<Compile Include="fSetting.Designer.cs">
<DependentUpon>fSetting.cs</DependentUpon>
</Compile>
<Compile Include="HolidayLIst.cs">
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="Items.cs">
<DependentUpon>ModelPurchase.tt</DependentUpon>
</Compile>
<Compile Include="JobReport.cs">
<DependentUpon>ModelJobreport.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="Language\Lang.cs" />
<Compile Include="Manager\DataBaseManager.cs" />
@@ -472,22 +475,22 @@
<Compile Include="OWIN\StartupSSE.cs" />
<Compile Include="Program.cs" />
<Compile Include="Projects.cs">
<DependentUpon>ModelProject.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="ProjectsHistory.cs">
<DependentUpon>ModelProject.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="ProjectsIOMap.cs">
<DependentUpon>ModelProject.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="ProjectsMailList.cs">
<DependentUpon>ModelProject.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="ProjectsPart.cs">
<DependentUpon>ModelProject.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="Purchase.cs">
<DependentUpon>ModelPurchase.tt</DependentUpon>
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="Settings.cs" />
<Compile Include="SqlServerTypes\Loader.cs" />

24
Project/HolidayLIst.cs Normal file
View File

@@ -0,0 +1,24 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 이 코드는 템플릿에서 생성되었습니다.
//
// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Project
{
using System;
using System.Collections.Generic;
public partial class HolidayLIst
{
public int idx { get; set; }
public string pdate { get; set; }
public Nullable<bool> free { get; set; }
public string memo { get; set; }
public string wuid { get; set; }
public System.DateTime wdate { get; set; }
}
}

1
Project/Projects.cs
View File

@@ -65,5 +65,6 @@ namespace Project
public Nullable<double> EB_RepairTime { get; set; }
public Nullable<double> EB_ConstNew { get; set; }
public string EB_BoardName { get; set; }
public Nullable<bool> bAlert { get; set; }
}
}

4
Project/Properties/AssemblyInfo.cs
View File

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

2327
Project/dsMSSQL.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

2077
Project/dsMSSQL.xsd
View File

File diff suppressed because it is too large Load Diff

23
Project/dsMSSQL.xss
View File

@@ -4,18 +4,19 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-8" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="2" ViewPortY="-21" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Users" ZOrder="5" X="998" Y="60" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
<Shape ID="DesignTable:Projects" ZOrder="10" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
<Shape ID="DesignTable:Items" ZOrder="4" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:Inventory" ZOrder="9" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:LineCode" ZOrder="1" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
<Shape ID="DesignTable:UserGroup" ZOrder="7" X="396" Y="394" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
<Shape ID="DesignTable:SPMaster" ZOrder="6" X="772" Y="337" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_GroupUser" ZOrder="2" X="861" Y="34" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vGroupUser" ZOrder="3" X="938" Y="-5" Height="305" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="8" X="673" Y="48" Height="220" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:Users" ZOrder="3" X="997" Y="61" Height="651" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="429" />
<Shape ID="DesignTable:Projects" ZOrder="11" X="208" Y="0" Height="149" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="59" />
<Shape ID="DesignTable:Items" ZOrder="7" X="205" Y="174" Height="476" Width="184" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:Inventory" ZOrder="10" X="389" Y="17" Height="362" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
<Shape ID="DesignTable:LineCode" ZOrder="4" X="586" Y="429" Height="224" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="156" />
<Shape ID="DesignTable:UserGroup" ZOrder="8" X="396" Y="394" Height="263" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="173" />
<Shape ID="DesignTable:SPMaster" ZOrder="2" X="802" Y="331" Height="324" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:EETGW_GroupUser" ZOrder="5" X="12" Y="283" Height="267" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:vGroupUser" ZOrder="6" X="938" Y="-5" Height="305" Width="214" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignSources:QueriesTableAdapter" ZOrder="9" X="673" Y="48" Height="220" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:JobReport" ZOrder="1" X="1232" Y="18" Height="305" Width="205" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
</Shapes>
<Connectors />
</DiagramLayout>

122
SubProject/FPJ0000/JobReport_/fJobReport.Designer.cs generated
View File

@@ -30,20 +30,20 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport));
FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -69,8 +69,7 @@
this.btReportDay = new System.Windows.Forms.ToolStripButton();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton5 = new System.Windows.Forms.ToolStripDropDownButton();
this.k5DailyFormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.btImport = new System.Windows.Forms.ToolStripButton();
this.cm = new System.Windows.Forms.ContextMenuStrip(this.components);
this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
@@ -107,7 +106,7 @@
this.태그자료만조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.btImport = new System.Windows.Forms.ToolStripButton();
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -353,24 +352,15 @@
this.toolStripButton3.Text = "적정인원보고서";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// toolStripButton5
// btImport
//
this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton5.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.k5DailyFormToolStripMenuItem});
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5";
this.toolStripButton5.Size = new System.Drawing.Size(72, 22);
this.toolStripButton5.Text = "보고서";
this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// k5DailyFormToolStripMenuItem
//
this.k5DailyFormToolStripMenuItem.Name = "k5DailyFormToolStripMenuItem";
this.k5DailyFormToolStripMenuItem.Size = new System.Drawing.Size(147, 22);
this.k5DailyFormToolStripMenuItem.Text = "K5 DailyForm";
this.k5DailyFormToolStripMenuItem.Click += new System.EventHandler(this.k5DailyFormToolStripMenuItem_Click);
this.btImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.btImport.Image = ((System.Drawing.Image)(resources.GetObject("btImport.Image")));
this.btImport.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btImport.Name = "btImport";
this.btImport.Size = new System.Drawing.Size(23, 22);
this.btImport.Text = "가져오기";
this.btImport.Click += new System.EventHandler(this.btImport_Click);
//
// cm
//
@@ -553,82 +543,82 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "비고";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "#";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType23;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜";
this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F;
this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType24;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW";
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType25;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "담당";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType26;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart";
this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서";
this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F;
this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType27;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package";
this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지";
this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType28;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status";
this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태";
this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType29;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type";
this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태";
this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F;
this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType30;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "process";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(7).Label = "업무분류";
this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Width = 80F;
this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType31;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "projectName";
this.fpSpread1_Sheet1.Columns.Get(8).Label = "프로젝트(아이템)";
this.fpSpread1_Sheet1.Columns.Get(8).Width = 158F;
this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType7.DecimalPlaces = 0;
numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType7.MaximumValue = 2147483647D;
numberCellType7.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType7;
numberCellType1.DecimalPlaces = 0;
numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType1.MaximumValue = 2147483647D;
numberCellType1.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType1;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pidx";
this.fpSpread1_Sheet1.Columns.Get(9).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pidx";
this.fpSpread1_Sheet1.Columns.Get(9).Width = 39F;
numberCellType8.MaximumValue = 999999999999999D;
numberCellType8.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType8;
numberCellType2.MaximumValue = 999999999999999D;
numberCellType2.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType2;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "hrs";
this.fpSpread1_Sheet1.Columns.Get(10).Label = "시간";
this.fpSpread1_Sheet1.Columns.Get(10).Width = 52F;
numberCellType9.MaximumValue = 999999999999999D;
numberCellType9.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType9;
numberCellType3.MaximumValue = 999999999999999D;
numberCellType3.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "ot";
this.fpSpread1_Sheet1.Columns.Get(11).ForeColor = System.Drawing.Color.Red;
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "초과";
this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType32;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "description";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(12).Label = "비고";
this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).Width = 113F;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType33;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "tag";
this.fpSpread1_Sheet1.Columns.Get(13).Label = "#";
this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
@@ -793,15 +783,16 @@
this.richTextBox1.TabIndex = 5;
this.richTextBox1.Text = "";
//
// btImport
// toolStripButton5
//
this.btImport.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.btImport.Image = ((System.Drawing.Image)(resources.GetObject("btImport.Image")));
this.btImport.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btImport.Name = "btImport";
this.btImport.Size = new System.Drawing.Size(23, 22);
this.btImport.Text = "가져오기";
this.btImport.Click += new System.EventHandler(this.btImport_Click);
this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton5.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton5.Image")));
this.toolStripButton5.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton5.Name = "toolStripButton5";
this.toolStripButton5.Size = new System.Drawing.Size(63, 22);
this.toolStripButton5.Text = "보고서";
this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
//
// fJobReport
//
@@ -894,8 +885,7 @@
private System.Windows.Forms.ToolStripLabel toolStripLabel4;
private System.Windows.Forms.ToolStripTextBox tbProcess;
private System.Windows.Forms.ToolStripButton toolStripButton4;
private System.Windows.Forms.ToolStripDropDownButton toolStripButton5;
private System.Windows.Forms.ToolStripMenuItem k5DailyFormToolStripMenuItem;
private System.Windows.Forms.ToolStripButton btImport;
private System.Windows.Forms.ToolStripButton toolStripButton5;
}
}

9
SubProject/FPJ0000/JobReport_/fJobReport.cs
View File

@@ -269,9 +269,6 @@ namespace FPJ0000
da.Fill(this.dsMSSQL.JobReport);
dsMSSQL.JobReport.AcceptChanges();
//if (tagonly == false)
// this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode);
//else
@@ -678,5 +675,11 @@ namespace FPJ0000
{
}
private void toolStripButton5_Click(object sender, EventArgs e)
{
var f = new JobReport_.rK5Dailyform();
f.Show();
}
}
}

31
SubProject/FPJ0000/JobReport_/fJobReport.resx
View File

@@ -260,20 +260,20 @@
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL6SURBVDhPhZLbT9NgGMZ3pX+CQS+8NBqF4IwavVAmh4HG
MwpBZMAYBARdYB4SFTOmqIiCBJaoMRKNF2qMhzHUATLGZIvDeJyKiMjJgM6NdW23tvPxa7cwTEh8k1++
i6/PL32fViZOynGrakudw7LtguN3Rq2DIScrUS+eTnZbXR+bcc7+fr3O1rgs8848KTR70k/32qb87K9J
LyV4AkF4qBi//CIsPk74ceLRCFSXPtHKcvP8aDQym8/apzzTtNA3zMH5nYdzhIdjmIf9WwjWL0E8cQcQ
5AHTJwYnHnxH4WU3848kzWBlpukQ+kcFvBrlycnjpSQJoWcwiGdumgjC6J8Q4BznYDCPQHGs67YUzqpP
GtpTm/lH07ILhc270fy0FTX366GojkcSQWlYhxT9ajSYGqRVKJbHpJdGyrEeXhLsrVPc63rXhraBa2h2
VEmSvKYMVN3KRUVrNtTG7SgwFsD0ZhJt7yk8fjsNH+kpVd/LSgJlo3L+1jMHBcfnbtx8p8d5a7kkUbVs
JuEdKLlSDNtgQFqlc4CBhfTgDXBIrXkREYiTfraH1V7Ph2vQDqPzMGo7KpFVvwmqpky4hmm4SLFiwbav
kU48RJCinyXYcLKaW3N0MXIblej/2gdDdyn0Zi2yLyaj1foQr8d4uEixfd84vCBM+TkoTkUFK3VxGrlu
ESpu5GBfSzpyGtIkidacC939YvImyRDv+0cEvBQ/McFPilx3xB4RyHULxuS6heShOMir4rDzfDLKrubD
5rbAYDmK0rv5ULfshYsInOTfcBABy4WxWmuNrbDxSC874WPxZkyQ6Pk8jkPXS1BEghpjNipvHJi5E6FD
AhIPPosJ1lRa2VFPTPA/AmSFhGJzTLBW+5wemPD9mevhuaCYYHhFnomKxkmRJR1D49O0f+CHPzz0k8HQ
FIPBKD8pTkJsnmIFeCk2HAyFfEv2t3+IxmWyVSVPyxLUTzoSNRZPgqaNnaEoQnyRKYLaxC5Vt3uXF7R3
xuebC2UymewvcCKiNqMNhYIAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVDhPhZLrS1NhHMf3qv6EsF70UohSSiupF5WpTQ3s
ZipleZlTLLWhK4PMmJNMW2iiQkUkRS8qonRObV6ac7nRjEwzM++38DJ1l3Me3Tnz23PORisI+sGH58Vz
vh/O73uORJjIG4aU4xVmfdxd87K01MzSk4hohNNC4ip6SMwd08BBpbFqR/yLTWLoz4ku7TYuOMjST5ud
t7nWYHP6WXIIEHybc6CoYQoXNEOMNEe32Rf1TmyZaWFxxcn3TLhhmeRgmeJgnuBgGl+H4ccaWgZdWOMA
7RCLojeTSL8/wP4liVJ1snZmHb3TPD5Nc/Tk8FGUrKNrZA3vBhkq8KB3jodl1g21bgrh1zuei+FEzZGx
s6XxG/La00ivOYOa1nqUvNYgvDgIRyhS9QFEqvahUlspruIkHOZXGERe6+JEQUJF+KuO/iY0DT9CjblA
lFysjkHBs2Tk1idBVncCaXVp0PbNo2nAicYvdqzSnqJU3UQUSKukm4+r83jz9/d42q9CuSFHlKTUxtLw
SWQ9yIRxxCWu0j7MQk97WHG5EVXywSsQJrqsiygep8I6YkKd5Sput+UjUXMUKdXxsE4wsNJihYKNo95O
bFQQqfpDcOhmsXt/4XYkV0nRO9oD9ftsqHQKJN2LQL3hLT7PcLDSYnvG3fhAWXC4EX7LJ9ijDJCHKLch
98k5nK+NxrnKY6JEoUuG8nUmfZMICPe9Uzw+Cp+Y4qBFhilNXkGIcstMiHIrfSgAIQUBOFUegUsPU2Ec
1EOtL0T2y1TIahNgpQIL/TfMVEDcHoTmGfwrHFZ2k7lVgr4ZXqTr+yyuPM5CBg3K65KQ/+Ty7zsBZp1H
cF6LX7BXYSDTNr/gf7joCsGZWr8gTNHJDM0sb/zr4X9hd7GeXRe1Tl+cFpnVNjZtZxxDs6uesUUWYwss
RnwsOt0iQvNOwsNmZzwsIauBF5q/+uISSWhW66VgWUvbbrneFixvJL/J8BKU0eBF1kACZc0rO9Oa24NS
dekSiUTyC9B/oc2h827VAAAAAElFTkSuQmCC
</value>
</data>
<data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -288,9 +288,6 @@
QmCC
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>325, 17</value>
</metadata>

1552
SubProject/FPJ0000/JobReport_/fJobReportImport.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

17
SubProject/FPJ0000/JobReport_/fJobReportImport.cs
View File

@@ -121,7 +121,18 @@ namespace FPJ0000.JobReport_
//날짜읽기
var colidx = 0;//
if (nuddate.Value > 0)
if (nudMon.Value > 0 && nuddate.Value > 0) //월이 지정되 ㄴ경우
{
var colidxm = (int)(nudMon.Value - 1);
colidx = (int)(nuddate.Value - 1);
var monstr = sheet.readStr(r, colidxm);
var dayval = sheet.readNum(r, colidx);
var daystr = string.Format("{0}-{1}-{2}",DateTime.Now.Year,monstr,dayval);
var dt = DateTime.Parse(daystr);
dr.pdate = dt.ToShortDateString();
}
else if (nuddate.Value > 0)
{
colidx = (int)(nuddate.Value - 1);
if (sheet.isDate(r, colidx))
@@ -225,11 +236,11 @@ namespace FPJ0000.JobReport_
if (nudname.Value > 0)
{
colidx = (int)(nudname.Value - 1);
if(string.IsNullOrEmpty(dr.uid)==true)
if (string.IsNullOrEmpty(dr.uid) == true)
{
var username = sheet.readStr(r, colidx);
var users = dt_users.Select("name='" + username + "'");
if(users.Length == 1)
if (users.Length == 1)
{
dr.uid = users[0]["id"].ToString();
}

12
SubProject/FPJ0000/JobReport_/fJobReportImport.resx
View File

@@ -120,6 +120,9 @@
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>83, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>147, 17</value>
</metadata>
<metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
@@ -136,12 +139,6 @@
rkJggg==
</value>
</data>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>83, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>147, 17</value>
</metadata>
<data name="bindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -194,9 +191,6 @@
8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>147, 17</value>
</metadata>
<metadata name="jobReportTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>230, 17</value>
</metadata>

25
SubProject/FPJ0000/JobReport_/rK5Dailyform.Designer.cs generated
View File

@@ -55,6 +55,8 @@
this.reportViewer1 = new Microsoft.Reporting.WinForms.ReportViewer();
this.progressBar1 = new System.Windows.Forms.ProgressBar();
this.chart1 = new System.Windows.Forms.DataVisualization.Charting.Chart();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.chkallto = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsReport)).BeginInit();
this.toolStrip1.SuspendLayout();
@@ -84,7 +86,9 @@
this.btSearch,
this.toolStripButton2,
this.toolStripButton1,
this.toolStripButton3});
this.toolStripButton3,
this.toolStripSeparator1,
this.chkallto});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(1093, 37);
@@ -239,6 +243,23 @@
this.chart1.Text = "chart1";
this.chart1.Visible = false;
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(6, 37);
//
// chkallto
//
this.chkallto.Checked = true;
this.chkallto.CheckOnClick = true;
this.chkallto.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkallto.Image = global::FPJ0000.Properties.Resources.accept;
this.chkallto.ImageTransparentColor = System.Drawing.Color.Magenta;
this.chkallto.Name = "chkallto";
this.chkallto.Size = new System.Drawing.Size(189, 34);
this.chkallto.Text = "근무인원에 휴가+파견 포함";
this.chkallto.Click += new System.EventHandler(this.chkallto_Click);
//
// rK5Dailyform
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -280,5 +301,7 @@
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.DataVisualization.Charting.Chart chart1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripButton chkallto;
}
}

45
SubProject/FPJ0000/JobReport_/rK5Dailyform.cs
View File

@@ -76,7 +76,12 @@ namespace FPJ0000.JobReport_
var drDate = item.FirstOrDefault();
//근무일원
var 근무인원 = item.GroupBy(t => t.id).Count();
var 휴가인원 = item.Where(t => t.svalue == "휴가").Count();
var 파견인원 = item.Where(t => t.svalue == "파견").Count();
var 전체인원 = item.GroupBy(t => t.id).Count();
var 근무인원 = 전체인원 - 휴가인원 - 파견인원;
if (chkallto.Checked) 근무인원 = 전체인원;
//var 근무인원 = 전체인원;
//완료
var newdr = this.dsReport.K5DailyForm.NewK5DailyFormRow();
@@ -259,9 +264,37 @@ namespace FPJ0000.JobReport_
newdr10.graph = false;
dsReport.K5DailyForm.AddK5DailyFormRow(newdr10);
//휴가
newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow();
newdr10.Grp = "3.휴가";
newdr10.Item = "1.(p.s)";
newdr10.Format = "N0";
newdr10.Sign = "";
newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00");
newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00");
newdr10.value = 휴가인원;
newdr10.graph = false;
dsReport.K5DailyForm.AddK5DailyFormRow(newdr10);
//파견
newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow();
newdr10.Grp = "4.파견";
newdr10.Item = "1.(p.s)";
newdr10.Format = "N0";
newdr10.Sign = "";
newdr10.ww = item.Key.Substring(2, 2) + "-" + int.Parse(drDate.ww).ToString("00");
newdr10.pdate = int.Parse(item.Key.Substring(8, 2)).ToString("00");
newdr10.value = 파견인원;
newdr10.graph = false;
dsReport.K5DailyForm.AddK5DailyFormRow(newdr10);
//3.근무인원
newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow();
newdr10.Grp = "3.근무인원";
if (chkallto.Checked)
newdr10.Grp = "5.근무인원(전체)";
else
newdr10.Grp = "5.근무인원";
newdr10.Item = "1.(8hrs/p.s)";
newdr10.Format = "N0";
newdr10.Sign = "";
@@ -276,7 +309,7 @@ namespace FPJ0000.JobReport_
var v2 = (newdr5.value / (근무인원 * 8) + newdr6.value / (근무인원 * 8) + newdr7.value / (근무인원 * 8) + newdr8.value / (근무인원 * 8)) * 100.0;
newdr10 = this.dsReport.K5DailyForm.NewK5DailyFormRow();
newdr10.Grp = "4.TTL";
newdr10.Grp = "6.TTL";
newdr10.Item = "1.Working Utilization(%)";
newdr10.Format = "N1";
newdr10.Sign = "%";
@@ -364,5 +397,11 @@ namespace FPJ0000.JobReport_
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
dtED.Text = f.dtPick.SelectionStart.ToShortDateString();
}
private void chkallto_Click(object sender, EventArgs e)
{
//makedata();
}
}
}