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-12-21 09:52:32 +09:00
parent 4cf24cedaf
commit 7e6f9e4bcb
36 changed files with 5115 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
SubProject/FPJ0000/OtConfirm/fOTConfirm.Designer.cs generated
View File

@@ -30,14 +30,14 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fOTConfirm));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle41 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle42 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle43 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle44 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle45 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle46 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle47 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle48 = new System.Windows.Forms.DataGridViewCellStyle();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -91,6 +91,7 @@
this.otStartDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.otEnd = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.descriptionDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -183,7 +184,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -226,7 +226,6 @@
// tbFind
//
this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbFind.Name = "tbFind";
this.tbFind.Size = new System.Drawing.Size(100, 25);
this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -244,12 +243,11 @@
// toolStripButton5
//
this.toolStripButton5.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton5.Enabled = false;
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.Size = new System.Drawing.Size(144, 22);
this.toolStripButton5.Text = "휴일/연장근무 집계표";
this.toolStripButton5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.toolStripButton5.Click += new System.EventHandler(this.toolStripButton5_Click);
//
@@ -316,6 +314,7 @@
this.toolStripLabel1,
this.tbProcess,
this.toolStripButton4,
this.toolStripSeparator3,
this.toolStripLabel3,
this.cmbUser,
this.btSearch,
@@ -338,7 +337,6 @@
// dtSD
//
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(90, 37);
this.dtSD.Text = "1982-11-23";
@@ -362,7 +360,6 @@
// dtED
//
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(90, 37);
this.dtED.Text = "1982-11-23";
@@ -390,14 +387,15 @@
this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(350, 37);
this.tbProcess.Size = new System.Drawing.Size(300, 37);
//
// toolStripButton4
//
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton4.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton4.Image")));
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(23, 34);
this.toolStripButton4.Size = new System.Drawing.Size(34, 34);
this.toolStripButton4.Text = "toolStripButton4";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
@@ -507,19 +505,19 @@
// pdateDataGridViewTextBoxColumn
//
this.pdateDataGridViewTextBoxColumn.DataPropertyName = "pdate";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle41.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.pdateDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle41;
this.pdateDataGridViewTextBoxColumn.HeaderText = "날짜";
this.pdateDataGridViewTextBoxColumn.Name = "pdateDataGridViewTextBoxColumn";
this.pdateDataGridViewTextBoxColumn.ReadOnly = true;
this.pdateDataGridViewTextBoxColumn.Width = 54;
this.pdateDataGridViewTextBoxColumn.Width = 51;
//
// wwDataGridViewTextBoxColumn
//
this.wwDataGridViewTextBoxColumn.DataPropertyName = "ww";
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle42.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle42.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.wwDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle42;
this.wwDataGridViewTextBoxColumn.HeaderText = "WW";
this.wwDataGridViewTextBoxColumn.Name = "wwDataGridViewTextBoxColumn";
this.wwDataGridViewTextBoxColumn.ReadOnly = true;
@@ -531,7 +529,7 @@
this.usernameDataGridViewTextBoxColumn.HeaderText = "담당";
this.usernameDataGridViewTextBoxColumn.Name = "usernameDataGridViewTextBoxColumn";
this.usernameDataGridViewTextBoxColumn.ReadOnly = true;
this.usernameDataGridViewTextBoxColumn.Width = 54;
this.usernameDataGridViewTextBoxColumn.Width = 51;
//
// requestpartDataGridViewTextBoxColumn
//
@@ -539,7 +537,7 @@
this.requestpartDataGridViewTextBoxColumn.HeaderText = "요청부서";
this.requestpartDataGridViewTextBoxColumn.Name = "requestpartDataGridViewTextBoxColumn";
this.requestpartDataGridViewTextBoxColumn.ReadOnly = true;
this.requestpartDataGridViewTextBoxColumn.Width = 78;
this.requestpartDataGridViewTextBoxColumn.Width = 61;
//
// packageDataGridViewTextBoxColumn
//
@@ -547,17 +545,17 @@
this.packageDataGridViewTextBoxColumn.HeaderText = "패키지";
this.packageDataGridViewTextBoxColumn.Name = "packageDataGridViewTextBoxColumn";
this.packageDataGridViewTextBoxColumn.ReadOnly = true;
this.packageDataGridViewTextBoxColumn.Width = 66;
this.packageDataGridViewTextBoxColumn.Width = 61;
//
// statusDataGridViewTextBoxColumn
//
this.statusDataGridViewTextBoxColumn.DataPropertyName = "status";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle43.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.statusDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle43;
this.statusDataGridViewTextBoxColumn.HeaderText = "상태";
this.statusDataGridViewTextBoxColumn.Name = "statusDataGridViewTextBoxColumn";
this.statusDataGridViewTextBoxColumn.ReadOnly = true;
this.statusDataGridViewTextBoxColumn.Width = 54;
this.statusDataGridViewTextBoxColumn.Width = 51;
//
// svalueDataGridViewTextBoxColumn
//
@@ -565,7 +563,7 @@
this.svalueDataGridViewTextBoxColumn.HeaderText = "업무분류";
this.svalueDataGridViewTextBoxColumn.Name = "svalueDataGridViewTextBoxColumn";
this.svalueDataGridViewTextBoxColumn.ReadOnly = true;
this.svalueDataGridViewTextBoxColumn.Width = 78;
this.svalueDataGridViewTextBoxColumn.Width = 61;
//
// projectNameDataGridViewTextBoxColumn
//
@@ -578,11 +576,11 @@
// otDataGridViewTextBoxColumn
//
this.otDataGridViewTextBoxColumn.DataPropertyName = "ot";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter;
dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle4.ForeColor = System.Drawing.Color.Red;
dataGridViewCellStyle4.Format = "N1";
this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle44.Alignment = System.Windows.Forms.DataGridViewContentAlignment.TopCenter;
dataGridViewCellStyle44.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle44.ForeColor = System.Drawing.Color.Red;
dataGridViewCellStyle44.Format = "N1";
this.otDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle44;
this.otDataGridViewTextBoxColumn.HeaderText = "초과";
this.otDataGridViewTextBoxColumn.Name = "otDataGridViewTextBoxColumn";
this.otDataGridViewTextBoxColumn.ReadOnly = true;
@@ -591,10 +589,10 @@
// ot2DataGridViewTextBoxColumn
//
this.ot2DataGridViewTextBoxColumn.DataPropertyName = "ot2";
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
dataGridViewCellStyle5.Format = "N1";
this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle45.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle45.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
dataGridViewCellStyle45.Format = "N1";
this.ot2DataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle45;
this.ot2DataGridViewTextBoxColumn.HeaderText = "승인";
this.ot2DataGridViewTextBoxColumn.Name = "ot2DataGridViewTextBoxColumn";
this.ot2DataGridViewTextBoxColumn.Width = 51;
@@ -602,8 +600,8 @@
// otReasonDataGridViewTextBoxColumn
//
this.otReasonDataGridViewTextBoxColumn.DataPropertyName = "otReason";
dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle46.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
this.otReasonDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle46;
this.otReasonDataGridViewTextBoxColumn.HeaderText = "사유";
this.otReasonDataGridViewTextBoxColumn.Name = "otReasonDataGridViewTextBoxColumn";
this.otReasonDataGridViewTextBoxColumn.Width = 51;
@@ -611,10 +609,10 @@
// otStartDataGridViewTextBoxColumn
//
this.otStartDataGridViewTextBoxColumn.DataPropertyName = "otStart";
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle7.Format = "HH:mm:ss";
this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle7;
dataGridViewCellStyle47.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle47.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle47.Format = "HH:mm:ss";
this.otStartDataGridViewTextBoxColumn.DefaultCellStyle = dataGridViewCellStyle47;
this.otStartDataGridViewTextBoxColumn.HeaderText = "시작";
this.otStartDataGridViewTextBoxColumn.Name = "otStartDataGridViewTextBoxColumn";
this.otStartDataGridViewTextBoxColumn.ReadOnly = true;
@@ -623,10 +621,10 @@
// otEnd
//
this.otEnd.DataPropertyName = "otEnd";
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle8.Format = "HH:mm:ss";
this.otEnd.DefaultCellStyle = dataGridViewCellStyle8;
dataGridViewCellStyle48.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle48.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
dataGridViewCellStyle48.Format = "HH:mm:ss";
this.otEnd.DefaultCellStyle = dataGridViewCellStyle48;
this.otEnd.HeaderText = "종료";
this.otEnd.Name = "otEnd";
this.otEnd.ReadOnly = true;
@@ -640,6 +638,11 @@
this.descriptionDataGridViewTextBoxColumn.ReadOnly = true;
this.descriptionDataGridViewTextBoxColumn.Width = 51;
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37);
//
// fOTConfirm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -724,5 +727,6 @@
private System.Windows.Forms.DataGridViewTextBoxColumn otStartDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn otEnd;
private System.Windows.Forms.DataGridViewTextBoxColumn descriptionDataGridViewTextBoxColumn;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
}
}

160
SubProject/FPJ0000/OtConfirm/fOTConfirm.cs
View File

@@ -32,6 +32,91 @@ namespace FPJ0000
Boolean binit = false;
private void __Load(object sender, EventArgs e)
{
//this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
//var sdate = DateTime.Parse(dtSD.Text);
this.dtED.Text = DateTime.Now.ToShortDateString();// sdate.AddMonths(1).AddDays(-1).ToShortDateString();
this.dtSD.Text = DateTime.Now.AddMonths(-1).ToShortDateString();
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.otconfirm));
//cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");
//foreach (dsReport.ProcessListRow dr in dtProcList)
//{
// cmbProcess.Items.Add(dr.processs);
//}
//cmbProcess.Text = FCOMMON.info.Login.process;
//if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함
tbProcess.Text = FCOMMON.info.Login.process;
tbProcess.Tag = new List<string>(new string[] { FCOMMON.info.Login.process });
//담당자목록 - 사용자목록으로 처리한다.
string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no);
// if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)";
// this.cmbUser.Items.Add(namestr);
UpdateUserList(); //현재사용자의 이름을 반환한다
if (curLevel >= 5)
{
if (cmbUser.Items.Count > 0)
cmbUser.SelectedIndex = 0;
}
else
{
cmbUser.Text = namestr;
dv1.EditMode = DataGridViewEditMode.EditProgrammatically;
}
if (cmbUser.SelectedIndex < 0)
{
//내 아이템이 없다면, 목록을 추가해서 선택해줘야 한다
this.cmbUser.Items.Add(namestr);
cmbUser.Text = namestr;
}
//var userList = FCOMMON.DBM.getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false);
//foreach (var user in userList)
//{
// this.cmbUser.Items.Add(user);
//}
//state list
//var stList = FCOMMON.DBM.getCodeList("05");
//this.cmbState.Items.Clear();
//cmbState.Items.Add("-- All --");
//// cmbState.Items.Add("-- incomplete --");
//foreach (var item in stList)
// cmbState.Items.Add(item);
//this.cmbState.SelectedIndex = 0;
//일반사용자의경우에는 상태를 변경하지 못한다.
if (curLevel >= 5)
{
}
else btEdit.Enabled = false;
//210930-
if (FCOMMON.info.NotShowJobReportview)
this.splitContainer1.Panel2Collapsed = true;
refreshData();
binit = true;
}
void UpdateUserList()
{
//담당자목록 - 사용자목록으로 처리한다.
@@ -74,79 +159,6 @@ namespace FPJ0000
(int)FCOMMON.eGroupPermission.jobreport_kisul);
}
}
private void __Load(object sender, EventArgs e)
{
this.dtSD.Text = DateTime.Now.ToString("yyyy-MM-01");
var sdate = DateTime.Parse(dtSD.Text);
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString();
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
//cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");
//foreach (dsReport.ProcessListRow dr in dtProcList)
//{
// cmbProcess.Items.Add(dr.processs);
//}
//cmbProcess.Text = FCOMMON.info.Login.process;
//if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함
tbProcess.Text = FCOMMON.info.Login.process;
tbProcess.Tag = new List<string>(new string[] { FCOMMON.info.Login.process });
//담당자목록 - 사용자목록으로 처리한다.
string namestr = string.Format("{0}({1})", FCOMMON.info.Login.nameK, FCOMMON.info.Login.no);
// if (FCOMMON.info.Login.no == "dev") namestr = "김치균(395552)";
// this.cmbUser.Items.Add(namestr);
UpdateUserList(); //현재사용자의 이름을 반환한다
if (cmbUser.Items.Count > 0)
cmbUser.SelectedIndex = 0;
if (cmbUser.SelectedIndex < 0)
{
//내 아이템이 없다면, 목록을 추가해서 선택해줘야 한다
this.cmbUser.Items.Add(namestr);
cmbUser.Text = namestr;
}
//var userList = FCOMMON.DBM.getGroupList("name + '(' + id + ')'", "Users", "[level] > 0 and [level] < 10", false, false);
//foreach (var user in userList)
//{
// this.cmbUser.Items.Add(user);
//}
//state list
//var stList = FCOMMON.DBM.getCodeList("05");
//this.cmbState.Items.Clear();
//cmbState.Items.Add("-- All --");
//// cmbState.Items.Add("-- incomplete --");
//foreach (var item in stList)
// cmbState.Items.Add(item);
//this.cmbState.SelectedIndex = 0;
//일반사용자의경우에는 상태를 변경하지 못한다.
int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport));
if (curLevel >= 5)
{
}
//210930-
if (FCOMMON.info.NotShowJobReportview)
this.splitContainer1.Panel2Collapsed = true;
refreshData();
binit = true;
}
private void cmbProcess_SelectedIndexChanged(object sender, EventArgs e)
{
if (binit == false) return;
@@ -464,7 +476,7 @@ namespace FPJ0000
private void toolStripButton5_Click(object sender, EventArgs e)
{
var f = new JobReport_.rK5Dailyform();
var f = new JobReport_.rJobReportOT();
f.Show();
}

47
SubProject/FPJ0000/OtConfirm/fOTConfirm.resx
View File

@@ -181,20 +181,20 @@
<data name="toolStripButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZLrS1NhHMf3Kv+EsF70UohSyqjIF6WpTQ3s
Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc1tzm04I9NMbc45L+BlqbucoztnfnvO2VIDoR98eF48
5/vh/L7nCLgJu6dMvlihU0RX6n6HS3UUOWmeKu7U09EVWjrysWY0SKKuORzzZh8f2j0RD/vVSzZ6Zcxo
Zq2ODVjtO6zYOGj8XLCh+KMF8ZXjTmGO3Mcb9UxUmWZp0mRhtWYX9DMM9BYGOjMDzfQmlL820DnmwAYD
tI1TKH4/g7Sno9Q/knBpJ7Xu3MTQLIuvsww5GQzykk2ojBv4POYkAjeGFljo510olVsQcrf3NR+Oqwo2
XZfGbInrryKt7hrquppR0lKFEKk/ggnC0jMIk51EdVs1v4qdZrC46kSYWMXwgtiKkHe9I+1on3yBOl0h
L0mqjUThq0TkNsdD1HAJqQ2paBteRPuoHZ++r2ON9BQu66d5gbBG6BMkzWN1E314OSJDuTKHlyTXR5Hw
ZWQ+y4Da6OBX6ZmkoCA9rDpcCC8Z8Ai4iShT0fmNKTAYNWjQ38Gj7gLEVZ1Hcm0MDGYnDKRYrmD1lKcT
KxGEyXYJzt6Xuk4VHUJijRBDU1qU9mVBJs9H/JNQNCs/4NscAwMpVjvtwgBhyeZCyAOv4LjEVxwoOYjc
pgTcqI9AQvUFXpIvT4SkJYO8SSi4+yELi0HuExNspMiAPI1HECjZPxcoOUAe8kVgoS+ulIci+3kK1GMK
lCqKkPU2BaL6WBiIQE/+DR0R0C43ESh3VjiX108vrNEYnmN5VBPzuN2YiXQSFDfEo6Dp1vYdh3OTJYLW
HQFnm7XuCP6Hg1shY5fgdP4Xp3Zkamuvh/fCPDvvPprUZvfGSZGZ3aaZdadNOzrtNi1TMC1RMHpZtrt4
uObtNAujec5NUdSa382OH964QHAisys7QNTZfUyssAaIW+lt0j34/0XUSvuJOlaPpHb0+KfI0wQCgeAP
5eegBTzkqG4AAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALySURBVDhPhZLrS1NhHMf3qv6EsF70UohSyqiwF6WpTQ3s
Zipm3uYUTU10YZAtppF5CU1UqBCl6EWFdtGpTc05Nzeckde8zE3nBbwsdZdzdOfMb885W2og9IMPz4vn
fD+c3/ccATfBD5UJV0q1iogy7e8QqZYiJ81Tzp06OqK0jw57ph45L1FVHot8f4AP7Z3QJ72qZSu9Ojpl
Yi32TVhsu6xaOWj8WrSi4IsZMWXjDmGm/KAn6p7wYvXyxPQs2zfjhG6Wgc7MQDvDQG3agnJqE21jdmwy
QPM4hYJPs0h+MUL9IwmRtlEbji0MzLH4MceQk0E/L9lCj2ET38YcRODCwCIL3YITRXIzAh90vePD0eUB
xlvSyG1xzQ0kV99EdXsDChvLESj1QQBBWOSPYNkZVDRX8KvYaAZLaw4Ep/QwvCCqNPBj13ALWiZfo1qb
x0viq8KQ9zYOWQ0xENVeRVJtEpoHl9AyYsPXoQ2sk55CZL00LxBWCg/6S7NZ7UQ33gzLUKLM5CUJNeEk
fA1pL1OhMtj5VTonKShID2t2J0IKNW4BN6HFPXROXSL0BjVqdffxtCMX0eWXkFAVCf2MA3pSLFewatrd
iYUIgmV7BBceSZ1n848irlKIgek+FHWnQybPQczzIDQoP+PnPAM9KbbP5ISGsGx1IvCxR3BK4iX2kxxB
Vn0sbteEIrbiMi/JkcdB0phK3iQI3P2AmUU/94kJVlKkb7baLfCTHJr3kxwmD3nBL88L10uCkPEqEaox
BYoU+Uj/kAhRTRT0RKAj/4aWCGiniwiUuytczO6lF9dpDM6zPD0TC7hXl4YUEhTXxiC3/u7OHYdjiyWC
pl0BZ5uz7Ar+h51bIXWP4FzOd4dmyLC938P7YTLPu07EN9s8cVJkWodxdsNh1QwbXcYVCsZlCgYPKzYn
D9e8jWYxZZpzURS17n2nddQTFwhOp7Vn+IraOk6KFRZfcRO9Q4obn7+ImmhvUeva8aTWTp9EebJAIBD8
AcSjn/E9z3PXAAAAAElFTkSuQmCC
</value>
</data>
<data name="btEdit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -223,6 +223,9 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</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="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>186, 17</value>
</metadata>
@@ -232,6 +235,19 @@
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>393, 17</value>
</metadata>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGJSURBVEhL7ZS9TsQwEITzeoBo4Dko6eiRDpAQ4i0oqWg5
aICXoKKjpTQMmgkTs+tLQuhupJHXPzuffYqu22qszta7BeZ0eUXhgsLnD3u/9lf3O3+/kENghPocYKyt
uKc52+fLIZF72FctaPQrTBJCIpjbYT7CjJkmNUcwt8Nmw3EwCm+5BUU9+hJReMsOw3jxuF9u347L9fPh
YJ3xuaLwlv1FgN69n5SXclnWH6fl6umg32d8rii8ZX+poDBqrP3rizMo9ka9OAre5NZLZcBxlpih/ICM
NYToY/E9OIWyV69VLmrifqTDHowGBeNjcXjrpehzqI/EDfUNJ1CHb16P+nDBM2gG00hMrKiphi/2Ulfd
pNrhGRRj3a+R8bnqJq8d7j+v93itfpxjfC5vwugfGwy4oJhHoKif8bFwsA5So4w1QTX3nqwfNTFt4aA3
Zq5BGmXGTRMaI5jbYfXImHmqA2sw1qJ9ts+XQhGGUbWstfqfj+3zFYUoHMbFuNwLF2C5vATmdKsN6rpP
fZjWUaDH7j0AAAAASUVORK5CYII=
</value>
</data>
<data name="btSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -256,4 +272,7 @@
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="otEnd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>