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-06-02 09:34:43 +09:00
parent 6a5eb13a6c
commit 2b500ce303
4 changed files with 679 additions and 678 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
JobReportMailService/fJobReportDay.cs
View File

@@ -151,7 +151,8 @@ namespace JobReportMailService
var vGcode = gcodedata;
if (string.IsNullOrEmpty(vGcode)) continue;
//if (vGcode.Contains("K5") == false) continue;
if (vGcode.Contains("K5") == false) continue;
var MailJD = dtMailForm.Where(t => t.gcode == vGcode & t.cate == "JD").FirstOrDefault();
if (MailJD == null)

4
Project/Properties/AssemblyInfo.cs
View File

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

6
Project/_Common/fAddNewUser.cs
View File

@@ -53,7 +53,7 @@ namespace Project._Common
tbProcess.Text = db_guser.Process;
tbState.Text = db_guser.state;
//this.chkJobReport.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
this.chkUserSt.Checked = (db_guser.useUserState == null ? false : (bool)db_guser.useUserState);
this.chkUserSt.Checked = (db_guser.useJobReport == null ? false : (bool)db_guser.useJobReport);
}
this.Text = "사용자 정보 변경";
}
@@ -132,7 +132,7 @@ namespace Project._Common
{
drGuser.Process = this.tbProcess.Text.Trim();
drGuser.state = this.tbState.Text.Trim();
drGuser.useUserState = chkUserSt.Checked;
drGuser.useJobReport = chkUserSt.Checked;
//drGuser.useJobReport = chkJobReport.Checked;
}
else
@@ -153,7 +153,7 @@ namespace Project._Common
drGuser.state = this.tbState.Text.Trim();
drGuser.Process = this.tbProcess.Text.Trim();
//drGuser.useJobReport = this.chkJobReport.Checked;
drGuser.useUserState = this.chkUserSt.Checked;
drGuser.useJobReport = this.chkUserSt.Checked;
db.EETGW_GroupUser.Add(drGuser);
}

18
Project/_Common/fUserList.Designer.cs generated
View File

@@ -79,8 +79,8 @@
this.btRef = new System.Windows.Forms.ToolStripButton();
this.textBox1 = new System.Windows.Forms.TextBox();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.ta = new Project.dsMSSQLTableAdapters.vGroupUserTableAdapter();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -398,6 +398,10 @@
this.fpSpread1.VerticalScrollBar.Renderer = defaultScrollBarRenderer2;
this.fpSpread1.VisualStyles = FarPoint.Win.VisualStyles.Off;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
@@ -415,7 +419,7 @@
this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty;
this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty;
this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.Parent = "RowHeaderDefault";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "인원\r\n포함";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "업무일지";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "ID";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "상태";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "공정";
@@ -432,8 +436,8 @@
this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "HeaderDefault";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 33F;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "useUserState";
this.fpSpread1_Sheet1.Columns.Get(0).Label = "인원\r\n포함";
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "useJobReport";
this.fpSpread1_Sheet1.Columns.Get(0).Label = "업무일지";
this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "id";
@@ -520,10 +524,6 @@
this.fpSpread1_Sheet1.SheetCornerStyle.Parent = "RowHeaderDefault";
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// ta
//
this.ta.ClearBeforeFill = true;
//
// fUserList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -587,7 +587,7 @@
private dsMSSQLTableAdapters.vGroupUserTableAdapter ta;
private System.Windows.Forms.ToolStripButton btEdit;
private System.Windows.Forms.ToolStripButton btSave;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripButton btDel;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
}
}