From 90db05a366300f901154c15507a606b4c68afa8e Mon Sep 17 00:00:00 2001 From: chi Date: Tue, 11 Apr 2023 12:06:04 +0900 Subject: [PATCH] =?UTF-8?q?=20=EC=97=85=EB=AC=B4=EC=9D=BC=EC=A7=80=20?= =?UTF-8?q?=EB=93=B1=EB=A1=9D=EC=8B=9C=20=EB=A9=94=EC=9D=BC=20=EC=95=8C?= =?UTF-8?q?=EB=A6=BC=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- SubProject/FPJ0000/EETGW_HolydayRequest.cs | 2 + SubProject/FPJ0000/EETGW_ProjectsSchedule.cs | 2 + SubProject/FPJ0000/EETGW_SaveCost.cs | 1 + SubProject/FPJ0000/JobReport.cs | 2 + .../JobReport_/fJobReport_Add.Designer.cs | 48 +- .../FPJ0000/JobReport_/fJobReport_Add.cs | 60 ++ .../FPJ0000/JobReport_/fJobReport_Add.resx | 9 +- SubProject/FPJ0000/Model1.Context.cs | 2 +- SubProject/FPJ0000/Model1.Designer.cs | 2 +- SubProject/FPJ0000/Model1.edmx | 178 ++++-- SubProject/FPJ0000/Model1.edmx.diagram | 2 +- SubProject/FPJ0000/Project/ctlLayout.cs | 16 +- SubProject/FPJ0000/Project/fProjectData.cs | 2 +- .../Project/fProjectLayout.Designer.cs | 29 +- SubProject/FPJ0000/Project/fProjectLayout.cs | 2 +- .../FPJ0000/Project/fProjectList.Designer.cs | 514 +++++++++--------- SubProject/FPJ0000/Projects.cs | 16 + SubProject/FPJ0000/Purchase.cs | 3 + SubProject/FPJ0000/UserGroup.cs | 2 + .../FPJ0000/vEETGW_Project_LayoutList.cs | 1 + SubProject/FPJ0000/vGroupUser.cs | 2 + 22 files changed, 551 insertions(+), 348 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 4974d52..0b65c34 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.03.17.1300")] -[assembly: AssemblyFileVersion("23.03.17.1300")] +[assembly: AssemblyVersion("23.04.11.1150")] +[assembly: AssemblyFileVersion("23.04.11.1150")] diff --git a/SubProject/FPJ0000/EETGW_HolydayRequest.cs b/SubProject/FPJ0000/EETGW_HolydayRequest.cs index f34bee8..c8e1d91 100644 --- a/SubProject/FPJ0000/EETGW_HolydayRequest.cs +++ b/SubProject/FPJ0000/EETGW_HolydayRequest.cs @@ -31,5 +31,7 @@ namespace FPJ0000 public Nullable sendmail { get; set; } public string wuid { get; set; } public System.DateTime wdate { get; set; } + public string stime { get; set; } + public string etime { get; set; } } } diff --git a/SubProject/FPJ0000/EETGW_ProjectsSchedule.cs b/SubProject/FPJ0000/EETGW_ProjectsSchedule.cs index bb92027..dcd735d 100644 --- a/SubProject/FPJ0000/EETGW_ProjectsSchedule.cs +++ b/SubProject/FPJ0000/EETGW_ProjectsSchedule.cs @@ -31,5 +31,7 @@ namespace FPJ0000 public Nullable progress { get; set; } public string wuid { get; set; } public System.DateTime wdate { get; set; } + public Nullable complete { get; set; } + public string uidname { get; set; } } } diff --git a/SubProject/FPJ0000/EETGW_SaveCost.cs b/SubProject/FPJ0000/EETGW_SaveCost.cs index 6d4da5c..89f29f4 100644 --- a/SubProject/FPJ0000/EETGW_SaveCost.cs +++ b/SubProject/FPJ0000/EETGW_SaveCost.cs @@ -48,5 +48,6 @@ namespace FPJ0000 public Nullable Highlight { get; set; } public Nullable bef_time { get; set; } public Nullable aft_time { get; set; } + public Nullable sfi { get; set; } } } diff --git a/SubProject/FPJ0000/JobReport.cs b/SubProject/FPJ0000/JobReport.cs index a218398..8c4dd80 100644 --- a/SubProject/FPJ0000/JobReport.cs +++ b/SubProject/FPJ0000/JobReport.cs @@ -42,5 +42,7 @@ namespace FPJ0000 public Nullable kisulamt { get; set; } public Nullable ot2 { get; set; } public string otReason { get; set; } + public string otwuid { get; set; } + public Nullable ottime { get; set; } } } diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs index ae2a8d4..5f6a6ed 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.Designer.cs @@ -68,6 +68,7 @@ this.tbProject = new System.Windows.Forms.ComboBox(); this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx(); this.panel1 = new System.Windows.Forms.Panel(); + this.tbProjectIndex = new System.Windows.Forms.Button(); this.grpkisul = new System.Windows.Forms.GroupBox(); this.cmb_kisuldiv = new System.Windows.Forms.ComboBox(); this.textBox1 = new System.Windows.Forms.TextBox(); @@ -78,7 +79,8 @@ this.tbTag = new System.Windows.Forms.TextBox(); this.ta = new FPJ0000.dsPRJTableAdapters.JobReportTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); - this.tbProjectIndex = new System.Windows.Forms.Button(); + this.chkManagerAlert = new System.Windows.Forms.CheckBox(); + this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); hrsLabel = new System.Windows.Forms.Label(); typeLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); @@ -273,7 +275,7 @@ this.lbotReason}); this.statusStrip1.Location = new System.Drawing.Point(0, 675); this.statusStrip1.Name = "statusStrip1"; - this.statusStrip1.Size = new System.Drawing.Size(969, 22); + this.statusStrip1.Size = new System.Drawing.Size(984, 22); this.statusStrip1.TabIndex = 28; this.statusStrip1.Text = "statusStrip1"; // @@ -416,7 +418,7 @@ // chkAutoAdd // this.chkAutoAdd.AutoSize = true; - this.chkAutoAdd.Location = new System.Drawing.Point(432, 103); + this.chkAutoAdd.Location = new System.Drawing.Point(73, 181); this.chkAutoAdd.Name = "chkAutoAdd"; this.chkAutoAdd.Size = new System.Drawing.Size(176, 16); this.chkAutoAdd.TabIndex = 26; @@ -446,17 +448,18 @@ this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange; this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill; this.richTextBoxEx1.FilePath = ""; - this.richTextBoxEx1.Location = new System.Drawing.Point(0, 177); + this.richTextBoxEx1.Location = new System.Drawing.Point(0, 205); this.richTextBoxEx1.Name = "richTextBoxEx1"; this.richTextBoxEx1.Rtf = resources.GetString("richTextBoxEx1.Rtf"); this.richTextBoxEx1.SetColorWithFont = true; this.richTextBoxEx1.ShowToolStrip = true; - this.richTextBoxEx1.Size = new System.Drawing.Size(969, 477); + this.richTextBoxEx1.Size = new System.Drawing.Size(984, 449); this.richTextBoxEx1.TabIndex = 58; // // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200))))); + this.panel1.Controls.Add(this.chkManagerAlert); this.panel1.Controls.Add(this.tbProjectIndex); this.panel1.Controls.Add(this.grpkisul); this.panel1.Controls.Add(this.dateTimePicker2); @@ -490,9 +493,19 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(969, 177); + this.panel1.Size = new System.Drawing.Size(984, 205); this.panel1.TabIndex = 0; // + // tbProjectIndex + // + this.tbProjectIndex.Location = new System.Drawing.Point(754, 58); + this.tbProjectIndex.Name = "tbProjectIndex"; + this.tbProjectIndex.Size = new System.Drawing.Size(68, 23); + this.tbProjectIndex.TabIndex = 25; + this.tbProjectIndex.Text = "--"; + this.tbProjectIndex.UseVisualStyleBackColor = true; + this.tbProjectIndex.Click += new System.EventHandler(this.tbProjectIndex_Click); + // // grpkisul // this.grpkisul.Controls.Add(label10); @@ -573,7 +586,7 @@ this.tbTag.Dock = System.Windows.Forms.DockStyle.Bottom; this.tbTag.Location = new System.Drawing.Point(0, 654); this.tbTag.Name = "tbTag"; - this.tbTag.Size = new System.Drawing.Size(969, 21); + this.tbTag.Size = new System.Drawing.Size(984, 21); this.tbTag.TabIndex = 60; this.tbTag.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -602,21 +615,22 @@ this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // - // tbProjectIndex + // chkManagerAlert // - this.tbProjectIndex.Location = new System.Drawing.Point(754, 58); - this.tbProjectIndex.Name = "tbProjectIndex"; - this.tbProjectIndex.Size = new System.Drawing.Size(68, 23); - this.tbProjectIndex.TabIndex = 25; - this.tbProjectIndex.Text = "--"; - this.tbProjectIndex.UseVisualStyleBackColor = true; - this.tbProjectIndex.Click += new System.EventHandler(this.tbProjectIndex_Click); + this.chkManagerAlert.AutoSize = true; + this.chkManagerAlert.Location = new System.Drawing.Point(265, 181); + this.chkManagerAlert.Name = "chkManagerAlert"; + this.chkManagerAlert.Size = new System.Drawing.Size(116, 16); + this.chkManagerAlert.TabIndex = 30; + this.chkManagerAlert.Text = "관리자 메일 알림"; + this.toolTip1.SetToolTip(this.chkManagerAlert, "체크시 업무일지 내용을 관리자에게 메일로 전송합니다.\r\n메일양식에 MA 항목이 등록되어있어야 합니다"); + this.chkManagerAlert.UseVisualStyleBackColor = true; // // fJobReport_Add // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(969, 697); + this.ClientSize = new System.Drawing.Size(984, 697); this.Controls.Add(this.richTextBoxEx1); this.Controls.Add(this.tbTag); this.Controls.Add(this.panel1); @@ -677,5 +691,7 @@ private System.Windows.Forms.ToolStripStatusLabel lbOt2; private System.Windows.Forms.ToolStripStatusLabel lbotReason; private System.Windows.Forms.Button tbProjectIndex; + private System.Windows.Forms.CheckBox chkManagerAlert; + private System.Windows.Forms.ToolTip toolTip1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index e758332..15c000b 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -604,9 +604,69 @@ namespace FPJ0000.JobReport_ this.dr.description = richTextBoxEx1.Text; this.dr.description2 = richTextBoxEx1.Rtf; // ef.DocumentText;// richTextBox1.Rtf; this.bs.EndEdit(); + + if(chkManagerAlert.Checked) + { + var dlg = FCOMMON.Util.MsgQ("관리자 메일을 전송할까요?\n업무일지 작성 내용이 전달 됩니다"); + if(dlg == DialogResult.Yes) + { + var db = new EEEntities(); + var mf = db.MailForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "MA").FirstOrDefault(); + if (mf != null) + { + try + { + var mbody = new MailData(); + mbody.tolist = maildataupdate(mf.tolist); + mbody.bcc = maildataupdate(mf.bcc); + mbody.cc = maildataupdate(mf.cc); + mbody.project = dr.pidx; + mbody.gcode = FCOMMON.info.Login.gcode; + mbody.cate = mf.cate; + mbody.fromlist = "gw@amkor.co.kr"; + mbody.pdate = DateTime.Now.ToShortDateString(); + mbody.subject = maildataupdate(mf.subject); + mbody.body = maildataupdate(mf.body); + mbody.wuid = FCOMMON.info.Login.no; + mbody.wdate = DateTime.Now; + db.MailData.Add(mbody); + db.SaveChanges(); + } + catch (Exception ex) + { + FCOMMON.Util.MsgE("업무일지 알림 메일 전송 실패" + ex.Message); + } + } + else FCOMMON.Util.MsgE("관리자메일양식 MA가 등록되지 않았습니다. 메일 양식을 확인하세요"); + } + + } + DialogResult = System.Windows.Forms.DialogResult.OK; } + string maildataupdate(string org) + { + if (string.IsNullOrEmpty(org)) return string.Empty; + org = org.Replace("{pname}", tbProject.Text); + org = org.Replace("{pidx}", tbProjectIndex.Text); + org = org.Replace("{sdate}", dtPdate.Value.ToShortDateString()); + org = org.Replace("{edate}", dtPdate.Value.ToShortDateString()); + org = org.Replace("{pdate}", dtPdate.Value.ToShortDateString()); + org = org.Replace("{DATE}", dtPdate.Value.ToShortDateString()); + org = org.Replace("{NAME}", cmbUser.Text); + org = org.Replace("{HR}", tbHrs.Text); + org = org.Replace("{OT}", tbOt.Text); + org = org.Replace("{PROJECT}", tbProject.Text); + org = org.Replace("{REMARK}", richTextBoxEx1.Text); + org = org.Replace("{SENDER}",FCOMMON.info.Login.email); + + + return org; + } + + + private void cmbType_SelectedIndexChanged(object sender, EventArgs e) { if (cmbType.Text.Trim() != "" && diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx index a10cac2..edf45f6 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.resx @@ -162,12 +162,6 @@ 100, 17 - - 100, 17 - - - 17, 17 - 17, 17 @@ -181,6 +175,9 @@ } + + 416, 17 + 164, 17 diff --git a/SubProject/FPJ0000/Model1.Context.cs b/SubProject/FPJ0000/Model1.Context.cs index 976c53c..39fe145 100644 --- a/SubProject/FPJ0000/Model1.Context.cs +++ b/SubProject/FPJ0000/Model1.Context.cs @@ -42,10 +42,10 @@ namespace FPJ0000 public virtual DbSet vJobReportForUser { get; set; } public virtual DbSet Auth { get; set; } public virtual DbSet Projects { get; set; } - public virtual DbSet vEETGW_Project_LayoutList { get; set; } public virtual DbSet EETGW_Project_Layout { get; set; } public virtual DbSet EETGW_DocuForm { get; set; } public virtual DbSet EETGW_ProjectsSchedule { get; set; } public virtual DbSet EETGW_HolydayRequest { get; set; } + public virtual DbSet vEETGW_Project_LayoutList { get; set; } } } diff --git a/SubProject/FPJ0000/Model1.Designer.cs b/SubProject/FPJ0000/Model1.Designer.cs index 5f0ff54..67cde1d 100644 --- a/SubProject/FPJ0000/Model1.Designer.cs +++ b/SubProject/FPJ0000/Model1.Designer.cs @@ -1,4 +1,4 @@ -// 모델 'D:\Source\##### 완료아이템\(014) GroupWare\Source\SubProject\FPJ0000\Model1.edmx'에 대해 T4 코드 생성이 사용됩니다. +// 모델 'D:\Source\##### 완료아이템\(0014) GroupWare\Source\SubProject\FPJ0000\Model1.edmx'에 대해 T4 코드 생성이 사용됩니다. // 레거시 코드 생성을 사용하려면 '코드 생성 전략' 디자이너 속성의 값을 // 'Legacy ObjectContext'로 변경하십시오. 이 속성은 모델이 디자이너에서 열릴 때 // 속성 창에서 사용할 수 있습니다. diff --git a/SubProject/FPJ0000/Model1.edmx b/SubProject/FPJ0000/Model1.edmx index 99017ac..9cb3695 100644 --- a/SubProject/FPJ0000/Model1.edmx +++ b/SubProject/FPJ0000/Model1.edmx @@ -33,10 +33,10 @@ - + - + @@ -73,6 +73,8 @@ + + @@ -167,6 +169,8 @@ + + @@ -206,6 +210,7 @@ + @@ -250,6 +255,8 @@ + + @@ -326,6 +333,9 @@ + + + @@ -354,6 +364,19 @@ + + + + + + + + + + + + + @@ -394,6 +417,9 @@ + + + @@ -405,6 +431,8 @@ + + @@ -450,6 +478,7 @@ + @@ -479,6 +508,8 @@ + + @@ -583,7 +614,8 @@ [vEETGW_Project_LayoutList].[userManager] AS [userManager], [vEETGW_Project_LayoutList].[memo] AS [memo], [vEETGW_Project_LayoutList].[isdel] AS [isdel], - [vEETGW_Project_LayoutList].[status] AS [status] + [vEETGW_Project_LayoutList].[status] AS [status], + [vEETGW_Project_LayoutList].[champion] AS [champion] FROM [dbo].[vEETGW_Project_LayoutList] AS [vEETGW_Project_LayoutList] @@ -608,7 +640,9 @@ [vGroupUser].[id] AS [id], [vGroupUser].[state] AS [state], [vGroupUser].[useJobReport] AS [useJobReport], - [vGroupUser].[useUserState] AS [useUserState] + [vGroupUser].[useUserState] AS [useUserState], + [vGroupUser].[password] AS [password], + [vGroupUser].[exceptHoly] AS [exceptHoly] FROM [dbo].[vGroupUser] AS [vGroupUser] @@ -680,10 +714,10 @@ - + - + @@ -697,6 +731,8 @@ + + @@ -776,11 +812,11 @@ - + @@ -870,6 +906,7 @@ + @@ -954,6 +991,9 @@ + + + @@ -1003,6 +1043,8 @@ + + @@ -1029,6 +1071,8 @@ + + @@ -1139,23 +1183,22 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -1207,6 +1250,8 @@ + + @@ -1229,6 +1274,26 @@ + + + + + + + + + + + + + + + + + + + + @@ -1255,6 +1320,8 @@ + + @@ -1378,6 +1445,7 @@ + @@ -1464,6 +1532,9 @@ + + + @@ -1522,6 +1593,8 @@ + + @@ -1556,6 +1629,8 @@ + + @@ -1634,6 +1709,22 @@ + + + + + + + + + + + + + + + + @@ -1692,23 +1783,6 @@ - - - - - - - - - - - - - - - - - @@ -1743,6 +1817,8 @@ + + @@ -1766,6 +1842,8 @@ + + @@ -1786,6 +1864,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/Model1.edmx.diagram b/SubProject/FPJ0000/Model1.edmx.diagram index b71ec78..36c9157 100644 --- a/SubProject/FPJ0000/Model1.edmx.diagram +++ b/SubProject/FPJ0000/Model1.edmx.diagram @@ -22,11 +22,11 @@ - + diff --git a/SubProject/FPJ0000/Project/ctlLayout.cs b/SubProject/FPJ0000/Project/ctlLayout.cs index 46b8bf3..f3c687f 100644 --- a/SubProject/FPJ0000/Project/ctlLayout.cs +++ b/SubProject/FPJ0000/Project/ctlLayout.cs @@ -73,9 +73,9 @@ namespace FPJ0000.Project Boolean brect = true; protected override void OnPaint(PaintEventArgs pe) { - if (items == null || items.Count != 10) + if (items == null || items.Count != 12) { - for (int i = 1; i <= 10; i++) + for (int i = 1; i <= 12; i++) { items.Add(new itemdata() { @@ -119,9 +119,9 @@ namespace FPJ0000.Project //var fNo = new Font("Consolas", 20, FontStyle.Bold); //내부그리드 그리기 2*5 배열이나.. 1칸이 총 2x2 칸으로 구성되니 2배로 한다. var cnt = 1; - var itemp = 10; - var colcount = 5; - var rowcount = 2; + var itemp = 12; + var colcount = 4; + var rowcount = 3; var itemw = (rect.Width / colcount) - (itemp * (colcount - 1)); var itemh = (rect.Height / rowcount) - (itemp * (rowcount - 1)); for (int i = 0; i < colcount; i++) @@ -135,6 +135,8 @@ namespace FPJ0000.Project itemh); var data = items[cnt - 1]; + var no = j * colcount + i + 1; + if (cnt == 12) continue; pe.Graphics.DrawRectangle(Pens.White, r.Left, r.Top, r.Width, r.Height); @@ -148,7 +150,7 @@ namespace FPJ0000.Project pe.Graphics.FillRectangle(Brushes.White, rno); pe.Graphics.DrawRectangle(Pens.White, rno.Left, rno.Top, rno.Width, rno.Height); - pe.Graphics.DrawString(cnt.ToString(), fontNo, Brushes.Black, rno, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); + pe.Graphics.DrawString(no.ToString(), fontNo, Brushes.Black, rno, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); pe.Graphics.DrawRectangle(Pens.White, rnm.Left, rnm.Top, rnm.Width, rnm.Height); pe.Graphics.DrawString(data.champion, fontName, Brushes.White, rnm, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); //pe.Graphics.DrawRectangle(Pens.White, rbd.Left, rbd.Top, rbd.Width, rbd.Height); @@ -175,7 +177,7 @@ namespace FPJ0000.Project pe.Graphics.FillRectangle(Brushes.White, rno); pe.Graphics.DrawRectangle(Pens.White, rno.Left, rno.Top, rno.Width, rno.Height); - pe.Graphics.DrawString(cnt.ToString(), fontNo, Brushes.Black, rno, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); + pe.Graphics.DrawString(no.ToString(), fontNo, Brushes.Black, rno, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); pe.Graphics.DrawRectangle(Pens.White, rnm.Left, rnm.Top, rnm.Width, rnm.Height); pe.Graphics.DrawString(data.champion, fontName, Brushes.White, rnm, new StringFormat { Alignment = StringAlignment.Center, LineAlignment = StringAlignment.Center }); //pe.Graphics.DrawRectangle(Pens.White, rbd.Left, rbd.Top, rbd.Width, rbd.Height); diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 5f72067..9d54178 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -312,7 +312,7 @@ namespace FPJ0000 mbody.project = dr.pidx; mbody.gcode = FCOMMON.info.Login.gcode; mbody.cate = mf.cate; - mbody.fromlist = "chikyun.kim@amkor.co.kr"; + mbody.fromlist = "gw@amkor.co.kr"; mbody.pdate = DateTime.Now.ToShortDateString(); mbody.subject = maildataupdate(mf.subject); mbody.body = maildataupdate(mf.body); diff --git a/SubProject/FPJ0000/Project/fProjectLayout.Designer.cs b/SubProject/FPJ0000/Project/fProjectLayout.Designer.cs index be152df..68733c7 100644 --- a/SubProject/FPJ0000/Project/fProjectLayout.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectLayout.Designer.cs @@ -34,6 +34,7 @@ this.dsMSSQL = new FPJ0000.dsPRJ(); this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.프로젝트해제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.엑셀파일로저장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.예약변경ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); @@ -45,7 +46,6 @@ this.btSearch = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button(); this.ctlLayout1 = new FPJ0000.Project.ctlLayout(); - this.프로젝트해제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); @@ -73,7 +73,7 @@ this.엑셀파일로저장ToolStripMenuItem, this.예약변경ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(243, 170); + this.cm.Size = new System.Drawing.Size(243, 148); // // 편집ToolStripMenuItem // @@ -82,6 +82,13 @@ this.편집ToolStripMenuItem.Text = "프로젝트 선택"; this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click); // + // 프로젝트해제ToolStripMenuItem + // + this.프로젝트해제ToolStripMenuItem.Name = "프로젝트해제ToolStripMenuItem"; + this.프로젝트해제ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.프로젝트해제ToolStripMenuItem.Text = "프로젝트 해제"; + this.프로젝트해제ToolStripMenuItem.Click += new System.EventHandler(this.프로젝트해제ToolStripMenuItem_Click); + // // 엑셀파일로저장ToolStripMenuItem // this.엑셀파일로저장ToolStripMenuItem.Name = "엑셀파일로저장ToolStripMenuItem"; @@ -107,6 +114,7 @@ this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; + this.tam.EETGW_ProjectResonTableAdapter = null; this.tam.EETGW_ProjectsScheduleTableAdapter = null; this.tam.EETGW_ProjectToDoTableAdapter = null; this.tam.EETGW_SaveCostTableAdapter = null; @@ -138,7 +146,7 @@ this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(1339, 55); + this.panel1.Size = new System.Drawing.Size(1184, 55); this.panel1.TabIndex = 9; // // btSearch @@ -146,7 +154,7 @@ this.btSearch.Dock = System.Windows.Forms.DockStyle.Right; this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); this.btSearch.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.btSearch.Location = new System.Drawing.Point(1114, 5); + this.btSearch.Location = new System.Drawing.Point(959, 5); this.btSearch.Name = "btSearch"; this.btSearch.Padding = new System.Windows.Forms.Padding(5, 0, 3, 0); this.btSearch.Size = new System.Drawing.Size(122, 45); @@ -161,7 +169,7 @@ this.button1.Dock = System.Windows.Forms.DockStyle.Right; this.button1.Image = ((System.Drawing.Image)(resources.GetObject("button1.Image"))); this.button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; - this.button1.Location = new System.Drawing.Point(1236, 5); + this.button1.Location = new System.Drawing.Point(1081, 5); this.button1.Name = "button1"; this.button1.Padding = new System.Windows.Forms.Padding(5, 0, 5, 0); this.button1.Size = new System.Drawing.Size(98, 45); @@ -184,21 +192,14 @@ this.ctlLayout1.Location = new System.Drawing.Point(0, 55); this.ctlLayout1.Name = "ctlLayout1"; this.ctlLayout1.Padding = new System.Windows.Forms.Padding(10); - this.ctlLayout1.Size = new System.Drawing.Size(1339, 906); + this.ctlLayout1.Size = new System.Drawing.Size(1184, 656); this.ctlLayout1.TabIndex = 11; this.ctlLayout1.Text = "ctlLayout1"; // - // 프로젝트해제ToolStripMenuItem - // - this.프로젝트해제ToolStripMenuItem.Name = "프로젝트해제ToolStripMenuItem"; - this.프로젝트해제ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); - this.프로젝트해제ToolStripMenuItem.Text = "프로젝트 해제"; - this.프로젝트해제ToolStripMenuItem.Click += new System.EventHandler(this.프로젝트해제ToolStripMenuItem_Click); - // // fProjectLayout // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1339, 961); + this.ClientSize = new System.Drawing.Size(1184, 711); this.Controls.Add(this.ctlLayout1); this.Controls.Add(this.panel1); this.Name = "fProjectLayout"; diff --git a/SubProject/FPJ0000/Project/fProjectLayout.cs b/SubProject/FPJ0000/Project/fProjectLayout.cs index 15c507b..f4c1e03 100644 --- a/SubProject/FPJ0000/Project/fProjectLayout.cs +++ b/SubProject/FPJ0000/Project/fProjectLayout.cs @@ -102,7 +102,7 @@ namespace FPJ0000 data.reserve = dr.reserve; data.project = drprj.idx; data.body = "[" + drprj.status + "] " + drprj.name; - data.champion = drprj.userManager; + data.champion = drprj.champion; data.duedate = drprj.ddate; var isdate = DateTime.TryParse(drprj.ddate, out DateTime dt); if (isdate) diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 1c3331e..e100eec 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -112,6 +112,7 @@ this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.cmbDateType = new System.Windows.Forms.ToolStripComboBox(); this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); @@ -188,13 +189,13 @@ this.button1 = new System.Windows.Forms.Button(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label17 = new System.Windows.Forms.Label(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel4.SuspendLayout(); @@ -205,7 +206,6 @@ this.toolStrip2.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -662,6 +662,260 @@ this.fpSpread1.TabIndex = 2; this.fpSpread1.SetViewportLeftColumn(0, 0, 6); // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 31; + this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).ColumnSpan = 8; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Basic Info"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Process /\r\nEquipment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 7; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Schedule"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Schedule"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).ColumnSpan = 4; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Budget"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).ColumnSpan = 4; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Human Resource"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Comment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Comment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).ColumnSpan = 4; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "Ext.Info"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 1).Value = "Project\r\nNo"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "Process / Equipment"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Site"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Plant"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "PKG"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "Line"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "Request Team"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "Project Title"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "준수(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "완료(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Status"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "검토\r\n기한"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "Start Date"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "Due Date"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "Done Date"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "Q\'ty"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "Outsourced Cost ($K)/Set\r\n"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "In-house Cost ($K/Set)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "Cost Save ($k)/Set"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "SCR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "Champion"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "Design"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "ePanel"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "History"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "Memo"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Asset"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Model#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "Serial#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "자스민"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F; + numberCellType2.DecimalPlaces = 0; + numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType2.MaximumValue = 2147483647D; + numberCellType2.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pno"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "Project\r\nNo"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "Process / Equipment"; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ReqSite"; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "Site"; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ReqPlant"; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "Plant"; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqPackage"; + this.fpSpread1_Sheet1.Columns.Get(5).Label = "PKG"; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqLine"; + this.fpSpread1_Sheet1.Columns.Get(6).Label = "Line"; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "Request Team"; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "Project Title"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType3.DecimalPlaces = 0; + numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType3.MaximumValue = 2147483647D; + numberCellType3.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "finishrate"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "준수(%)"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ProgressPrj"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "완료(%)"; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "Status"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "Status"; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "kdate"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "검토\r\n기한"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "sdate"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "Start Date"; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 52F; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "ddate"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "Due Date"; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "Done Date"; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType5; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "Q\'ty"; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 42F; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType6; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "Outsourced Cost ($K)/Set\r\n"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; + numberCellType7.MaximumValue = 999999999999999D; + numberCellType7.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType7; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "In-house Cost ($K/Set)"; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType8.MaximumValue = 999999999999999D; + numberCellType8.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(19).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "Cost Save ($k)/Set"; + this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 67F; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "SCR/CF"; + this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "name_champion"; + this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "Champion"; + this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "name_software"; + this.fpSpread1_Sheet1.Columns.Get(22).Label = "S/W"; + this.fpSpread1_Sheet1.Columns.Get(23).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_design"; + this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(23).Label = "Design"; + this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(24).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_epanel"; + this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(24).Label = "ePanel"; + this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(25).DataField = "lasthistory"; + this.fpSpread1_Sheet1.Columns.Get(25).Label = "History"; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(26).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(26).Label = "Memo"; + this.fpSpread1_Sheet1.Columns.Get(26).Width = 77F; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(27).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(27).Label = "Asset"; + this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(28).DataField = "model"; + this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(28).Label = "Model#"; + this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(29).DataField = "serial"; + this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(29).Label = "Serial#"; + this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + numberCellType9.DecimalPlaces = 0; + numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType9.MaximumValue = 2147483647D; + numberCellType9.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(30).DataField = "jasmin"; + this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(30).Label = "자스민"; + this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // // toolStrip1 // this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; @@ -1628,260 +1882,6 @@ this.label17.Text = "구매 진행"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 31; - this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).ColumnSpan = 8; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Basic Info"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "Process /\r\nEquipment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 7; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Schedule"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Schedule"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).ColumnSpan = 4; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Input\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Budget"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).ColumnSpan = 4; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "Human Resource"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).ColumnSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 25).Value = "Comment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 26).Value = "Comment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).ColumnSpan = 4; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 27).Value = "Ext.Info"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 1).Value = "Project\r\nNo"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "Process / Equipment"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Site"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Plant"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "PKG"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "Line"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 7).Value = "Request Team"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "Project Title"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "준수(%)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "완료(%)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Status"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "검토\r\n기한"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "Start Date"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 14).Value = "Due Date"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 15).Value = "Done Date"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 16).Value = "Q\'ty"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "Outsourced Cost ($K)/Set\r\n"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 18).Value = "In-house Cost ($K/Set)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 19).Value = "Cost Save ($k)/Set"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 20).Value = "SCR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "Champion"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 22).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 23).Value = "Design"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 24).Value = "ePanel"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 25).Value = "History"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 26).Value = "Memo"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 27).Value = "Asset"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 28).Value = "Model#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 29).Value = "Serial#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 30).Value = "자스민"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "pno"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "Project\r\nNo"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "Process / Equipment"; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ReqSite"; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "Site"; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ReqPlant"; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "Plant"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqPackage"; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "PKG"; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqLine"; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "Line"; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "Request Team"; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "Project Title"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "finishrate"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "준수(%)"; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.DecimalPlaces = 0; - numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType4.MaximumValue = 2147483647D; - numberCellType4.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ProgressPrj"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "완료(%)"; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "Status"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "Status"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "kdate"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "검토\r\n기한"; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "sdate"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "Start Date"; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "ddate"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "Due Date"; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "Done Date"; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType5.DecimalPlaces = 0; - numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType5.MaximumValue = 2147483647D; - numberCellType5.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "Q\'ty"; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 42F; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "Outsourced Cost ($K)/Set\r\n"; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "In-house Cost ($K/Set)"; - this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType8.MaximumValue = 999999999999999D; - numberCellType8.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType8; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(19).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "Cost Save ($k)/Set"; - this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Width = 67F; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "orderno"; - this.fpSpread1_Sheet1.Columns.Get(20).Label = "SCR/CF"; - this.fpSpread1_Sheet1.Columns.Get(21).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "name_champion"; - this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).Label = "Champion"; - this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(22).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "name_software"; - this.fpSpread1_Sheet1.Columns.Get(22).Label = "S/W"; - this.fpSpread1_Sheet1.Columns.Get(23).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(23).DataField = "name_design"; - this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).Label = "Design"; - this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(24).DataField = "name_epanel"; - this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(24).Label = "ePanel"; - this.fpSpread1_Sheet1.Columns.Get(24).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; - this.fpSpread1_Sheet1.Columns.Get(25).DataField = "lasthistory"; - this.fpSpread1_Sheet1.Columns.Get(25).Label = "History"; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType19; - this.fpSpread1_Sheet1.Columns.Get(26).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(26).Label = "Memo"; - this.fpSpread1_Sheet1.Columns.Get(26).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType20; - this.fpSpread1_Sheet1.Columns.Get(27).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(27).Label = "Asset"; - this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType21; - this.fpSpread1_Sheet1.Columns.Get(28).DataField = "model"; - this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(28).Label = "Model#"; - this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType22; - this.fpSpread1_Sheet1.Columns.Get(29).DataField = "serial"; - this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(29).Label = "Serial#"; - this.fpSpread1_Sheet1.Columns.Get(29).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType9.DecimalPlaces = 0; - numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType9.MaximumValue = 2147483647D; - numberCellType9.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(30).CellType = numberCellType9; - this.fpSpread1_Sheet1.Columns.Get(30).DataField = "jasmin"; - this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(30).Label = "자스민"; - this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1903,6 +1903,7 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); @@ -1916,7 +1917,6 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FPJ0000/Projects.cs b/SubProject/FPJ0000/Projects.cs index 8c50dab..0a48f64 100644 --- a/SubProject/FPJ0000/Projects.cs +++ b/SubProject/FPJ0000/Projects.cs @@ -69,5 +69,21 @@ namespace FPJ0000 public string model { get; set; } public string serial { get; set; } public string CMP_After2 { get; set; } + public string bdate { get; set; } + public string qdate { get; set; } + public string cdate { get; set; } + public string championid { get; set; } + public string designid { get; set; } + public string assemblyid { get; set; } + public string epanelid { get; set; } + public string softwareid { get; set; } + public string userAssembly { get; set; } + public string ReqLine { get; set; } + public string ReqSite { get; set; } + public string ReqPackage { get; set; } + public string ReqPlant { get; set; } + public Nullable pno { get; set; } + public string kdate { get; set; } + public Nullable jasmin { get; set; } } } diff --git a/SubProject/FPJ0000/Purchase.cs b/SubProject/FPJ0000/Purchase.cs index 3d56551..5a082ce 100644 --- a/SubProject/FPJ0000/Purchase.cs +++ b/SubProject/FPJ0000/Purchase.cs @@ -49,5 +49,8 @@ namespace FPJ0000 public System.DateTime wdate { get; set; } public Nullable inqty { get; set; } public Nullable pumpriceD { get; set; } + public string inremark { get; set; } + public string winuid { get; set; } + public Nullable windate { get; set; } } } diff --git a/SubProject/FPJ0000/UserGroup.cs b/SubProject/FPJ0000/UserGroup.cs index 097e10c..00daa03 100644 --- a/SubProject/FPJ0000/UserGroup.cs +++ b/SubProject/FPJ0000/UserGroup.cs @@ -20,5 +20,7 @@ namespace FPJ0000 public Nullable advpurchase { get; set; } public Nullable permission { get; set; } public Nullable advkisul { get; set; } + public string managerinfo { get; set; } + public string devinfo { get; set; } } } diff --git a/SubProject/FPJ0000/vEETGW_Project_LayoutList.cs b/SubProject/FPJ0000/vEETGW_Project_LayoutList.cs index 4b9e9dd..e710bbf 100644 --- a/SubProject/FPJ0000/vEETGW_Project_LayoutList.cs +++ b/SubProject/FPJ0000/vEETGW_Project_LayoutList.cs @@ -25,5 +25,6 @@ namespace FPJ0000 public string memo { get; set; } public Nullable isdel { get; set; } public string status { get; set; } + public string champion { get; set; } } } diff --git a/SubProject/FPJ0000/vGroupUser.cs b/SubProject/FPJ0000/vGroupUser.cs index 5e23ed3..d8149a6 100644 --- a/SubProject/FPJ0000/vGroupUser.cs +++ b/SubProject/FPJ0000/vGroupUser.cs @@ -35,5 +35,7 @@ namespace FPJ0000 public string state { get; set; } public Nullable useJobReport { get; set; } public Nullable useUserState { get; set; } + public string password { get; set; } + public Nullable exceptHoly { get; set; } } }