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-02-22 20:13:19 +09:00
parent 55510b84b8
commit 71698b5d8b
138 changed files with 19619 additions and 6658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Project/AdoNetEFMain.Context.cs
View File

@@ -30,5 +30,7 @@ namespace Project
public virtual DbSet<Users> Users { get; set; }
public virtual DbSet<EETGW_GroupUser> EETGW_GroupUser { get; set; }
public virtual DbSet<vGroupUser> vGroupUser { get; set; }
public virtual DbSet<EETGW_JobReport_AutoInput> EETGW_JobReport_AutoInput { get; set; }
public virtual DbSet<JobReport> JobReport { get; set; }
}
}

168
Project/AdoNetEFMain.edmx
View File

@@ -20,6 +20,34 @@
<Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
<Property Name="wdate" Type="smalldatetime" Nullable="false" />
</EntityType>
<EntityType Name="EETGW_JobReport_AutoInput">
<Key>
<PropertyRef Name="idx" />
</Key>
<Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
<Property Name="pdate" Type="varchar" MaxLength="10" />
<Property Name="edate" Type="varchar" MaxLength="10" />
<Property Name="pidx" Type="int" />
<Property Name="projectName" Type="nvarchar" MaxLength="255" />
<Property Name="uid" Type="varchar" MaxLength="20" />
<Property Name="requestpart" Type="varchar" MaxLength="50" />
<Property Name="package" Type="varchar" MaxLength="50" />
<Property Name="status" Type="varchar" MaxLength="20" />
<Property Name="type" Type="varchar" MaxLength="50" />
<Property Name="process" Type="varchar" MaxLength="50" />
<Property Name="description" Type="nvarchar(max)" />
<Property Name="remark" Type="nvarchar" MaxLength="255" />
<Property Name="hrs" Type="float" />
<Property Name="ot" Type="float" />
<Property Name="import" Type="bit" />
<Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
<Property Name="wdate" Type="smalldatetime" Nullable="false" />
<Property Name="description2" Type="nvarchar(max)" />
<Property Name="tag" Type="varchar" MaxLength="255" />
<Property Name="autoinput" Type="char" MaxLength="1" />
<Property Name="enable" Type="bit" />
</EntityType>
<EntityType Name="EETGW_LoginInfo">
<Key>
<PropertyRef Name="idx" />
@@ -32,6 +60,32 @@
<Property Name="wuid" Type="varchar" MaxLength="20" />
<Property Name="wdate" Type="smalldatetime" />
</EntityType>
<EntityType Name="JobReport">
<Key>
<PropertyRef Name="idx" />
</Key>
<Property Name="idx" Type="int" StoreGeneratedPattern="Identity" Nullable="false" />
<Property Name="gcode" Type="varchar" MaxLength="10" Nullable="false" />
<Property Name="pdate" Type="varchar" MaxLength="10" />
<Property Name="pidx" Type="int" />
<Property Name="projectName" Type="nvarchar" MaxLength="255" />
<Property Name="uid" Type="varchar" MaxLength="20" />
<Property Name="requestpart" Type="varchar" MaxLength="50" />
<Property Name="package" Type="varchar" MaxLength="50" />
<Property Name="status" Type="varchar" MaxLength="20" />
<Property Name="type" Type="varchar" MaxLength="50" />
<Property Name="process" Type="varchar" MaxLength="50" />
<Property Name="description" Type="nvarchar(max)" />
<Property Name="remark" Type="nvarchar" MaxLength="255" />
<Property Name="hrs" Type="float" />
<Property Name="ot" Type="float" />
<Property Name="import" Type="bit" />
<Property Name="wuid" Type="varchar" MaxLength="20" Nullable="false" />
<Property Name="wdate" Type="smalldatetime" Nullable="false" />
<Property Name="description2" Type="nvarchar(max)" />
<Property Name="tag" Type="varchar" MaxLength="255" />
<Property Name="autoinput" Type="bit" />
</EntityType>
<EntityType Name="UserGroup">
<Key>
<PropertyRef Name="dept" />
@@ -98,7 +152,9 @@
</EntityType>
<EntityContainer Name="EEModelMainStoreContainer">
<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="JobReport" EntityType="Self.JobReport" Schema="dbo" store:Type="Tables" />
<EntitySet Name="UserGroup" EntityType="Self.UserGroup" Schema="dbo" store:Type="Tables" />
<EntitySet Name="Users" EntityType="Self.Users" Schema="dbo" store:Type="Tables" />
<EntitySet Name="vGroupUser" EntityType="Self.vGroupUser" store:Type="Views" store:Schema="dbo">
@@ -147,6 +203,8 @@
<EntitySet Name="Users" EntityType="EEModelMain.Users" />
<EntitySet Name="EETGW_GroupUser" EntityType="EEModelMain.EETGW_GroupUser" />
<EntitySet Name="vGroupUser" EntityType="EEModelMain.vGroupUser" />
<EntitySet Name="EETGW_JobReport_AutoInput" EntityType="EEModelMain.EETGW_JobReport_AutoInput" />
<EntitySet Name="JobReport" EntityType="EEModelMain.JobReport" />
</EntityContainer>
<EntityType Name="EETGW_LoginInfo">
<Key>
@@ -227,6 +285,60 @@
<Property Name="useJobReport" Type="Boolean" />
<Property Name="useUserState" Type="Boolean" />
</EntityType>
<EntityType Name="EETGW_JobReport_AutoInput">
<Key>
<PropertyRef Name="idx" />
</Key>
<Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="edate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="pidx" Type="Int32" />
<Property Name="projectName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
<Property Name="uid" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="requestpart" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="package" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="status" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="type" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="process" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="description" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
<Property Name="remark" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
<Property Name="hrs" Type="Double" />
<Property Name="ot" Type="Double" />
<Property Name="import" Type="Boolean" />
<Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
<Property Name="description2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
<Property Name="tag" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
<Property Name="autoinput" Type="String" MaxLength="1" FixedLength="true" Unicode="false" />
<Property Name="enable" Type="Boolean" />
</EntityType>
<EntityType Name="JobReport">
<Key>
<PropertyRef Name="idx" />
</Key>
<Property Name="idx" Type="Int32" Nullable="false" annotation:StoreGeneratedPattern="Identity" />
<Property Name="gcode" Type="String" Nullable="false" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="pdate" Type="String" MaxLength="10" FixedLength="false" Unicode="false" />
<Property Name="pidx" Type="Int32" />
<Property Name="projectName" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
<Property Name="uid" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="requestpart" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="package" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="status" Type="String" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="type" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="process" Type="String" MaxLength="50" FixedLength="false" Unicode="false" />
<Property Name="description" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
<Property Name="remark" Type="String" MaxLength="255" FixedLength="false" Unicode="true" />
<Property Name="hrs" Type="Double" />
<Property Name="ot" Type="Double" />
<Property Name="import" Type="Boolean" />
<Property Name="wuid" Type="String" Nullable="false" MaxLength="20" FixedLength="false" Unicode="false" />
<Property Name="wdate" Type="DateTime" Nullable="false" Precision="0" />
<Property Name="description2" Type="String" MaxLength="Max" FixedLength="false" Unicode="true" />
<Property Name="tag" Type="String" MaxLength="255" FixedLength="false" Unicode="false" />
<Property Name="autoinput" Type="Boolean" />
</EntityType>
</Schema>
</edmx:ConceptualModels>
<!-- C-S mapping content -->
@@ -327,6 +439,62 @@
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="EETGW_JobReport_AutoInput">
<EntityTypeMapping TypeName="EEModelMain.EETGW_JobReport_AutoInput">
<MappingFragment StoreEntitySet="EETGW_JobReport_AutoInput">
<ScalarProperty Name="enable" ColumnName="enable" />
<ScalarProperty Name="autoinput" ColumnName="autoinput" />
<ScalarProperty Name="tag" ColumnName="tag" />
<ScalarProperty Name="description2" ColumnName="description2" />
<ScalarProperty Name="wdate" ColumnName="wdate" />
<ScalarProperty Name="wuid" ColumnName="wuid" />
<ScalarProperty Name="import" ColumnName="import" />
<ScalarProperty Name="ot" ColumnName="ot" />
<ScalarProperty Name="hrs" ColumnName="hrs" />
<ScalarProperty Name="remark" ColumnName="remark" />
<ScalarProperty Name="description" ColumnName="description" />
<ScalarProperty Name="process" ColumnName="process" />
<ScalarProperty Name="type" ColumnName="type" />
<ScalarProperty Name="status" ColumnName="status" />
<ScalarProperty Name="package" ColumnName="package" />
<ScalarProperty Name="requestpart" ColumnName="requestpart" />
<ScalarProperty Name="uid" ColumnName="uid" />
<ScalarProperty Name="projectName" ColumnName="projectName" />
<ScalarProperty Name="pidx" ColumnName="pidx" />
<ScalarProperty Name="edate" ColumnName="edate" />
<ScalarProperty Name="pdate" ColumnName="pdate" />
<ScalarProperty Name="gcode" ColumnName="gcode" />
<ScalarProperty Name="idx" ColumnName="idx" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
<EntitySetMapping Name="JobReport">
<EntityTypeMapping TypeName="EEModelMain.JobReport">
<MappingFragment StoreEntitySet="JobReport">
<ScalarProperty Name="autoinput" ColumnName="autoinput" />
<ScalarProperty Name="tag" ColumnName="tag" />
<ScalarProperty Name="description2" ColumnName="description2" />
<ScalarProperty Name="wdate" ColumnName="wdate" />
<ScalarProperty Name="wuid" ColumnName="wuid" />
<ScalarProperty Name="import" ColumnName="import" />
<ScalarProperty Name="ot" ColumnName="ot" />
<ScalarProperty Name="hrs" ColumnName="hrs" />
<ScalarProperty Name="remark" ColumnName="remark" />
<ScalarProperty Name="description" ColumnName="description" />
<ScalarProperty Name="process" ColumnName="process" />
<ScalarProperty Name="type" ColumnName="type" />
<ScalarProperty Name="status" ColumnName="status" />
<ScalarProperty Name="package" ColumnName="package" />
<ScalarProperty Name="requestpart" ColumnName="requestpart" />
<ScalarProperty Name="uid" ColumnName="uid" />
<ScalarProperty Name="projectName" ColumnName="projectName" />
<ScalarProperty Name="pidx" ColumnName="pidx" />
<ScalarProperty Name="pdate" ColumnName="pdate" />
<ScalarProperty Name="gcode" ColumnName="gcode" />
<ScalarProperty Name="idx" ColumnName="idx" />
</MappingFragment>
</EntityTypeMapping>
</EntitySetMapping>
</EntityContainerMapping>
</Mapping>
</edmx:Mappings>

2
Project/AdoNetEFMain.edmx.diagram
View File

@@ -10,6 +10,8 @@
<EntityTypeShape EntityType="EEModelMain.Users" Width="1.5" PointX="8.875" PointY="0.75" />
<EntityTypeShape EntityType="EEModelMain.EETGW_GroupUser" Width="1.5" PointX="0.75" PointY="0.75" />
<EntityTypeShape EntityType="EEModelMain.vGroupUser" Width="1.5" PointX="3.375" PointY="0.75" />
<EntityTypeShape EntityType="EEModelMain.EETGW_JobReport_AutoInput" Width="1.5" PointX="0.75" PointY="4.75" />
<EntityTypeShape EntityType="EEModelMain.JobReport" Width="1.5" PointX="5.375" PointY="3.75" />
</Diagram>
</edmx:Diagrams>
</edmx:Designer>

51
Project/Dialog/fLogin.cs
View File

@@ -151,6 +151,8 @@ namespace Project.Dialog
//로그인정보 기록
AddLoginInfo();
//210221
MakeAutoJobReport();
DialogResult = DialogResult.OK;
}
@@ -160,6 +162,55 @@ namespace Project.Dialog
DialogResult = System.Windows.Forms.DialogResult.Cancel;
}
}
void MakeAutoJobReport()
{
//자동로그인 업무일지 기록 기능 추가 = 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'
var db = new EEEntitiesMain();
var nd = DateTime.Now.ToShortDateString();
if (db.JobReport.Where(t => t.gcode == FCOMMON.info.Login.gcode &&
t.autoinput == true &&
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));
foreach (var dr in rows)
{
//이데이터를 그대로 생성해준다.
var newdr = new JobReport();
newdr.gcode = FCOMMON.info.Login.gcode;
newdr.wuid = FCOMMON.info.Login.no;
newdr.wdate = DateTime.Now;
newdr.pdate = nd;
newdr.import = false;
newdr.hrs = dr.hrs;
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;
db.JobReport.Add(newdr);
}
if (rows.Count() > 0)
{
db.SaveChanges();
Util.MsgI($"{rows.Count()} 건의 업무일지가 자동 생성 되었습니다\n업무일지는 로그인시 최초 1회 자동 등록됩니다\n" +
"자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다");
}
}
}
void AddLoginInfo()

6
Project/EETGW.csproj
View File

@@ -313,6 +313,9 @@
<Compile Include="EETGW_GroupUser.cs">
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="EETGW_JobReport_AutoInput.cs">
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="EETGW_LoginInfo.cs">
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
@@ -334,6 +337,9 @@
<Compile Include="fSetting.Designer.cs">
<DependentUpon>fSetting.cs</DependentUpon>
</Compile>
<Compile Include="JobReport.cs">
<DependentUpon>AdoNetEFMain.tt</DependentUpon>
</Compile>
<Compile Include="Language\Lang.cs" />
<Compile Include="Manager\DataBaseManager.cs" />
<Compile Include="Manager\keyValuedataTable.cs" />

41
Project/EETGW_JobReport_AutoInput.cs Normal file
View File

@@ -0,0 +1,41 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 이 코드는 템플릿에서 생성되었습니다.
//
// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Project
{
using System;
using System.Collections.Generic;
public partial class EETGW_JobReport_AutoInput
{
public int idx { get; set; }
public string gcode { get; set; }
public string pdate { get; set; }
public string edate { get; set; }
public Nullable<int> pidx { get; set; }
public string projectName { get; set; }
public string uid { get; set; }
public string requestpart { get; set; }
public string package { get; set; }
public string status { get; set; }
public string type { get; set; }
public string process { get; set; }
public string description { get; set; }
public string remark { get; set; }
public Nullable<double> hrs { get; set; }
public Nullable<double> ot { get; set; }
public Nullable<bool> import { get; set; }
public string wuid { get; set; }
public System.DateTime wdate { get; set; }
public string description2 { get; set; }
public string tag { get; set; }
public string autoinput { get; set; }
public Nullable<bool> enable { get; set; }
}
}

39
Project/JobReport.cs Normal file
View File

@@ -0,0 +1,39 @@
//------------------------------------------------------------------------------
// <auto-generated>
// 이 코드는 템플릿에서 생성되었습니다.
//
// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다.
// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Project
{
using System;
using System.Collections.Generic;
public partial class JobReport
{
public int idx { get; set; }
public string gcode { get; set; }
public string pdate { get; set; }
public Nullable<int> pidx { get; set; }
public string projectName { get; set; }
public string uid { get; set; }
public string requestpart { get; set; }
public string package { get; set; }
public string status { get; set; }
public string type { get; set; }
public string process { get; set; }
public string description { get; set; }
public string remark { get; set; }
public Nullable<double> hrs { get; set; }
public Nullable<double> ot { get; set; }
public Nullable<bool> import { get; set; }
public string wuid { get; set; }
public System.DateTime wdate { get; set; }
public string description2 { get; set; }
public string tag { get; set; }
public Nullable<bool> autoinput { get; set; }
}
}

4
Project/Properties/AssemblyInfo.cs
View File

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

20
Project/fMain.cs
View File

@@ -121,12 +121,18 @@ namespace Project
tmDisplay.Start(); //display timer
Func_Login();
Update_Site();
bw.RunWorkerAsync(); //background worker
//사용기록추적
Pub.CheckNRegister3(Application.ProductName, "chi", Application.ProductVersion);
//서버ON
try
{
@@ -384,7 +390,7 @@ namespace Project
{
string formkey = "EQBUMP";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.BUMP));
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.BUMP), "BUMP");
}
@@ -392,7 +398,7 @@ namespace Project
{
string formkey = "EQMOLD";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.MOLD));
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.MOLD), "MOLD_EOL");
}
@@ -402,7 +408,7 @@ namespace Project
string formkey = "EQFOL";
if (!ShowForm(formkey))
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.FOL));
AddForm(formkey, new FEQ0000.fEquipment(FEQ0000.fEquipment.eTabletype.FOL), "FOL");
}
@@ -582,7 +588,7 @@ namespace Project
}
return false;
}
void AddForm(string key, Form f)
void AddForm(string key, Form f, string Title = "")
{
f.TopLevel = false;
f.Dock = DockStyle.Fill;
@@ -590,7 +596,7 @@ namespace Project
f.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
f.FormClosed += f_FormClosed;
f.Tag = key;
this.tabControl1.TabPages.Add(key, f.Text);
this.tabControl1.TabPages.Add(key, (Title.isEmpty() ? f.Text : Title));
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].BorderStyle = BorderStyle.Fixed3D;
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Padding = new Padding(10, 10, 10, 10);
this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].BackColor = Color.LightGray;
@@ -716,7 +722,7 @@ namespace Project
private void 업무일지ToolStripMenuItem1_Click(object sender, EventArgs e)
{
}
private void 패치내역ToolStripMenuItem1_Click(object sender, EventArgs e)
@@ -727,7 +733,7 @@ namespace Project
private void workReportImportToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new FPJ0000.JobReport.fJobReportImport();
var f = new FPJ0000.JobReport_.fJobReportImport();
f.ShowDialog();
}