diff --git a/JobReportMailService/EETGW_ProjectToDo.cs b/JobReportMailService/EETGW_ProjectToDo.cs new file mode 100644 index 0000000..da679ae --- /dev/null +++ b/JobReportMailService/EETGW_ProjectToDo.cs @@ -0,0 +1,33 @@ +//------------------------------------------------------------------------------ +// +// 이 코드는 템플릿에서 생성되었습니다. +// +// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다. +// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다. +// +//------------------------------------------------------------------------------ + +namespace JobReportMailService +{ + using System; + using System.Collections.Generic; + + public partial class EETGW_ProjectToDo + { + public int idx { get; set; } + public int pidx { get; set; } + public Nullable pseq { get; set; } + public Nullable sw { get; set; } + public Nullable ww { get; set; } + public string sort { get; set; } + public string cate { get; set; } + public string title { get; set; } + public string pdate { get; set; } + public string edate { get; set; } + public Nullable process { get; set; } + public string remark { get; set; } + public string remark2 { get; set; } + public string wuid { get; set; } + public System.DateTime wdate { get; set; } + } +} diff --git a/JobReportMailService/vMailingProjectSchedule.cs b/JobReportMailService/EETGW_ProjectsSchedule.cs similarity index 71% rename from JobReportMailService/vMailingProjectSchedule.cs rename to JobReportMailService/EETGW_ProjectsSchedule.cs index a71b9fd..d2ccf3f 100644 --- a/JobReportMailService/vMailingProjectSchedule.cs +++ b/JobReportMailService/EETGW_ProjectsSchedule.cs @@ -12,20 +12,23 @@ namespace JobReportMailService using System; using System.Collections.Generic; - public partial class vMailingProjectSchedule + public partial class EETGW_ProjectsSchedule { public int idx { get; set; } - public string pdate { get; set; } - public string name { get; set; } - public string userManager { get; set; } + public string gcode { get; set; } + public Nullable project { get; set; } + public Nullable no { get; set; } public Nullable seq { get; set; } public string title { get; set; } public Nullable sw { get; set; } public Nullable ew { get; set; } public Nullable swa { get; set; } - public Nullable progress { get; set; } public Nullable ewa { get; set; } - public Nullable ww { get; set; } + public string uid { get; set; } public string memo { get; set; } + public Nullable appoval { get; set; } + public Nullable progress { get; set; } + public string wuid { get; set; } + public System.DateTime wdate { get; set; } } } diff --git a/JobReportMailService/JobReportMailService.csproj b/JobReportMailService/JobReportMailService.csproj index 6f8548e..4ef2335 100644 --- a/JobReportMailService/JobReportMailService.csproj +++ b/JobReportMailService/JobReportMailService.csproj @@ -65,12 +65,24 @@ True DataSet1.xsd + + Model1.tt + + + Model1.tt + Form fChildBase.cs + + Form + + + fNoScheduleDayWeek.cs + Form @@ -136,6 +148,9 @@ + + Model1.tt + True @@ -150,9 +165,6 @@ Model1.tt - - Model1.tt - @@ -199,6 +211,9 @@ fChildBase.cs + + fNoScheduleDayWeek.cs + fSendMail.cs diff --git a/JobReportMailService/MDIParent1.Designer.cs b/JobReportMailService/MDIParent1.Designer.cs index 101ac23..0aecafb 100644 --- a/JobReportMailService/MDIParent1.Designer.cs +++ b/JobReportMailService/MDIParent1.Designer.cs @@ -77,11 +77,12 @@ namespace JobReportMailService this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); this.printToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.statusStrip = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.menuStrip.SuspendLayout(); this.toolStrip.SuspendLayout(); this.statusStrip.SuspendLayout(); @@ -436,6 +437,7 @@ namespace JobReportMailService this.toolStripSeparator1, this.saveToolStripButton, this.printToolStripButton, + this.toolStripButton2, this.toolStripSeparator2, this.toolStripButton1}); this.toolStrip.Location = new System.Drawing.Point(0, 24); @@ -485,6 +487,20 @@ namespace JobReportMailService this.printToolStripButton.Text = "스케쥴(주)"; this.printToolStripButton.Click += new System.EventHandler(this.printToolStripButton_Click); // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // toolStripButton1 + // + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Black; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(111, 22); + this.toolStripButton1.Text = "메일생성및전송"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // // statusStrip // this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -502,19 +518,14 @@ namespace JobReportMailService this.toolStripStatusLabel.Size = new System.Drawing.Size(31, 17); this.toolStripStatusLabel.Text = "상태"; // - // toolStripSeparator2 + // toolStripButton2 // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); - // - // toolStripButton1 - // - this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); - this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Black; - this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(111, 22); - this.toolStripButton1.Text = "메일생성및전송"; - this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Black; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(107, 22); + this.toolStripButton2.Text = "스케쥴없음(주)"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // // MDIParent1 // @@ -592,6 +603,7 @@ namespace JobReportMailService private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton toolStripButton2; } } diff --git a/JobReportMailService/MDIParent1.cs b/JobReportMailService/MDIParent1.cs index db7834c..e639e74 100644 --- a/JobReportMailService/MDIParent1.cs +++ b/JobReportMailService/MDIParent1.cs @@ -125,5 +125,13 @@ namespace JobReportMailService childForm.Show(); } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + Form childForm = new fNoScheduleDayWeek(); + childForm.MdiParent = this; + //childForm.Text = "창 " + childFormNumber++; + childForm.Show(); + } } } diff --git a/JobReportMailService/MDIParent1.resx b/JobReportMailService/MDIParent1.resx index 841abe4..ec93bd7 100644 --- a/JobReportMailService/MDIParent1.resx +++ b/JobReportMailService/MDIParent1.resx @@ -358,6 +358,22 @@ 7KsQbgqUGgqaXhN8oTjoWBqB72ksLqcwsfADw5NR9DtXSDGXQzwxKecF9ZJWyG7oMDrpJ9/2b1IgYJGo HqKiTokywRVwmd+0qKoJB3mNOHDiAvaWC7GnrB67ubX5YkH53+BwfgHgHTGbZU7qDAAAAABJRU5ErkJg gg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIqSURBVDhPrZL7T1JxAMVZP/b/tLa2Wm21mail1YZlRjid + k6JhTApClhGmktrDWlKjK3OBDrLAMWJaY9MZZJbo0umWQIEFXRPQMB6ne788HFpbW322s93d3fM598X5 + 7xjtUxh0vId5dOaPMY14kL18O6zgrcePrWz8TMIbWMGgbQIlZy6DW31pu4Qts0ml0gjRETjdH0iGHC4Y + LONwz/hQJVITQbZSiN7qxsfPdHYzA7u8Go1jdnEZJruLLP92XWsaB5sks+4LhgvWbc5puDxeVDaocOSs + HBrtM9zps21KFJ1PSHnENZ9fzS0HwzHML4XRa3CglC+Dsqsfj0xjKGVEpNzUpof6/hAoyxs8MDqhf/4a + tyk7rt4yQtyiBb+xA+U1ChSfluLkuevo1lkhUWlRnHuMm49fIBKLk+WtJJIprMcT5E6+0uv49CUKeTuF + OmkXcweyjEB1zwzLq3d46nCDMr/E3b5hqHsGIGvXQdTcA8HFDvAaWnBUIEfRKQnOM+cqhdew/7goI1B2 + D8AfCGU3C4msbcAbXMVOcEh2UBzwxW0oqZZi1+GajKC504DpuSUw7ywPe/wtmsCcfw1jszQpW7OCY7UK + 7KsQbgqUGgqaXhN8oTjoWBqB72ksLqcwsfADw5NR9DtXSDGXQzwxKecF9ZJWyG7oMDrpJ9/2b1IgYJGo + HqKiTokywRVwmd+0qKoJB3mNOHDiAvaWC7GnrB67ubX5YkH53+BwfgHgHTGbZU7qDAAAAABJRU5ErkJg + gg== diff --git a/JobReportMailService/Model1.Context.cs b/JobReportMailService/Model1.Context.cs index 767e9b5..6d75ec5 100644 --- a/JobReportMailService/Model1.Context.cs +++ b/JobReportMailService/Model1.Context.cs @@ -31,6 +31,8 @@ namespace JobReportMailService public virtual DbSet vJobReportForUser { get; set; } public virtual DbSet HolidayLIst { get; set; } public virtual DbSet MailForm { get; set; } - public virtual DbSet vMailingProjectSchedule { get; set; } + public virtual DbSet EETGW_ProjectToDo { get; set; } + public virtual DbSet Projects { get; set; } + public virtual DbSet EETGW_ProjectsSchedule { get; set; } } } diff --git a/JobReportMailService/Model1.edmx b/JobReportMailService/Model1.edmx index 7031284..911190c 100644 --- a/JobReportMailService/Model1.edmx +++ b/JobReportMailService/Model1.edmx @@ -5,6 +5,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -86,6 +127,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -131,35 +228,22 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + SELECT [vGroupUser].[gcode] AS [gcode], @@ -197,28 +281,15 @@ [vJobReportForUser].[svalue] AS [svalue], [vJobReportForUser].[hrs] AS [hrs], [vJobReportForUser].[ot] AS [ot], - [vJobReportForUser].[userProcess] AS [userProcess], [vJobReportForUser].[requestpart] AS [requestpart], - [vJobReportForUser].[package] AS [package] + [vJobReportForUser].[package] AS [package], + [vJobReportForUser].[userProcess] AS [userProcess], + [vJobReportForUser].[status] AS [status], + [vJobReportForUser].[projectName] AS [projectName], + [vJobReportForUser].[description] AS [description], + [vJobReportForUser].[ww] AS [ww] FROM [dbo].[vJobReportForUser] AS [vJobReportForUser] - - SELECT - [vMailingProjectSchedule].[idx] AS [idx], - [vMailingProjectSchedule].[pdate] AS [pdate], - [vMailingProjectSchedule].[name] AS [name], - [vMailingProjectSchedule].[userManager] AS [userManager], - [vMailingProjectSchedule].[seq] AS [seq], - [vMailingProjectSchedule].[title] AS [title], - [vMailingProjectSchedule].[sw] AS [sw], - [vMailingProjectSchedule].[ew] AS [ew], - [vMailingProjectSchedule].[swa] AS [swa], - [vMailingProjectSchedule].[progress] AS [progress], - [vMailingProjectSchedule].[ewa] AS [ewa], - [vMailingProjectSchedule].[ww] AS [ww], - [vMailingProjectSchedule].[memo] AS [memo] - FROM [dbo].[vMailingProjectSchedule] AS [vMailingProjectSchedule] - @@ -313,9 +384,13 @@ - + + + + + @@ -324,7 +399,9 @@ - + + + @@ -359,23 +436,102 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + @@ -463,6 +619,10 @@ + + + + @@ -514,21 +674,102 @@ - - - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + diff --git a/JobReportMailService/Model1.edmx.diagram b/JobReportMailService/Model1.edmx.diagram index 49aa03a..b20655d 100644 --- a/JobReportMailService/Model1.edmx.diagram +++ b/JobReportMailService/Model1.edmx.diagram @@ -11,7 +11,9 @@ - + + + diff --git a/JobReportMailService/Projects.cs b/JobReportMailService/Projects.cs new file mode 100644 index 0000000..093eec2 --- /dev/null +++ b/JobReportMailService/Projects.cs @@ -0,0 +1,69 @@ +//------------------------------------------------------------------------------ +// +// 이 코드는 템플릿에서 생성되었습니다. +// +// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다. +// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다. +// +//------------------------------------------------------------------------------ + +namespace JobReportMailService +{ + using System; + using System.Collections.Generic; + + public partial class Projects + { + public int idx { get; set; } + public Nullable pidx { get; set; } + public string gcode { get; set; } + public Nullable isdel { get; set; } + public string category { get; set; } + public string status { get; set; } + public string asset { get; set; } + public Nullable level { get; set; } + public Nullable rev { get; set; } + public string process { get; set; } + public string part { get; set; } + public string pdate { get; set; } + public string name { get; set; } + public string userManager { get; set; } + public string usermain { get; set; } + public string usersub { get; set; } + public string userhw2 { get; set; } + public string reqstaff { get; set; } + public Nullable costo { get; set; } + public Nullable costn { get; set; } + public Nullable cnt { get; set; } + public string remark_req { get; set; } + public string remark_ans { get; set; } + public string sdate { get; set; } + public string ddate { get; set; } + public string edate { get; set; } + public string odate { get; set; } + public Nullable progress { get; set; } + public string memo { get; set; } + public string wuid { get; set; } + public System.DateTime wdate { get; set; } + public string orderno { get; set; } + public string crdue { get; set; } + public Nullable import { get; set; } + public string path { get; set; } + public string userprocess { get; set; } + public string CMP_Background { get; set; } + public string CMP_Description { get; set; } + public string CMP_Before { get; set; } + public string CMP_After { get; set; } + public Nullable bCost { get; set; } + public Nullable bFanOut { get; set; } + public string div { get; set; } + public string EB_Site { get; set; } + public string EB_Line { get; set; } + public string EB_Team { get; set; } + public string EB_Model { get; set; } + public string EB_OutSourceName { get; set; } + public Nullable EB_RepairTime { get; set; } + public Nullable EB_ConstNew { get; set; } + public string EB_BoardName { get; set; } + } +} diff --git a/JobReportMailService/Properties/AssemblyInfo.cs b/JobReportMailService/Properties/AssemblyInfo.cs index ba65e0b..6d592ec 100644 --- a/JobReportMailService/Properties/AssemblyInfo.cs +++ b/JobReportMailService/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 // 기본값으로 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.03.25.1300")] -[assembly: AssemblyFileVersion("21.03.25.1300")] +[assembly: AssemblyVersion("21.05.16.1600")] +[assembly: AssemblyFileVersion("21.05.16.1600")] diff --git a/JobReportMailService/fNoScheduleDayWeek.Designer.cs b/JobReportMailService/fNoScheduleDayWeek.Designer.cs new file mode 100644 index 0000000..ee9a232 --- /dev/null +++ b/JobReportMailService/fNoScheduleDayWeek.Designer.cs @@ -0,0 +1,83 @@ + +namespace JobReportMailService +{ + partial class fNoScheduleDayWeek + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fNoScheduleDayWeek)); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStrip1.SuspendLayout(); + this.SuspendLayout(); + // + // timer1 + // + this.timer1.Tick += new System.EventHandler(this.timer1_Tick); + // + // toolStrip1 + // + this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripButton1}); + this.toolStrip1.Location = new System.Drawing.Point(0, 0); + this.toolStrip1.Name = "toolStrip1"; + this.toolStrip1.Size = new System.Drawing.Size(473, 25); + this.toolStrip1.TabIndex = 2; + this.toolStrip1.Text = "toolStrip1"; + // + // toolStripButton1 + // + this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); + this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton1.Name = "toolStripButton1"; + this.toolStripButton1.Size = new System.Drawing.Size(48, 22); + this.toolStripButton1.Text = "Run"; + this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); + // + // fNoScheduleDayWeek + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(473, 416); + this.Controls.Add(this.toolStrip1); + this.Name = "fNoScheduleDayWeek"; + this.Text = "스케쥴없음(주보고)"; + this.Load += new System.EventHandler(this.fJobReportDay_Load); + this.Controls.SetChildIndex(this.toolStrip1, 0); + this.toolStrip1.ResumeLayout(false); + this.toolStrip1.PerformLayout(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripButton toolStripButton1; + } +} \ No newline at end of file diff --git a/JobReportMailService/fNoScheduleDayWeek.cs b/JobReportMailService/fNoScheduleDayWeek.cs new file mode 100644 index 0000000..ddbc41f --- /dev/null +++ b/JobReportMailService/fNoScheduleDayWeek.cs @@ -0,0 +1,241 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace JobReportMailService +{ + public partial class fNoScheduleDayWeek : fChildBase + { + + public fNoScheduleDayWeek() + { + InitializeComponent(); + } + + private void fJobReportDay_Load(object sender, EventArgs e) + { + task = Task.Run(() => + { + while (taskrun) + { + if (taskwait) + { + if (task != null) + task.Wait(1000); + continue; + } + + var ts = DateTime.Now - LastUpdateTime; + if (ts.TotalMinutes <= 15) + { + if ((DateTime.Now - ConsoleTime).TotalHours >= 1.0) + { + addmsg("15분 미만이라 동작하지 않습니다"); + ConsoleTime = DateTime.Now; + } + } + else if (DateTime.Now.DayOfWeek != DayOfWeek.Monday) + { + //토,일요일에는 동작하지 않는다 + if ((DateTime.Now - ConsoleTime).TotalHours >= 1.0) + { + addmsg("월요일에만 동작 합니다"); + ConsoleTime = DateTime.Now; + } + } + else if (DateTime.Now.Hour < 10) //10시부터 동작한다 + { + if ((DateTime.Now - ConsoleTime).TotalHours >= 1.0) + { + addmsg("9시 이전에는 동작하지 않습니다"); + ConsoleTime = DateTime.Now; + } + } + else + { + LastUpdateTime = DateTime.Now; + try + { + RunData(); + } + catch (Exception ex) + { + addmsg(ex.Message); + task.Wait(5000); + } + } + Task.Delay(Delaytime).Wait(); + } + + }); + timer1.Start(); + } + + void RunData() + { + addmsg("스케쥴입력(주) 미 작성자 추출 작업을 시작 합니다"); + + + var db = new EEEntities(); + + //메일양식이 지정되어있는지 체크 + var MailJD = db.MailForm.AsNoTracking().Where(t => t.gcode == Pub.vGcode & t.cate == "SN").FirstOrDefault(); + + if (MailJD == null) + { + //토,일요일에는 동작하지 않는다 + addmsg("메일 양식(SN)이 입력되지 않았습니다"); + return; + } + + //기준일자는 오늘부터 -15일이다 + var sd = DateTime.Now.AddDays(-15); + var ed = DateTime.Now; + var str_sd = sd.ToShortDateString(); + var str_ed = ed.ToShortDateString(); + var str_dt = DateTime.Now.ToShortDateString(); + + //오늘날짜로 데이터가 등록되어있느지 확인한다. + db = new EEEntities(); + var Existweek = db.MailData.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.cate == "SN" && t.wuid == "395552" && t.pdate == str_dt).Any(); + if (Existweek) + { + addmsg($"스케쥴(day)({str_dt}) 보고 메일이 이미 등록되어 있습니다"); + return; + } + + //대상 사용자 목록을 추출한다 + //var ta = new DataSet1TableAdapters.vMailingProjectScheduleTableAdapter(); + //var users = new DataSet1.vMailingProjectScheduleDataTable(); + //ta.Fill(users); + db = new EEEntities(); + var projects = db.Projects.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.status == "진행" && (t.isdel == null || t.isdel == false)).OrderBy(t => t.sdate).ToList(); + // db.vMailingProjectSchedule.ToList();// .vJobReportForUser.Where(t => t.gcode == Pub.vGcode).GroupBy(t => t.id); + + addmsg($"{projects.Count} 건의 데이터가 확인 되었습니다"); + + //메일데이터 생성 + var body = new System.Text.StringBuilder(); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + body.AppendLine(""); + + //var gp = projects.GroupBy(t => t.idx); + foreach (var row in projects) + { + + //스케쥴에서 데이터를 찾는다. + var cnt = db.EETGW_ProjectsSchedule.AsNoTracking().Where(t => t.gcode == Pub.vGcode && t.project == row.idx && t.appoval > 1).Any(); + if (cnt == true) continue; //등록되었다 + + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + body.AppendLine($""); + } + body.AppendLine("
시작일상태번호Project요청Champion협업만료일수량외주금액자체금액절감액CR/CF
{row.sdate}{row.status}{row.idx}{row.name}{row.reqstaff}{row.userManager}{row.usermain}/{row.usersub}/{row.userhw2}{row.edate}{row.cnt}{row.costo}{row.costn}{row.costo - row.costn}{row.orderno}
"); + + //일별경고(월요일제외) + + if (MailJD != null) + { + var mail_subject = MailJD.subject;//.Replace("{담당자}", userinfo.name).Replace("{사번}", userinfo.id); + var mail_to = MailJD.tolist;//.Replace("{담당자}", userinfo.email); + var mail_cc = string.Empty; // + if (MailJD.cc != null) mail_cc = MailJD.cc;//.Replace("{담당자}", userinfo.email); + var mail_bcc = string.Empty; + if (MailJD.bcc != null) mail_bcc = MailJD.bcc;//.Replace("{담당자}", userinfo.email); + var mail_body = MailJD.body;//.Replace("{담당자}", userinfo.name); + //mail_body = mail_body.Replace("{사번}", userinfo.id); + + //메일본문을 생성해서 진행해야함 + var mail_content = mail_body.Replace("{data}", body.ToString()); + + //메일데이터를 생성한다. + //mail_to = "chikyun.kim@amkor.co.kr"; + //mail_bcc = string.Empty; + //mail_cc = string.Empty; + + mail_to = Pub.MailSort(mail_to, MailJD.exceptmail); + if (string.IsNullOrEmpty(mail_to) == false) + { + db = new EEEntities(); + db.MailData.Add(new MailData + { + gcode = Pub.vGcode, + cate = "SN", + subject = mail_subject, + fromlist = "eetgw@amkor.co.kr", + tolist = Pub.MailSort(mail_to, MailJD.exceptmail), + bcc = mail_bcc, + cc = Pub.MailSort(mail_cc, MailJD.exceptmailcc), + pdate = DateTime.Now.ToShortDateString(), + body = mail_content, + wuid = "395552", + wdate = DateTime.Now, + }); + db.SaveChanges(); + addmsg($"메일 전송 완료(no스케쥴week)"); + System.Threading.Thread.Sleep(10000); + } + else + { + addmsg("받는사람이 소거되어 메일을 생성하지 않습니다"); + } + } + } + + private void toolStripButton1_Click(object sender, EventArgs e) + { + taskwait = !taskwait; + } + + private void timer1_Tick(object sender, EventArgs e) + { + if (task != null) + { + if (task.IsCompleted) this.toolStripButton1.Text = "완료"; + else if (task.IsCanceled) this.toolStripButton1.Text = "취소"; + else if (taskwait) this.toolStripButton1.Text = "대기상태"; + else this.toolStripButton1.Text = "가동중"; + this.toolStripButton1.Enabled = true; + } + else + { + this.toolStripButton1.Text = "사용불가"; + this.toolStripButton1.Enabled = false; + } + + } + } +} diff --git a/JobReportMailService/fNoScheduleDayWeek.resx b/JobReportMailService/fNoScheduleDayWeek.resx new file mode 100644 index 0000000..49cb4c2 --- /dev/null +++ b/JobReportMailService/fNoScheduleDayWeek.resx @@ -0,0 +1,142 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + + 104, 17 + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + + \ No newline at end of file diff --git a/JobReportMailService/vJobReportForUser.cs b/JobReportMailService/vJobReportForUser.cs index b397d5a..aa762e1 100644 --- a/JobReportMailService/vJobReportForUser.cs +++ b/JobReportMailService/vJobReportForUser.cs @@ -27,5 +27,9 @@ namespace JobReportMailService public string userProcess { get; set; } public string requestpart { get; set; } public string package { get; set; } + public string status { get; set; } + public string projectName { get; set; } + public string description { get; set; } + public string ww { get; set; } } } diff --git a/Project/BaseController.cs b/Project/BaseController.cs index f9a371b..96e2a33 100644 --- a/Project/BaseController.cs +++ b/Project/BaseController.cs @@ -238,6 +238,34 @@ namespace Project } } + agi.HtmlDocument doc = new agi.HtmlDocument(); + doc.LoadHtml(contents); + + //파일참조 태그를 모두 가져옴 + var tags_include = doc.QuerySelectorAll("include"); + foreach (var item in tags_include) + { + var filename = item.InnerText; + + var load_file = String.Concat(AppDomain.CurrentDomain.BaseDirectory, "View", filename.Replace("/", "\\")); + load_file = load_file.Replace("\\\\", "\\"); + String fileContents;// = String.Empty; + + Console.WriteLine("## " + item.OuterHtml); + if (System.IO.File.Exists(load_file)) + { + fileContents = System.IO.File.ReadAllText(load_file, System.Text.Encoding.UTF8); + } + else + { + fileContents = string.Format("
#include Error:nofile:{0}
", + filename); //파일이없다면 해당 부분은 오류 처리한다. + } + contents = contents.Replace(item.OuterHtml, fileContents); + } + + + //콘텐츠내의 file 을 찾아서 처리한다. ; 정규식의 처리속도가 느릴듯하여, 그냥 처리해본다 while (true) { diff --git a/Project/Controller/CustomerController.cs b/Project/Controller/CustomerController.cs index ae2e5a4..014807d 100644 --- a/Project/Controller/CustomerController.cs +++ b/Project/Controller/CustomerController.cs @@ -8,7 +8,6 @@ namespace Project public class CustomerController : BaseController { - // PUT api/values/5 public void Put(int id, [FromBody] string value) { diff --git a/Project/Controller/JobreportController.cs b/Project/Controller/JobreportController.cs index 04ca8f2..f2eeadf 100644 --- a/Project/Controller/JobreportController.cs +++ b/Project/Controller/JobreportController.cs @@ -1,6 +1,8 @@ -using System; +using Microsoft.Owin; +using System; using System.Linq; using System.Net.Http; +using System.Web; using System.Web.Http; namespace Project @@ -19,10 +21,100 @@ namespace Project { } - [HttpGet] - public string Test() + [HttpPost] + public string Add(FormCollection tbpdate) { - return "test"; + var vals = Request.GetQueryNameValuePairs(); + return string.Empty; + } + + + [HttpGet] + public HttpResponseMessage Add() + { + //로그인이 되어있지않다면 로그인을 가져온다 + MethodResult result; + result = View("/jobreport/add"); + + + var gets = Request.GetQueryNameValuePairs();// GetParameters(data); + + + var key_search = gets.Where(t => t.Key == "search").FirstOrDefault(); + var model = GetGlobalModel(); + var getParams = Request.GetQueryNameValuePairs();// GetParameters(data); + + //기본값을 찾아서 없애줘야한다 + var searchkey = string.Empty; + if (key_search.Key != null && key_search.Value.isEmpty() == false) searchkey = key_search.Value.Trim(); + + var tbody = new System.Text.StringBuilder(); + + //테이블데이터생성 + var itemcnt = 0; + //if (searchkey.isEmpty() == false) + { + var db = new EEEntitiesJobreport(); + var sd = DateTime.Now.ToString("yyyy-MM-01"); + var ed = DateTime.Now.ToShortDateString(); + var rows = db.vJobReportForUser.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.id == FCOMMON.info.Login.no && t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 1).OrderByDescending(t => t.pdate); + itemcnt = rows.Count(); + foreach (var item in rows) + { + tbody.AppendLine(""); + + tbody.AppendLine($"{item.pdate.Substring(5)}"); + tbody.AppendLine($"{item.ww}"); + tbody.AppendLine($"{item.name}"); + + if (item.status == "진행 중" || item.status.EndsWith("%")) + tbody.AppendLine($"{item.status}"); + else + tbody.AppendLine($"{item.status}"); + + tbody.AppendLine($"{item.type}"); + tbody.AppendLine($"{item.projectName}"); + tbody.AppendLine($"{item.hrs}"); + tbody.AppendLine($"{item.ot}"); + + tbody.AppendLine(""); + tbody.AppendLine(item.description); + tbody.AppendLine(""); + + tbody.AppendLine(""); + } + } + + //아잍쳄이 없는경우 + if (itemcnt == 0) + { + tbody.AppendLine(""); + tbody.AppendLine("1"); + tbody.AppendLine("자료가 없습니다"); + tbody.AppendLine(""); + } + + + var contents = result.Content.Replace("{search}", searchkey); + contents = contents.Replace("{tabledata}", tbody.ToString()); + contents = contents.Replace("{cnt}", itemcnt.ToString()); + + + //공용값 적용 + ApplyCommonValue(ref contents); + + //최종문자 적용 + result.Content = contents; + + var resp = new HttpResponseMessage() + { + Content = new StringContent( + result.Content, + System.Text.Encoding.UTF8, + "text/html") + }; + + return resp; } [HttpGet] diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 829e3c9..5f02e6e 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -153,14 +153,13 @@ namespace Project.Dialog FCOMMON.info.Login.permission = 0; FCOMMON.info.Login.gpermission = int.Parse(gperm); - using (var dbEnity = new EEEntitiesMain()) { var drGrpUser = dbEnity.EETGW_GroupUser.Where(t => t.uid == userdr.id & t.gcode == gCode).FirstOrDefault(); - FCOMMON.info.Login.process = drGrpUser.Process; + if (drGrpUser == null) FCOMMON.info.Login.process = (userdr.id == "dev" ? "개발자":""); + else FCOMMON.info.Login.process = drGrpUser.Process; } - //로그인정보 기록 AddLoginInfo(); @@ -174,7 +173,6 @@ namespace Project.Dialog Util.MsgE("데이터베이스 조회 실패 다음 오류 메세지를 참고하세요.\n\n" + ex.Message + "\n\n증상이 동일 할 경우 서버가 접속가능한지 먼저 확인하세요"); DialogResult = System.Windows.Forms.DialogResult.Cancel; } - } void MakeAutoJobReport() @@ -222,9 +220,6 @@ namespace Project.Dialog "자동입력을 해제하려면 '업무일지-자동입력' 화면에서 내역을 변경하거나 종료일자를 설정하시기 바랍니다"); } } - - - } void AddLoginInfo() @@ -268,23 +263,6 @@ namespace Project.Dialog Console.WriteLine(ex.Message); } } - - private void label3_Click(object sender, EventArgs e) - { - - } - - private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - //var f = new Dialog.fSelectDept(); - //if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - //{ - // if (cmbDept.Items.Contains(f.deptName) == false) - // cmbDept.Items.Add(f.deptName); - // cmbDept.Text = f.deptName; - //} - } - private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr"); diff --git a/Project/_Common/fAddNewUser.cs b/Project/_Common/fAddNewUser.cs index 19c7e33..499dfd3 100644 --- a/Project/_Common/fAddNewUser.cs +++ b/Project/_Common/fAddNewUser.cs @@ -150,7 +150,7 @@ namespace Project._Common drGuser.level = 1; drGuser.uid = this.tbId.Text.Trim(); drGuser.state = this.tbState.Text.Trim(); - drGuser.Process = this.tbProcess.Text.Trim(); + drGuser.Process = this.tbProcess.Text.Trim(); //drGuser.useJobReport = this.chkJobReport.Checked; drGuser.useUserState = this.chkUserSt.Checked; db.EETGW_GroupUser.Add(drGuser); @@ -168,6 +168,7 @@ namespace Project._Common drUser.gcode = gcode; drUser.level = 1; drUser.id = tbId.Text.Trim(); + drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; //기본값0 drUser.name = tbNameK.Text.Trim(); drUser.nameE = tbNameE.Text.Trim(); @@ -184,6 +185,7 @@ namespace Project._Common else { + if (drUser.password.isEmpty()) drUser.password = "B6589FC6AB0DC82CF12099D1C2D40AB994E8410C"; drUser.name = tbNameK.Text.Trim(); drUser.nameE = tbNameE.Text.Trim(); drUser.dept = this.tbDept.Text.Trim(); diff --git a/SubProject/FCM0000/DSUser.Designer.cs b/SubProject/FCM0000/DSUser.Designer.cs index f99f882..4f51d17 100644 --- a/SubProject/FCM0000/DSUser.Designer.cs +++ b/SubProject/FCM0000/DSUser.Designer.cs @@ -1214,6 +1214,10 @@ namespace FCM0000 { private global::System.Data.DataColumn columnjobreport; + private global::System.Data.DataColumn columnsavecost; + + private global::System.Data.DataColumn columnscheapp; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public AuthDataTable() { @@ -1303,6 +1307,22 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn savecostColumn { + get { + return this.columnsavecost; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn scheappColumn { + get { + return this.columnscheapp; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1340,7 +1360,7 @@ namespace FCM0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public AuthRow AddAuthRow(string user, string gcode, int purchase, int holyday, int project, int jobreport) { + public AuthRow AddAuthRow(string user, string gcode, int purchase, int holyday, int project, int jobreport, int savecost, int scheapp) { AuthRow rowAuthRow = ((AuthRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1349,7 +1369,9 @@ namespace FCM0000 { purchase, holyday, project, - jobreport}; + jobreport, + savecost, + scheapp}; rowAuthRow.ItemArray = columnValuesArray; this.Rows.Add(rowAuthRow); return rowAuthRow; @@ -1386,6 +1408,8 @@ namespace FCM0000 { this.columnholyday = base.Columns["holyday"]; this.columnproject = base.Columns["project"]; this.columnjobreport = base.Columns["jobreport"]; + this.columnsavecost = base.Columns["savecost"]; + this.columnscheapp = base.Columns["scheapp"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1405,6 +1429,10 @@ namespace FCM0000 { base.Columns.Add(this.columnproject); this.columnjobreport = new global::System.Data.DataColumn("jobreport", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnjobreport); + this.columnsavecost = new global::System.Data.DataColumn("savecost", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsavecost); + this.columnscheapp = new global::System.Data.DataColumn("scheapp", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnscheapp); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -2264,6 +2292,38 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int savecost { + get { + if (this.IssavecostNull()) { + return 0; + } + else { + return ((int)(this[this.tableAuth.savecostColumn])); + } + } + set { + this[this.tableAuth.savecostColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int scheapp { + get { + if (this.IsscheappNull()) { + return 0; + } + else { + return ((int)(this[this.tableAuth.scheappColumn])); + } + } + set { + this[this.tableAuth.scheappColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsuserNull() { @@ -2323,6 +2383,30 @@ namespace FCM0000 { public void SetjobreportNull() { this[this.tableAuth.jobreportColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IssavecostNull() { + return this.IsNull(this.tableAuth.savecostColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetsavecostNull() { + this[this.tableAuth.savecostColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsscheappNull() { + return this.IsNull(this.tableAuth.scheappColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetscheappNull() { + this[this.tableAuth.scheappColumn] = global::System.Convert.DBNull; + } } /// @@ -4058,10 +4142,12 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te tableMapping.ColumnMappings.Add("holyday", "holyday"); tableMapping.ColumnMappings.Add("project", "project"); tableMapping.ColumnMappings.Add("jobreport", "jobreport"); + tableMapping.ColumnMappings.Add("savecost", "savecost"); + tableMapping.ColumnMappings.Add("scheapp", "scheapp"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_user", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -4075,10 +4161,14 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport); -SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp); +SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user]"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4086,10 +4176,12 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@holyday", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "holyday", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport))); -SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE (idx = @idx) ORDER BY [user]"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp))); +SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = @idx) ORDER BY [user]"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -4097,6 +4189,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@holyday", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "holyday", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_user", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_user", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "user", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -4109,6 +4203,10 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_jobreport", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jobreport", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_savecost", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "savecost", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_scheapp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scheapp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4125,8 +4223,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, [user], gcode, purchase, holyday, project, jobreport\r\nFROM Auth\r" + - "\nWHERE (gcode = @gcode)\r\nORDER BY [user]"; + this._commandCollection[0].CommandText = "SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, sche" + + "app\r\nFROM Auth\r\nWHERE (gcode = @gcode)\r\nORDER BY [user]"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -4200,7 +4298,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_user, string Original_gcode, global::System.Nullable Original_purchase, global::System.Nullable Original_holyday, global::System.Nullable Original_project, global::System.Nullable Original_jobreport) { + public virtual int Delete(int Original_idx, string Original_user, string Original_gcode, global::System.Nullable Original_purchase, global::System.Nullable Original_holyday, global::System.Nullable Original_project, global::System.Nullable Original_jobreport, global::System.Nullable Original_savecost, global::System.Nullable Original_scheapp) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_user == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -4248,6 +4346,22 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE this.Adapter.DeleteCommand.Parameters[10].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[11].Value = global::System.DBNull.Value; } + if ((Original_savecost.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[12].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[13].Value = ((int)(Original_savecost.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[12].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[13].Value = global::System.DBNull.Value; + } + if ((Original_scheapp.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[14].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[15].Value = ((int)(Original_scheapp.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[14].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[15].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -4268,7 +4382,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string user, string gcode, global::System.Nullable purchase, global::System.Nullable holyday, global::System.Nullable project, global::System.Nullable jobreport) { + public virtual int Insert(string user, string gcode, global::System.Nullable purchase, global::System.Nullable holyday, global::System.Nullable project, global::System.Nullable jobreport, global::System.Nullable savecost, global::System.Nullable scheapp) { if ((user == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -4305,6 +4419,18 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE else { this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value; } + if ((savecost.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[6].Value = ((int)(savecost.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value; + } + if ((scheapp.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[7].Value = ((int)(scheapp.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -4325,7 +4451,25 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string user, string gcode, global::System.Nullable purchase, global::System.Nullable holyday, global::System.Nullable project, global::System.Nullable jobreport, int Original_idx, string Original_user, string Original_gcode, global::System.Nullable Original_purchase, global::System.Nullable Original_holyday, global::System.Nullable Original_project, global::System.Nullable Original_jobreport, int idx) { + public virtual int Update( + string user, + string gcode, + global::System.Nullable purchase, + global::System.Nullable holyday, + global::System.Nullable project, + global::System.Nullable jobreport, + global::System.Nullable savecost, + global::System.Nullable scheapp, + int Original_idx, + string Original_user, + string Original_gcode, + global::System.Nullable Original_purchase, + global::System.Nullable Original_holyday, + global::System.Nullable Original_project, + global::System.Nullable Original_jobreport, + global::System.Nullable Original_savecost, + global::System.Nullable Original_scheapp, + int idx) { if ((user == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -4362,54 +4506,82 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE else { this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(Original_idx)); - if ((Original_user == null)) { - this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[8].Value = global::System.DBNull.Value; + if ((savecost.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[6].Value = ((int)(savecost.Value)); } else { - this.Adapter.UpdateCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(Original_user)); + this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; + } + if ((scheapp.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[7].Value = ((int)(scheapp.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idx)); + if ((Original_user == null)) { + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_user)); } if ((Original_gcode == null)) { throw new global::System.ArgumentNullException("Original_gcode"); } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_gcode)); } if ((Original_purchase.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_purchase.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; - } - if ((Original_holyday.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_holyday.Value)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_purchase.Value)); } else { this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; } - if ((Original_project.HasValue == true)) { + if ((Original_holyday.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_project.Value)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_holyday.Value)); } else { this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; } - if ((Original_jobreport.HasValue == true)) { + if ((Original_project.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_jobreport.Value)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_project.Value)); } else { this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(idx)); + if ((Original_jobreport.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_jobreport.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; + } + if ((Original_savecost.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(Original_savecost.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; + } + if ((Original_scheapp.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_scheapp.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[24].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -4430,8 +4602,25 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Update, true)] - public virtual int Update(string user, string gcode, global::System.Nullable purchase, global::System.Nullable holyday, global::System.Nullable project, global::System.Nullable jobreport, int Original_idx, string Original_user, string Original_gcode, global::System.Nullable Original_purchase, global::System.Nullable Original_holyday, global::System.Nullable Original_project, global::System.Nullable Original_jobreport) { - return this.Update(user, gcode, purchase, holyday, project, jobreport, Original_idx, Original_user, Original_gcode, Original_purchase, Original_holyday, Original_project, Original_jobreport, Original_idx); + public virtual int Update( + string user, + string gcode, + global::System.Nullable purchase, + global::System.Nullable holyday, + global::System.Nullable project, + global::System.Nullable jobreport, + global::System.Nullable savecost, + global::System.Nullable scheapp, + int Original_idx, + string Original_user, + string Original_gcode, + global::System.Nullable Original_purchase, + global::System.Nullable Original_holyday, + global::System.Nullable Original_project, + global::System.Nullable Original_jobreport, + global::System.Nullable Original_savecost, + global::System.Nullable Original_scheapp) { + return this.Update(user, gcode, purchase, holyday, project, jobreport, savecost, scheapp, Original_idx, Original_user, Original_gcode, Original_purchase, Original_holyday, Original_project, Original_jobreport, Original_savecost, Original_scheapp, Original_idx); } } diff --git a/SubProject/FCM0000/DSUser.xsd b/SubProject/FCM0000/DSUser.xsd index 3c0b728..bb0e09f 100644 --- a/SubProject/FCM0000/DSUser.xsd +++ b/SubProject/FCM0000/DSUser.xsd @@ -251,10 +251,10 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te - + - DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport))) + DELETE FROM [Auth] WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp))) @@ -268,13 +268,17 @@ SELECT id, password, nameE, name, dept, grade, email, level, indate, outdate, te + + + + - INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport); -SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user] + INSERT INTO [Auth] ([user], [gcode], [purchase], [holyday], [project], [jobreport], [savecost], [scheapp]) VALUES (@user, @gcode, @purchase, @holyday, @project, @jobreport, @savecost, @scheapp); +SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = SCOPE_IDENTITY()) ORDER BY [user] @@ -282,24 +286,26 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE + + - SELECT idx, [user], gcode, purchase, holyday, project, jobreport + SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (gcode = @gcode) ORDER BY [user] - + - UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport))); -SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE (idx = @idx) ORDER BY [user] + UPDATE [Auth] SET [user] = @user, [gcode] = @gcode, [purchase] = @purchase, [holyday] = @holyday, [project] = @project, [jobreport] = @jobreport, [savecost] = @savecost, [scheapp] = @scheapp WHERE (([idx] = @Original_idx) AND ((@IsNull_user = 1 AND [user] IS NULL) OR ([user] = @Original_user)) AND ([gcode] = @Original_gcode) AND ((@IsNull_purchase = 1 AND [purchase] IS NULL) OR ([purchase] = @Original_purchase)) AND ((@IsNull_holyday = 1 AND [holyday] IS NULL) OR ([holyday] = @Original_holyday)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_jobreport = 1 AND [jobreport] IS NULL) OR ([jobreport] = @Original_jobreport)) AND ((@IsNull_savecost = 1 AND [savecost] IS NULL) OR ([savecost] = @Original_savecost)) AND ((@IsNull_scheapp = 1 AND [scheapp] IS NULL) OR ([scheapp] = @Original_scheapp))); +SELECT idx, [user], gcode, purchase, holyday, project, jobreport, savecost, scheapp FROM Auth WHERE (idx = @idx) ORDER BY [user] @@ -307,6 +313,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE + + @@ -319,7 +327,11 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE - + + + + + @@ -333,6 +345,8 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE + + @@ -344,7 +358,7 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE - + @@ -354,25 +368,25 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE - + - + - + - + @@ -382,113 +396,113 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + @@ -499,28 +513,30 @@ SELECT idx, [user], gcode, purchase, holyday, project, jobreport FROM Auth WHERE - + - + - + - - - - + + + + + + diff --git a/SubProject/FCM0000/User/fUserAuth.Designer.cs b/SubProject/FCM0000/User/fUserAuth.Designer.cs index aab06ec..2bd9d9a 100644 --- a/SubProject/FCM0000/User/fUserAuth.Designer.cs +++ b/SubProject/FCM0000/User/fUserAuth.Designer.cs @@ -30,16 +30,19 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserAuth)); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.dSUser = new FCM0000.DSUser(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); + this.bs = new System.Windows.Forms.BindingSource(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); @@ -60,15 +63,14 @@ this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.ta = new FCM0000.DSUserTableAdapters.AuthTableAdapter(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.ta = new FCM0000.DSUserTableAdapters.AuthTableAdapter(); ((System.ComponentModel.ISupportInitialize)(this.dSUser)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); this.cm1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // @@ -101,14 +103,14 @@ this.toolStripLabel2, this.tbFind, this.btFind}); - this.bn.Location = new System.Drawing.Point(0, 623); + this.bn.Location = new System.Drawing.Point(0, 601); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(652, 25); + this.bn.Size = new System.Drawing.Size(736, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -120,6 +122,11 @@ this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(67, 22); this.bindingNavigatorAddNewItem.Text = "추가(&A)"; // + // bs + // + this.bs.DataMember = "Auth"; + this.bs.DataSource = this.dSUser; + // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; @@ -274,25 +281,16 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(652, 623); + this.fpSpread1.Size = new System.Drawing.Size(736, 601); this.fpSpread1.TabIndex = 2; // - // bs - // - this.bs.DataMember = "Auth"; - this.bs.DataSource = this.dSUser; - // - // ta - // - this.ta.ClearBeforeFill = true; - // // 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 = 7; + this.fpSpread1_Sheet1.ColumnCount = 9; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "사용자 번호"; @@ -301,76 +299,92 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "프로젝트"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "업무일지"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 33F; - numberCellType11.DecimalPlaces = 0; - numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType11.MaximumValue = 2147483647D; - numberCellType11.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType11; + numberCellType8.DecimalPlaces = 0; + numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType8.MaximumValue = 2147483647D; + numberCellType8.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType8; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).Visible = false; this.fpSpread1_Sheet1.Columns.Get(0).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "user"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "사용자 번호"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 151F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType4; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "gcode"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Visible = false; this.fpSpread1_Sheet1.Columns.Get(2).Width = 151F; - numberCellType12.DecimalPlaces = 0; - numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType12.MaximumValue = 2147483647D; - numberCellType12.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType12; + numberCellType9.DecimalPlaces = 0; + numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType9.MaximumValue = 2147483647D; + numberCellType9.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType9; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "purchase"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "구매관리"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 77F; - numberCellType13.DecimalPlaces = 0; - numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType13.MaximumValue = 2147483647D; - numberCellType13.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType13; + numberCellType10.DecimalPlaces = 0; + numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType10.MaximumValue = 2147483647D; + numberCellType10.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType10; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "holyday"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "근태관리"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 77F; - numberCellType14.DecimalPlaces = 0; - numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType14.MaximumValue = 2147483647D; - numberCellType14.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType14; + numberCellType11.DecimalPlaces = 0; + numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType11.MaximumValue = 2147483647D; + numberCellType11.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType11; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "프로젝트"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 77F; - numberCellType15.DecimalPlaces = 0; - numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType15.MaximumValue = 2147483647D; - numberCellType15.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType15; + numberCellType12.DecimalPlaces = 0; + numberCellType12.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType12.MaximumValue = 2147483647D; + numberCellType12.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType12; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "jobreport"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무일지"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 77F; + numberCellType13.DecimalPlaces = 0; + numberCellType13.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType13.MaximumValue = 2147483647D; + numberCellType13.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType13; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "savecost"; + numberCellType14.DecimalPlaces = 0; + numberCellType14.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType14.MaximumValue = 2147483647D; + numberCellType14.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType14; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "scheapp"; 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; // + // ta + // + this.ta.ClearBeforeFill = true; + // // fUserAuth // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(652, 648); + this.ClientSize = new System.Drawing.Size(736, 626); this.ContextMenuStrip = this.cm1; this.Controls.Add(this.fpSpread1); this.Controls.Add(this.bn); @@ -386,9 +400,9 @@ ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); this.cm1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FCM0000/User/fUserAuth.cs b/SubProject/FCM0000/User/fUserAuth.cs index 412aaf0..74ff8d1 100644 --- a/SubProject/FCM0000/User/fUserAuth.cs +++ b/SubProject/FCM0000/User/fUserAuth.cs @@ -110,7 +110,7 @@ namespace FCM0000 { var drv = this.bs.Current as DataRowView; if (drv == null) return; - var dr = drv.Row as DSUser.UserGroupRow; + var dr = drv.Row as DSUser.AuthRow; if (dr.RowState == DataRowState.Added || dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Deleted) this.bs.RemoveCurrent(); var dlg =FCOMMON.Util.MsgQ("다음 자료를 삭제하시겠습니까?"); diff --git a/SubProject/FPJ0000/Auth.cs b/SubProject/FPJ0000/Auth.cs new file mode 100644 index 0000000..8c788c9 --- /dev/null +++ b/SubProject/FPJ0000/Auth.cs @@ -0,0 +1,27 @@ +//------------------------------------------------------------------------------ +// +// 이 코드는 템플릿에서 생성되었습니다. +// +// 이 파일을 수동으로 변경하면 응용 프로그램에서 예기치 않은 동작이 발생할 수 있습니다. +// 이 파일을 수동으로 변경하면 코드가 다시 생성될 때 변경 내용을 덮어씁니다. +// +//------------------------------------------------------------------------------ + +namespace FPJ0000 +{ + using System; + using System.Collections.Generic; + + public partial class Auth + { + public int idx { get; set; } + public string user { get; set; } + public string gcode { get; set; } + public Nullable purchase { get; set; } + public Nullable holyday { get; set; } + public Nullable project { get; set; } + public Nullable jobreport { get; set; } + public Nullable savecost { get; set; } + public Nullable scheapp { get; set; } + } +} diff --git a/SubProject/FPJ0000/EETGW_ProjectsSchedule.cs b/SubProject/FPJ0000/EETGW_ProjectsSchedule.cs index a76769d..7f9b408 100644 --- a/SubProject/FPJ0000/EETGW_ProjectsSchedule.cs +++ b/SubProject/FPJ0000/EETGW_ProjectsSchedule.cs @@ -17,16 +17,18 @@ namespace FPJ0000 public int idx { get; set; } public string gcode { get; set; } public Nullable project { get; set; } + public Nullable no { get; set; } public Nullable seq { get; set; } public string title { get; set; } public Nullable sw { get; set; } public Nullable ew { get; set; } public Nullable swa { get; set; } public Nullable ewa { get; set; } + public string uid { get; set; } public string memo { get; set; } + public Nullable appoval { get; set; } + public Nullable progress { get; set; } public string wuid { get; set; } public System.DateTime wdate { get; set; } - public string uid { get; set; } - public Nullable progress { get; set; } } } diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj index 9539cdf..b584e07 100644 --- a/SubProject/FPJ0000/FPJ0000.csproj +++ b/SubProject/FPJ0000/FPJ0000.csproj @@ -139,6 +139,9 @@ + + Model1.tt + Model1.tt diff --git a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs index c4c3072..8f1136d 100644 --- a/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs +++ b/SubProject/FPJ0000/JobReport_/fJobReport_Add.cs @@ -338,12 +338,12 @@ namespace FPJ0000.JobReport_ var hrs = float.Parse(tbHrs.Text); if (hrs > 0) { - FCOMMON.Util.MsgI("입력일자는 휴일로 등록되어 있습니다.\n\n근무시간은 OT에 입력하시기 바랍니다."); + FCOMMON.Util.MsgI("입력일자는 휴일로 등록되어 있습니다.\n\n OT에 해당하면 수정하시기 바랍니다."); //tbOt.Text = tbHrs.Text; - dr.hrs = 0; - tbHrs.Text = "0"; - tbHrs.Focus(); - return; + //dr.hrs = 0; + //tbHrs.Text = "0"; + //tbHrs.Focus(); + //return; } } @@ -438,19 +438,19 @@ namespace FPJ0000.JobReport_ if (tbHrs.Text == "") tbHrs.Text = "0"; if (tbOt.Text == "") tbOt.Text = "0"; float hrs = float.Parse(tbHrs.Text); - if (dtPdate.Value.DayOfWeek == DayOfWeek.Saturday || dtPdate.Value.DayOfWeek == DayOfWeek.Sunday) - { - tbHrs.Enabled = false; - if (hrs != 0) - { - FCOMMON.Util.MsgI("공휴일에는 근무시간을 입력할 수 없습니다.\n초과시간에 입력하세요.\n\n해당 값은 삭제 됩니다."); - dr.hrs = 0; - tbHrs.Text = "0"; - if (hrs != 8) tbOt.Text = hrs.ToString(); - tbOt.Focus(); - } - } - else tbHrs.Enabled = true; + //if (dtPdate.Value.DayOfWeek == DayOfWeek.Saturday || dtPdate.Value.DayOfWeek == DayOfWeek.Sunday) + //{ + // tbHrs.Enabled = false; + // if (hrs != 0) + // { + // FCOMMON.Util.MsgI("공휴일에는 근무시간을 입력할 수 없습니다.\n초과시간에 입력하세요.\n\n해당 값은 삭제 됩니다."); + // dr.hrs = 0; + // tbHrs.Text = "0"; + // if (hrs != 8) tbOt.Text = hrs.ToString(); + // tbOt.Focus(); + // } + //} + //else tbHrs.Enabled = true; } void UpdateWOrkTime() { diff --git a/SubProject/FPJ0000/Model1.Context.cs b/SubProject/FPJ0000/Model1.Context.cs index 4015762..a37538c 100644 --- a/SubProject/FPJ0000/Model1.Context.cs +++ b/SubProject/FPJ0000/Model1.Context.cs @@ -38,8 +38,9 @@ namespace FPJ0000 public virtual DbSet Purchase { get; set; } public virtual DbSet EETGW_Note { get; set; } public virtual DbSet JobReport { get; set; } - public virtual DbSet EETGW_ProjectsSchedule { get; set; } public virtual DbSet vGroupUser { get; set; } public virtual DbSet vJobReportForUser { get; set; } + public virtual DbSet EETGW_ProjectsSchedule { get; set; } + public virtual DbSet Auth { get; set; } } } diff --git a/SubProject/FPJ0000/Model1.edmx b/SubProject/FPJ0000/Model1.edmx index acb1729..f8b0681 100644 --- a/SubProject/FPJ0000/Model1.edmx +++ b/SubProject/FPJ0000/Model1.edmx @@ -5,6 +5,20 @@ + + + + + + + + + + + + + + @@ -81,6 +95,7 @@ + @@ -89,6 +104,7 @@ + @@ -375,6 +391,7 @@ + @@ -559,9 +576,10 @@ - + + @@ -774,25 +792,6 @@ - - - - - - - - - - - - - - - - - - - @@ -842,6 +841,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1150,26 +1184,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -1220,6 +1234,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/Model1.edmx.diagram b/SubProject/FPJ0000/Model1.edmx.diagram index 2be852c..7639077 100644 --- a/SubProject/FPJ0000/Model1.edmx.diagram +++ b/SubProject/FPJ0000/Model1.edmx.diagram @@ -18,9 +18,10 @@ - + + diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index a306306..bd7d89c 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,25 +30,25 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -98,6 +98,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(); @@ -159,13 +160,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(); @@ -175,7 +176,6 @@ this.toolStrip2.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -606,6 +606,193 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // + // 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 = 19; + 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).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료\r\n(ww)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "(ww)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType7.DecimalPlaces = 0; + numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType7.MaximumValue = 2147483647D; + numberCellType7.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType7; + 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 = 63F; + this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; + this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "(ww)"; + this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F; + numberCellType8.DecimalPlaces = 0; + numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType8.MaximumValue = 2147483647D; + numberCellType8.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W"; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2"; + 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; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W"; + 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 = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No."; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F; + numberCellType9.DecimalPlaces = 0; + numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType9.MaximumValue = 2147483647D; + numberCellType9.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F; + numberCellType10.MaximumValue = 999999999999999D; + numberCellType10.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType10; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).Width = 63F; + numberCellType11.MaximumValue = 999999999999999D; + numberCellType11.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType11; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType12.MaximumValue = 999999999999999D; + numberCellType12.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType12; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#"; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; + 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; @@ -638,6 +825,8 @@ "출고일기준"}); this.cmbDateType.Name = "cmbDateType"; this.cmbDateType.Size = new System.Drawing.Size(121, 25); + this.cmbDateType.Visible = false; + this.cmbDateType.Click += new System.EventHandler(this.cmbDateType_Click); // // cmbYearS // @@ -645,12 +834,14 @@ this.cmbYearS.DropDownWidth = 70; this.cmbYearS.Name = "cmbYearS"; this.cmbYearS.Size = new System.Drawing.Size(100, 25); + this.cmbYearS.Visible = false; // // toolStripLabel4 // this.toolStripLabel4.Name = "toolStripLabel4"; this.toolStripLabel4.Size = new System.Drawing.Size(15, 22); this.toolStripLabel4.Text = "~"; + this.toolStripLabel4.Visible = false; // // cmbYearE // @@ -658,6 +849,8 @@ this.cmbYearE.DropDownWidth = 70; this.cmbYearE.Name = "cmbYearE"; this.cmbYearE.Size = new System.Drawing.Size(100, 25); + this.cmbYearE.Visible = false; + this.cmbYearE.Click += new System.EventHandler(this.cmbYearE_Click); // // toolStripLabel6 // @@ -1339,193 +1532,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 = 19; - 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).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료\r\n(ww)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "(ww)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - 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 = 63F; - this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "(ww)"; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W"; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2"; - 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; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W"; - 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 = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No."; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F; - numberCellType4.MaximumValue = 999999999999999D; - numberCellType4.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Width = 63F; - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#"; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; - 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; @@ -1547,6 +1553,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); @@ -1559,7 +1566,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/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index eadcb49..8c0b25e 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -153,14 +153,18 @@ namespace FPJ0000 if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우 - var dateField = "pdate"; - if (cmbDateType.SelectedIndex == 1) dateField = "edate"; - else if (cmbDateType.SelectedIndex == 2) dateField = "odate"; + //var dateField = "pdate"; + //if (cmbDateType.SelectedIndex == 1) dateField = "edate"; + //else if (cmbDateType.SelectedIndex == 2) dateField = "odate"; - State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " + - "ISNULL(usermain, '') LIKE @username OR " + - "ISNULL(reqstaff, '') LIKE @username OR " + - "ISNULL(usersub, '') LIKE @username) "; + //State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " + + // "ISNULL(usermain, '') LIKE @username OR " + + // "ISNULL(reqstaff, '') LIKE @username OR " + + // "ISNULL(usersub, '') LIKE @username) "; + State_where += " (ISNULL(userManager, '') LIKE @username OR " + + "ISNULL(usermain, '') LIKE @username OR " + + "ISNULL(reqstaff, '') LIKE @username OR " + + "ISNULL(usersub, '') LIKE @username) "; if (state != "") State_where += " AND " + state; if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(category,'') = '" + cmbCate.Text + "'"; @@ -750,5 +754,15 @@ namespace FPJ0000 { } + + private void cmbDateType_Click(object sender, EventArgs e) + { + + } + + private void cmbYearE_Click(object sender, EventArgs e) + { + + } } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index be2f14a..9cc184e 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,36 +230,39 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9T1JxGMXvf9TWpq50rlGLylIJXKQt2mzT - 1ZqrqWtYgERijlWrZimhu5mUjohorLKEFIeaRhq5Xu0Fe4FLIBBB2bqne7/cKZf8qT7b2d3uc87Zs+8e - 6r8xOT+i/WYQBtt76Abmcbz/DdT0q0fCWETfaEzTO7K40PswCos7gu4HEVCpzC/kq9HoZoWMCNoT+57v - pU759DB4NdCNqHHM3Ux+NpifQciI6PF8JfP+ucugA5dgmbkACnnwhgMXZ1ctMA9HyDwXyuoNI1e8Yf95 - v6igxipTVNE7UNElhbJbJvJTtvGQ0JUlkshAdWZquaDGWq6QnyxjW4dbYBxtReXZbSTIMzAWyhY4JsNw - TITgmg7h7ZckdndMkAJlX7lCpt/Kqu82Ype5EqUniiBt24hBXxg2XuPM3xu8/pRAVZsPCnp7dYVOyja7 - GiDRFrMl2oItplsLSKSXYJ9kiNfBfUkB2YLbwM6pzrYP8p4y1F7bg8POg9igXceu167dzG9ktH9APLUE - 5xSD29NZUUNPGCTTKy+rulINnUeNQ446lGqL2MKWbJhHP/gOi99+4o4/u8H9Ge6QXI8Z5ErZJYekvRgl - ugIUHl2zHObRXJ8nBUNckA+TghvcQ+TyIhiHyuRb9Q7UV18ixhW4n0aI1xPgCvhAvjZ1eH4LGRFN9HNE - kz/AxDP4HE0jyKRA7TR4kS9J0z2HkBFxxDI3Vt8ZSNV3zqL2nB97T6/cyz9CUX8AcJks2URqZdcAAAAA - SUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/TxJxHMbvP2prU1c613CLylIJXKQt2mzT + 1ZqrqWtYHBhDc8xaNUsJ3WVSOiKiscoCUhxqGmrk+qoV9gWOQCCCsnVPd8dNOfKnem3Pbrv38zx777M3 + 8d8YHR/RcTsIvfU9tEOLOD34Fmrq9RNhLGJgLKbpH11Z7n8chdkdQe+jCIhU5hfy1WRwMUJGBOWJfc/3 + Emd9bdB7NdCOqnHK3cL/bDQ9h5AR0ef5ys8HF66CClyBee4SCOTBGY5cnt+wwOSK8PNcCIs3jFxxhsMX + /aKCWotMUU3tQWWPFMpemchPWCdCQleWSCID1bnptYJaS4VCri9ndK5WtI/pUHV+Fx/kGBoPZQvsU2HY + J0NwzoSw9CWJ/Z2TfIFyoEIh0+1k1PebsM9UhdIzRZAayjDsC8PKaYL+e4M3nxKoNvigoHbXVJJSpsXZ + CAlZzJSQBTuMd5aRSK/CNkXzXjv75Qv4LdgNbKzqrYcg7ytH3Y0DOO44im3kFmYruXk7t1G77QPiqVU4 + pmncncmKGJmlkUyvv6zqWg20HjWO2etRShYxha3ZMEfb8DusfPuJe/7sBg/n2ENyPqWRK2WPHJKOYpRo + C1B4ctNamENzc5EvGGGDXJgvuMU+RC4vg3GojL4N70B9/RVibIH7WYT3egJsARfIV1mn57eQEdFMvUA0 + +QN0PIPP0TSCdArEXr0X+ZI0P7ALGREnzAvjDd2BVEP3POou+HGwa/1e/hGC+ANihyzTq1/1MwAAAABJ + RU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFJTBNhHMXn4J2bdw9eRCSKVG8cTExMPHgy - JB5MNF7ARIMJBw8gISBqwLCoCRJcQHZBKRJaQwgGuoBQpCMOpS3TUipTgSkznaXT6Ty/llHUxMTlZV5m - yfd7/2Wo/9bSSMFCaPisFv7FK6MnA/6XR/YH+gpyfvLbgpyJiaJ9Jk5Rrg6LahhpAAa5Mt59TikxRCZK - kmvOC+o3R+euKSFnWYh5fey8iVMUPVQYN3QFaqQBUrAREvsEcmgARoonWQkYuki8s/ue2gbHcUlm0EKb - OEX5uo4KaW2HwC1I+JshfKzC1kwJYrNXwXtrwC/eAr9wE9uecuIy0hkH3+Bx0cRJQH+hlpI3wNMt2J6v - Azd5AzLnJlUFs3rmHv/eQWY8T3++YuKZDk5o2fnTKrEM6FIW1GUGavQBaLoXVocL7eMsuqfWYfeEkdmb - iZOAFkvS0GXoggsp3gZtcwDJjTYoa/fgXezAyByHlc8SVjdVuAMCxha+YNjaqJs4+QutFjWtCdC2rEhy - ndmqSrgGcrAcfY4oliIiZlgZjqCEaWJvVEXPOxYmTlGe+/mKofEEfgZ1vRFKqIrAZZB8l7Nt+2MqHIEE - pvwJjDMi5sIqOicjewHLd/KicpyOB53d6cRKO0TfQ4hMA8RPteghMy+tS5j07cIZv19T0Tq6vBfA1OZe - Z+oOd9G3D8U8dXnKj34z1KS7/QLmCeRkFcyS6tYPIqrr2wxbxamLZsTv1WRjD7Ta2cp+sove6Sge293p - qvqnhnesDa7mYuFFaW6xefTP9arizBXno0t80NaE0eoiyfz8d3peerB4rPK0bL97bm8X/yaK+gpvpyRE - ifAKVAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ2SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ + Eg8mGi9gosGEgwceGhCVoDzUBAhEQd6CMiRshhAMbAOEIatYxja7MSadQEe7PtZ1/frfqKImJj6+6Td9 + 5P/5/h6l/lvLI3mLweGzWugXr46e9PteHNnv78vL+slv8rImJgr2mThFuTosqmGkABjkSnv3OalEEZ4o + Sqw5L6jfHJm/pgSdJUHm1bHzJk5R9FB+zNAVqOE6SIF6SGw75OAAjCRPsuIwdJF4Z/c9uQ2O4xLMoIU2 + cYrydh0VUtoOgZsQ9zVC+FCJrdkiROeugvdUgV+qAL94E9vuUuIS0hkH7+Bx0cRJQH++lpQ3wNNN2F6o + ATd5AzI3Q6oKZvX0Pfa9g/R47v5cxcTTHZzQMvOnVGIZ0KUMqMsM1Mgj0HQvrA4X2sZZdE+tw+4OIb03 + EycBTZaEocvQBReSvA3a5gASG61Q1u7Ds9SBkXkOq58lfNpUMeMXMLb4BcPWh7qJk7/QbFFTmgBty4oE + 15mpqoSqIAdK0eeIYDksYpaV4QhImCb2RFT0vGVh4hTlfpCrGBpP4KdQ1+uhBCsJXALJeznTti+qwuGP + Y8oXxzgjYj6konMyvBewcjcnIsfomN/RnYqvtkH0PobI1EH8WI0eMvPyuoRJ7y6c9rs1Fc2jK3sBTHX2 + dabmcBd951DUXZOj/OjXQ/X6jE/AAoGcrII5Ut36XsSt2hbDVnbqohnxezXY2APNdra8n+yidzqCFrsr + VVHbbnjGWuFqLBSeF2cXmkf/XC/LzlxxPrnEB2wNGL1dIJmf/07Pig8WjpWflu33zu3t4t9EUV8BYv4k + OVzp+PUAAAAASUVORK5CYII= + + 17, 17 + 387, 17 @@ -317,12 +320,18 @@ 561, 17 + + 561, 17 + 731, 17 647, 17 + + 731, 17 + 169, 56 diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs b/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs index 6901af2..8e0e394 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs @@ -39,20 +39,20 @@ System.Windows.Forms.Label pdateLabel; System.Windows.Forms.Label label2; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectSchedule)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType(); this.dsPRJ = new FPJ0000.dsPRJ(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectsScheduleTableAdapter(); @@ -129,7 +129,10 @@ this.tbIdx = new System.Windows.Forms.TextBox(); this.nameTextBox = new System.Windows.Forms.TextBox(); this.pdateTextBox = new System.Windows.Forms.TextBox(); + this.comboBox1 = new System.Windows.Forms.ComboBox(); this.taProjectInfo = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); + this.chkapp1 = new System.Windows.Forms.ToolStripButton(); + this.chkapp2 = new System.Windows.Forms.ToolStripButton(); statusLabel = new System.Windows.Forms.Label(); odateLabel = new System.Windows.Forms.Label(); edateLabel = new System.Windows.Forms.Label(); @@ -296,8 +299,10 @@ this.bindingNavigatorDeleteItem, this.projectsScheduleBindingNavigatorSaveItem, this.toolStripButton1, - this.toolStripButton10}); - this.bn.Location = new System.Drawing.Point(5, 221); + this.toolStripButton10, + this.chkapp2, + this.chkapp1}); + this.bn.Location = new System.Drawing.Point(5, 259); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; @@ -442,7 +447,7 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(795, 202); + this.fpSpread1.Size = new System.Drawing.Size(795, 240); this.fpSpread1.TabIndex = 1; // // cm1 @@ -541,68 +546,68 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "완료"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "%"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 21F; - 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; + numberCellType29.DecimalPlaces = 0; + numberCellType29.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType29.MaximumValue = 2147483647D; + numberCellType29.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType29; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "seq"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType29; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "title"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType2; + numberCellType30.DecimalPlaces = 0; + numberCellType30.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType30.MaximumValue = 2147483647D; + numberCellType30.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType30; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sw"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "시작"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType3; + numberCellType31.DecimalPlaces = 0; + numberCellType31.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType31.MaximumValue = 2147483647D; + numberCellType31.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType31; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ew"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "완료"; this.fpSpread1_Sheet1.Columns.Get(3).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(4).CellType = numberCellType4; + numberCellType32.DecimalPlaces = 0; + numberCellType32.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType32.MaximumValue = 2147483647D; + numberCellType32.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType32; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "swa"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "시작"; this.fpSpread1_Sheet1.Columns.Get(4).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(5).CellType = numberCellType5; + numberCellType33.DecimalPlaces = 0; + numberCellType33.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType33.MaximumValue = 2147483647D; + numberCellType33.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType33; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ewa"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "완료"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType6.DecimalPlaces = 0; - numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType6.MaximumValue = 2147483647D; - numberCellType6.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType6; + numberCellType34.DecimalPlaces = 0; + numberCellType34.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType34.MaximumValue = 2147483647D; + numberCellType34.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType34; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "progress"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Label = "%"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType30; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "uid"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType31; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; @@ -615,10 +620,10 @@ this.groupBox1.Controls.Add(this.fpSpread1); this.groupBox1.Controls.Add(this.bn); this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox1.Location = new System.Drawing.Point(332, 0); + this.groupBox1.Location = new System.Drawing.Point(332, 28); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(5); - this.groupBox1.Size = new System.Drawing.Size(805, 251); + this.groupBox1.Size = new System.Drawing.Size(805, 289); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "Schedule"; @@ -627,10 +632,10 @@ // this.groupBox2.Controls.Add(this.panel1); this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill; - this.groupBox2.Location = new System.Drawing.Point(5, 256); + this.groupBox2.Location = new System.Drawing.Point(5, 322); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(5); - this.groupBox2.Size = new System.Drawing.Size(654, 410); + this.groupBox2.Size = new System.Drawing.Size(654, 344); this.groupBox2.TabIndex = 3; this.groupBox2.TabStop = false; this.groupBox2.Text = "Time Table"; @@ -641,7 +646,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(5, 19); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(644, 386); + this.panel1.Size = new System.Drawing.Size(644, 320); this.panel1.TabIndex = 0; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); this.panel1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseClick); @@ -652,10 +657,10 @@ this.groupBox3.Controls.Add(this.groupBox4); this.groupBox3.Controls.Add(this.bnTodo); this.groupBox3.Dock = System.Windows.Forms.DockStyle.Right; - this.groupBox3.Location = new System.Drawing.Point(659, 256); + this.groupBox3.Location = new System.Drawing.Point(659, 322); this.groupBox3.Name = "groupBox3"; this.groupBox3.Padding = new System.Windows.Forms.Padding(10); - this.groupBox3.Size = new System.Drawing.Size(483, 410); + this.groupBox3.Size = new System.Drawing.Size(483, 344); this.groupBox3.TabIndex = 4; this.groupBox3.TabStop = false; this.groupBox3.Text = "Todo"; @@ -670,7 +675,7 @@ this.fpSpread2.Name = "fpSpread2"; this.fpSpread2.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread2_Sheet1}); - this.fpSpread2.Size = new System.Drawing.Size(463, 251); + this.fpSpread2.Size = new System.Drawing.Size(463, 185); this.fpSpread2.TabIndex = 1; // // cm2 @@ -754,27 +759,27 @@ this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "완료일"; this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "진행"; this.fpSpread2_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F; - this.fpSpread2_Sheet1.Columns.Get(0).CellType = textCellType4; + this.fpSpread2_Sheet1.Columns.Get(0).CellType = textCellType32; this.fpSpread2_Sheet1.Columns.Get(0).DataField = "sort"; this.fpSpread2_Sheet1.Columns.Get(0).Label = "No"; this.fpSpread2_Sheet1.Columns.Get(0).Width = 58F; - this.fpSpread2_Sheet1.Columns.Get(1).CellType = textCellType5; + this.fpSpread2_Sheet1.Columns.Get(1).CellType = textCellType33; this.fpSpread2_Sheet1.Columns.Get(1).DataField = "title"; this.fpSpread2_Sheet1.Columns.Get(1).Label = "항목"; this.fpSpread2_Sheet1.Columns.Get(1).Width = 151F; - this.fpSpread2_Sheet1.Columns.Get(2).CellType = textCellType6; + this.fpSpread2_Sheet1.Columns.Get(2).CellType = textCellType34; this.fpSpread2_Sheet1.Columns.Get(2).DataField = "pdate"; this.fpSpread2_Sheet1.Columns.Get(2).Label = "시작일"; this.fpSpread2_Sheet1.Columns.Get(2).Width = 84F; - this.fpSpread2_Sheet1.Columns.Get(3).CellType = textCellType7; + this.fpSpread2_Sheet1.Columns.Get(3).CellType = textCellType35; this.fpSpread2_Sheet1.Columns.Get(3).DataField = "edate"; this.fpSpread2_Sheet1.Columns.Get(3).Label = "완료일"; this.fpSpread2_Sheet1.Columns.Get(3).Width = 76F; - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread2_Sheet1.Columns.Get(4).CellType = numberCellType7; + numberCellType35.DecimalPlaces = 0; + numberCellType35.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType35.MaximumValue = 2147483647D; + numberCellType35.MinimumValue = -2147483648D; + this.fpSpread2_Sheet1.Columns.Get(4).CellType = numberCellType35; this.fpSpread2_Sheet1.Columns.Get(4).DataField = "process"; this.fpSpread2_Sheet1.Columns.Get(4).Label = "진행"; this.fpSpread2_Sheet1.Columns.Get(4).Width = 77F; @@ -792,7 +797,7 @@ // this.groupBox4.Controls.Add(this.textBox1); this.groupBox4.Dock = System.Windows.Forms.DockStyle.Bottom; - this.groupBox4.Location = new System.Drawing.Point(10, 275); + this.groupBox4.Location = new System.Drawing.Point(10, 209); this.groupBox4.Name = "groupBox4"; this.groupBox4.Padding = new System.Windows.Forms.Padding(10); this.groupBox4.Size = new System.Drawing.Size(463, 100); @@ -831,7 +836,7 @@ this.toolStripButton7, this.toolStripButton8, this.toolStripButton9}); - this.bnTodo.Location = new System.Drawing.Point(10, 375); + this.bnTodo.Location = new System.Drawing.Point(10, 309); this.bnTodo.MoveFirstItem = this.toolStripButton2; this.bnTodo.MoveLastItem = this.toolStripButton5; this.bnTodo.MoveNextItem = this.toolStripButton4; @@ -966,10 +971,11 @@ // this.panel2.Controls.Add(this.groupBox1); this.panel2.Controls.Add(this.panel3); + this.panel2.Controls.Add(this.comboBox1); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(5, 5); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1137, 251); + this.panel2.Size = new System.Drawing.Size(1137, 317); this.panel2.TabIndex = 6; // // panel3 @@ -996,9 +1002,9 @@ this.panel3.Controls.Add(pdateLabel); this.panel3.Controls.Add(this.pdateTextBox); this.panel3.Dock = System.Windows.Forms.DockStyle.Left; - this.panel3.Location = new System.Drawing.Point(0, 0); + this.panel3.Location = new System.Drawing.Point(0, 28); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(332, 251); + this.panel3.Size = new System.Drawing.Size(332, 289); this.panel3.TabIndex = 36; // // textBox3 @@ -1110,10 +1116,42 @@ this.pdateTextBox.TabIndex = 5; this.pdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // comboBox1 + // + this.comboBox1.Dock = System.Windows.Forms.DockStyle.Top; + this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.comboBox1.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.comboBox1.FormattingEnabled = true; + this.comboBox1.Location = new System.Drawing.Point(0, 0); + this.comboBox1.Name = "comboBox1"; + this.comboBox1.Size = new System.Drawing.Size(1137, 28); + this.comboBox1.TabIndex = 2; + this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); + // // taProjectInfo // this.taProjectInfo.ClearBeforeFill = true; // + // chkapp1 + // + this.chkapp1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.chkapp1.Image = global::FPJ0000.Properties.Resources.accept; + this.chkapp1.ImageTransparentColor = System.Drawing.Color.Magenta; + this.chkapp1.Name = "chkapp1"; + this.chkapp1.Size = new System.Drawing.Size(58, 22); + this.chkapp1.Text = "승인1"; + this.chkapp1.Click += new System.EventHandler(this.chkapp1_Click); + // + // chkapp2 + // + this.chkapp2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.chkapp2.Image = global::FPJ0000.Properties.Resources.accept; + this.chkapp2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.chkapp2.Name = "chkapp2"; + this.chkapp2.Size = new System.Drawing.Size(58, 22); + this.chkapp2.Text = "승인2"; + this.chkapp2.Click += new System.EventHandler(this.chkapp2_Click); + // // fProjectSchedule // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1237,5 +1275,8 @@ private System.Windows.Forms.BindingSource bsPrjinfo; private dsPRJTableAdapters.ProjectsTableAdapter taProjectInfo; private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.ComboBox comboBox1; + private System.Windows.Forms.ToolStripButton chkapp1; + private System.Windows.Forms.ToolStripButton chkapp2; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.cs b/SubProject/FPJ0000/Project/fProjectSchedule.cs index bbef800..bb4225f 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.cs +++ b/SubProject/FPJ0000/Project/fProjectSchedule.cs @@ -16,7 +16,8 @@ namespace FPJ0000 int projectindex = 0; EEEntities db; List list; - Boolean bini = false; + Boolean bInit = false; + public fProjectSchedule(int project_) { InitializeComponent(); @@ -26,6 +27,7 @@ namespace FPJ0000 fn_fpcolsize2 = util.MakeFilePath(util.CurrentPath, "formSetting", "fp2_" + this.Name + ".ini"); this.FormClosed += FProjectSchedule_FormClosed; this.FormClosing += FProjectSchedule_FormClosing; + this.dsPRJ.EETGW_ProjectsSchedule.TableNewRow += ProjectsSchedule_TableNewRow; } private void FProjectSchedule_FormClosing(object sender, FormClosingEventArgs e) @@ -33,7 +35,7 @@ namespace FPJ0000 this.Validate(); this.bs.EndEdit(); this.bsTodo.EndEdit(); - + if (dsPRJ.HasChanges()) { var dlg = FCOMMON.Util.MsgQ("변경된 자료가 있습니다. 지금 화면을 닫으면 해당 자료는 손실됩니다\n화면을 닫을까요?"); @@ -47,7 +49,7 @@ namespace FPJ0000 private void FProjectSchedule_FormClosed(object sender, FormClosedEventArgs e) { - + this.dsPRJ.EETGW_ProjectsSchedule.TableNewRow -= ProjectsSchedule_TableNewRow; this.dsPRJ.EETGW_ProjectsSchedule.RowChanged += EETGW_ProjectsSchedule_RowChanged; } @@ -56,6 +58,8 @@ namespace FPJ0000 e.Row["wuid"] = FCOMMON.info.Login.no; e.Row["wdate"] = DateTime.Now; e.Row["project"] = this.projectindex; + e.Row["appoval"] = 0; //신규추가는 확정안되는 데이터이다 + e.Row["no"] = int.Parse(this.comboBox1.Text); } private void fProjectSchedule_Load(object sender, EventArgs e) @@ -63,11 +67,35 @@ namespace FPJ0000 //프로젝트 정보 채우기 this.taProjectInfo.FillByIDX(this.dsPRJ.Projects, this.projectindex); + //스케쥴 그룹(no) + var db = new EEEntities(); + var nolist = db.EETGW_ProjectsSchedule.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == this.projectindex).GroupBy(t => t.no).ToList(); + this.comboBox1.Items.Clear(); + foreach (var item in nolist) + { + if (item.Key == null) this.comboBox1.Items.Add("1"); + else this.comboBox1.Items.Add(item.Key.ToString()); + } + db.Dispose(); + + if (this.comboBox1.Items.Count == 0) + { + util.MsgE("이 프로젝트에는 스케쥴이 등록되지 않았습니다\n" + + "스케쥴을 등록한 후 에는 관리자이 승인과정이 필요하며 승인이 완료되면 계획은 수정할 수 없습니다"); + this.comboBox1.Items.Add("1"); + this.comboBox1.SelectedIndex = 0; + } + else + { + this.comboBox1.SelectedIndex = this.comboBox1.Items.Count - 1; + } + this.comboBox1.Items.Add("스케쥴 추가"); + RefreshData(); RefreshGraph(); this.dsPRJ.EETGW_ProjectsSchedule.RowChanged += EETGW_ProjectsSchedule_RowChanged; - bini = true; + //시작할떄 cww 를 가져오낟. var sql = "select dbo.getWorkWeek('" + DateTime.Now.ToShortDateString() + "')"; @@ -77,14 +105,14 @@ namespace FPJ0000 CWW = int.Parse(wccstr.ToString()); cmd.Connection.Close(); cmd.Dispose(); - + bInit = true; } int CWW = 0; private void EETGW_ProjectsSchedule_RowChanged(object sender, DataRowChangeEventArgs e) { - if (bini == false) return; + if (bInit == false) return; RefreshGraph(); } @@ -94,10 +122,12 @@ namespace FPJ0000 } void RefreshData() { + var scno = int.Parse(comboBox1.Text); try { //list = db.EETGW_ProjectsSchedule.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == this.projectindex).OrderBy(t => t.seq).ToList(); - this.ta.Fill(this.dsPRJ.EETGW_ProjectsSchedule, FCOMMON.info.Login.gcode, this.projectindex); + + this.ta.Fill(this.dsPRJ.EETGW_ProjectsSchedule, FCOMMON.info.Login.gcode, this.projectindex, scno); this.taTodo.Fill(this.dsPRJ.EETGW_ProjectToDo, this.projectindex); //this.bs.DataSource = list;//.ToList();// db.EETGW_ProjectsSchedule.Local; //this.fpSpread1_Sheet1.DataSource = this.bs; @@ -108,6 +138,45 @@ namespace FPJ0000 { System.Windows.Forms.MessageBox.Show(ex.Message); } + Application.DoEvents(); + + //해당스케쥴의 승인상태를 확인 + var db = new EEEntities(); + var dr = db.EETGW_ProjectsSchedule.Where(t => t.project == this.projectindex && t.no == scno).FirstOrDefault(); + if (dr == null || dr.appoval == 0) + { + chkapp1.Checked = false; + chkapp2.Checked = false; + + + } + else if (dr.appoval == 1) + { + chkapp1.Checked = true; + chkapp2.Checked = false; + + this.fpSpread1.Sheets[0].Columns[2].Locked = true; + this.fpSpread1.Sheets[0].Columns[3].Locked = true; + this.fpSpread1.Sheets[0].Columns[2].BackColor = Color.FromArgb(230, 230, 230); + this.fpSpread1.Sheets[0].Columns[3].BackColor = Color.FromArgb(230, 230, 230); + + } + else + { + chkapp1.Checked = true; + chkapp2.Checked = true; + + this.fpSpread1.Sheets[0].Columns[2].Locked = true; + this.fpSpread1.Sheets[0].Columns[3].Locked = true; + this.fpSpread1.Sheets[0].Columns[2].BackColor = Color.FromArgb(230, 230, 230); + this.fpSpread1.Sheets[0].Columns[3].BackColor = Color.FromArgb(230, 230, 230); + } + + + + + + } private void projectsScheduleBindingNavigatorSaveItem_Click(object sender, EventArgs e) { @@ -405,7 +474,7 @@ namespace FPJ0000 //actual if (ww >= swa && ww <= ewa) e.Graphics.FillRectangle(new SolidBrush(ABg), rect2BP.Left, rect2BP.Top, rect2BP.Width, rect2BP.Height); - else if (isEmpty == false && isBusy && ww >= swa && ww <= this.CWW ) + else if (isEmpty == false && isBusy && ww >= swa && ww <= this.CWW) { e.Graphics.FillRectangle(new SolidBrush(Color.Pink), rect2BP.Left, rect2BP.Top, rect2BP.Width, rect2BP.Height); } @@ -515,5 +584,65 @@ namespace FPJ0000 //lad FPUtil.ColSizeLoad(ref this.fpSpread2, fn_fpcolsize2); } + + private void chkapp1_Click(object sender, EventArgs e) + { + //권한이 있어야한다. + var db = new EEEntities(); + var dr = db.Auth.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.user == FCOMMON.info.Login.no).FirstOrDefault(); + if (dr == null || dr.scheapp == null || dr.scheapp < 1) + { + util.MsgE("'승인권한1'이 없습니다"); + return; + } + if(chkapp1.Checked) + { + util.MsgE("'승인해제1'는 현재 구현 중"); + } + else + { + chkapp1.Checked = true; + foreach(var item in this.dsPRJ.EETGW_ProjectsSchedule) + { + if (item.RowState == DataRowState.Deleted || item.RowState == DataRowState.Deleted) continue; + item.appoval = 1; + } + } + } + + private void chkapp2_Click(object sender, EventArgs e) + { + //권한이 있어야한다. + var db = new EEEntities(); + var dr = db.Auth.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.user == FCOMMON.info.Login.no).FirstOrDefault(); + if (dr == null || dr.scheapp == null || dr.scheapp < 2) + { + util.MsgE("'승인권한2'이 없습니다"); + return; + } + if (chkapp2.Checked) + { + util.MsgE("승인해제2'는 현재 구현 중"); + } + else + { + chkapp2.Checked = true; + foreach (var item in this.dsPRJ.EETGW_ProjectsSchedule) + { + if (item.RowState == DataRowState.Deleted || item.RowState == DataRowState.Deleted) continue; + item.appoval = 2; + } + } + } + + private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) + { + if (bInit == false) return; + if(comboBox1.SelectedIndex == this.comboBox1.Items.Count-1) + { + util.MsgE("스케쥴 신규 추가 기능은 준비 중 입니다"); + this.comboBox1.SelectedIndex = this.comboBox1.Items.Count - 2; + } + } } } diff --git a/SubProject/FPJ0000/Project/fProjectSchedule.resx b/SubProject/FPJ0000/Project/fProjectSchedule.resx index 59a92bf..4813b7b 100644 --- a/SubProject/FPJ0000/Project/fProjectSchedule.resx +++ b/SubProject/FPJ0000/Project/fProjectSchedule.resx @@ -252,6 +252,9 @@ 239, 17 + + 871, 17 + R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ @@ -291,12 +294,18 @@ vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== - - 871, 17 + + 624, 17 1023, 17 + + 719, 17 + + + 440, 17 + R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ @@ -336,12 +345,6 @@ vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== - - 719, 17 - - - 440, 17 - 624, 17 @@ -434,6 +437,9 @@ 1098, 17 + + 1098, 17 + 17, 56 diff --git a/SubProject/FPJ0000/app.config b/SubProject/FPJ0000/app.config index 2d79e8f..876691f 100644 --- a/SubProject/FPJ0000/app.config +++ b/SubProject/FPJ0000/app.config @@ -1,33 +1,29 @@ - + -
- +
+ -
+
- + - - - - + + + + - + - + - + @@ -40,4 +36,4 @@ - + \ No newline at end of file diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 1c7a412..326c56f 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -9425,6 +9425,10 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnuid; + private global::System.Data.DataColumn columnappoval; + + private global::System.Data.DataColumn columnno; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public EETGW_ProjectsScheduleDataTable() { @@ -9570,6 +9574,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn appovalColumn { + get { + return this.columnappoval; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn noColumn { + get { + return this.columnno; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -9607,7 +9627,7 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public EETGW_ProjectsScheduleRow AddEETGW_ProjectsScheduleRow(string gcode, int project, int seq, string title, int sw, int ew, int swa, int ewa, string memo, int progress, string wuid, System.DateTime wdate, string uid) { + public EETGW_ProjectsScheduleRow AddEETGW_ProjectsScheduleRow(string gcode, int project, int seq, string title, int sw, int ew, int swa, int ewa, string memo, int progress, string wuid, System.DateTime wdate, string uid, int appoval, int no) { EETGW_ProjectsScheduleRow rowEETGW_ProjectsScheduleRow = ((EETGW_ProjectsScheduleRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -9623,7 +9643,9 @@ namespace FPJ0000 { progress, wuid, wdate, - uid}; + uid, + appoval, + no}; rowEETGW_ProjectsScheduleRow.ItemArray = columnValuesArray; this.Rows.Add(rowEETGW_ProjectsScheduleRow); return rowEETGW_ProjectsScheduleRow; @@ -9667,6 +9689,8 @@ namespace FPJ0000 { this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; this.columnuid = base.Columns["uid"]; + this.columnappoval = base.Columns["appoval"]; + this.columnno = base.Columns["no"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -9700,6 +9724,10 @@ namespace FPJ0000 { base.Columns.Add(this.columnwdate); this.columnuid = new global::System.Data.DataColumn("uid", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnuid); + this.columnappoval = new global::System.Data.DataColumn("appoval", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnappoval); + this.columnno = new global::System.Data.DataColumn("no", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnno); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -18559,6 +18587,38 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int appoval { + get { + if (this.IsappovalNull()) { + return 0; + } + else { + return ((int)(this[this.tableEETGW_ProjectsSchedule.appovalColumn])); + } + } + set { + this[this.tableEETGW_ProjectsSchedule.appovalColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int no { + get { + if (this.IsnoNull()) { + return 1; + } + else { + return ((int)(this[this.tableEETGW_ProjectsSchedule.noColumn])); + } + } + set { + this[this.tableEETGW_ProjectsSchedule.noColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsgcodeNull() { @@ -18690,6 +18750,30 @@ namespace FPJ0000 { public void SetuidNull() { this[this.tableEETGW_ProjectsSchedule.uidColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsappovalNull() { + return this.IsNull(this.tableEETGW_ProjectsSchedule.appovalColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetappovalNull() { + this[this.tableEETGW_ProjectsSchedule.appovalColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsnoNull() { + return this.IsNull(this.tableEETGW_ProjectsSchedule.noColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetnoNull() { + this[this.tableEETGW_ProjectsSchedule.noColumn] = global::System.Convert.DBNull; + } } /// @@ -32840,10 +32924,12 @@ WHERE (gcode = @gcode)"; tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("uid", "uid"); + tableMapping.ColumnMappings.Add("appoval", "appoval"); + tableMapping.ColumnMappings.Add("no", "no"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_appoval = 1 AND [appoval] IS NULL) OR ([appoval] = @Original_appoval)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -32868,10 +32954,14 @@ WHERE (gcode = @gcode)"; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate], [uid]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate, @uid); -SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate], [uid], [appoval], [no]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate, @uid, @appoval, @no); +SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -32886,10 +32976,12 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate, [uid] = @uid WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid))); -SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate, [uid] = @uid, [appoval] = @appoval, [no] = @no WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_appoval = 1 AND [appoval] IS NULL) OR ([appoval] = @Original_appoval)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no))); +SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -32904,6 +32996,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -32927,6 +33021,10 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_appoval", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "appoval", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_no", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -32944,18 +33042,19 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, " + - "wdate, uid\r\nFROM EETGW_ProjectsSchedule\r\nWHERE (gcode = @gcode) AND (projec" + - "t = @project)\r\nORDER BY seq"; + "wdate, uid, appoval, no\r\nFROM EETGW_ProjectsSchedule\r\nWHERE (gcode = @gcode" + + ") AND (project = @project) AND (no = @no)\r\nORDER BY seq"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@project", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "project", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@no", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "no", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsPRJ.EETGW_ProjectsScheduleDataTable dataTable, string gcode, global::System.Nullable project) { + public virtual int Fill(dsPRJ.EETGW_ProjectsScheduleDataTable dataTable, string gcode, global::System.Nullable project, global::System.Nullable no) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((gcode == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -32969,6 +33068,12 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, else { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } + if ((no.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(no.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -32980,7 +33085,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsPRJ.EETGW_ProjectsScheduleDataTable GetData(string gcode, global::System.Nullable project) { + public virtual dsPRJ.EETGW_ProjectsScheduleDataTable GetData(string gcode, global::System.Nullable project, global::System.Nullable no) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((gcode == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -32994,6 +33099,12 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, else { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } + if ((no.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[2].Value = ((int)(no.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; + } dsPRJ.EETGW_ProjectsScheduleDataTable dataTable = new dsPRJ.EETGW_ProjectsScheduleDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -33032,7 +33143,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_gcode, global::System.Nullable Original_project, global::System.Nullable Original_seq, string Original_title, global::System.Nullable Original_sw, global::System.Nullable Original_ew, global::System.Nullable Original_swa, global::System.Nullable Original_ewa, global::System.Nullable Original_progress, string Original_wuid, System.DateTime Original_wdate, string Original_uid) { + public virtual int Delete(int Original_idx, string Original_gcode, global::System.Nullable Original_project, global::System.Nullable Original_seq, string Original_title, global::System.Nullable Original_sw, global::System.Nullable Original_ew, global::System.Nullable Original_swa, global::System.Nullable Original_ewa, global::System.Nullable Original_progress, string Original_wuid, System.DateTime Original_wdate, string Original_uid, global::System.Nullable Original_appoval, global::System.Nullable Original_no) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -33121,6 +33232,22 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(0)); this.Adapter.DeleteCommand.Parameters[22].Value = ((string)(Original_uid)); } + if ((Original_appoval.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[24].Value = ((int)(Original_appoval.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[24].Value = global::System.DBNull.Value; + } + if ((Original_no.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[26].Value = ((int)(Original_no.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[26].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -33141,7 +33268,7 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string gcode, global::System.Nullable project, global::System.Nullable seq, string title, global::System.Nullable sw, global::System.Nullable ew, global::System.Nullable swa, global::System.Nullable ewa, string memo, global::System.Nullable progress, string wuid, System.DateTime wdate, string uid) { + public virtual int Insert(string gcode, global::System.Nullable project, global::System.Nullable seq, string title, global::System.Nullable sw, global::System.Nullable ew, global::System.Nullable swa, global::System.Nullable ewa, string memo, global::System.Nullable progress, string wuid, System.DateTime wdate, string uid, global::System.Nullable appoval, global::System.Nullable no) { if ((gcode == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -33215,6 +33342,18 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, else { this.Adapter.InsertCommand.Parameters[12].Value = ((string)(uid)); } + if ((appoval.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[13].Value = ((int)(appoval.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[13].Value = global::System.DBNull.Value; + } + if ((no.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[14].Value = ((int)(no.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[14].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -33249,6 +33388,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, string wuid, System.DateTime wdate, string uid, + global::System.Nullable appoval, + global::System.Nullable no, int Original_idx, string Original_gcode, global::System.Nullable Original_project, @@ -33262,6 +33403,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, string Original_wuid, System.DateTime Original_wdate, string Original_uid, + global::System.Nullable Original_appoval, + global::System.Nullable Original_no, int idx) { if ((gcode == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -33336,95 +33479,123 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, else { this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(uid)); } - this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_idx)); + if ((appoval.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(appoval.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + } + if ((no.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(no.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_idx)); if ((Original_gcode == null)) { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_gcode)); - } - if ((Original_project.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_project.Value)); - } - else { this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; } - if ((Original_seq.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_gcode)); + } + if ((Original_project.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_seq.Value)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((int)(Original_project.Value)); } else { this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; } - if ((Original_title == null)) { + if ((Original_seq.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(Original_seq.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_title)); - } - if ((Original_sw.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((int)(Original_sw.Value)); - } - else { + if ((Original_title == null)) { this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; } - if ((Original_ew.HasValue == true)) { + else { + this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_title)); + } + if ((Original_sw.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_ew.Value)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((int)(Original_sw.Value)); } else { this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; } - if ((Original_swa.HasValue == true)) { + if ((Original_ew.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_swa.Value)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((int)(Original_ew.Value)); } else { this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; } - if ((Original_ewa.HasValue == true)) { + if ((Original_swa.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_ewa.Value)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_swa.Value)); } else { this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; } - if ((Original_progress.HasValue == true)) { + if ((Original_ewa.HasValue == true)) { this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_progress.Value)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_ewa.Value)); } else { this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } + if ((Original_progress.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_progress.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; + } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[33].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((System.DateTime)(Original_wdate)); if ((Original_uid == null)) { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_uid)); + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_uid)); } - this.Adapter.UpdateCommand.Parameters[36].Value = ((int)(idx)); + if ((Original_appoval.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[39].Value = ((int)(Original_appoval.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; + } + if ((Original_no.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[41].Value = ((int)(Original_no.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; + } + this.Adapter.UpdateCommand.Parameters[42].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -33459,6 +33630,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, string wuid, System.DateTime wdate, string uid, + global::System.Nullable appoval, + global::System.Nullable no, int Original_idx, string Original_gcode, global::System.Nullable Original_project, @@ -33471,8 +33644,10 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, global::System.Nullable Original_progress, string Original_wuid, System.DateTime Original_wdate, - string Original_uid) { - return this.Update(gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, Original_idx, Original_gcode, Original_project, Original_seq, Original_title, Original_sw, Original_ew, Original_swa, Original_ewa, Original_progress, Original_wuid, Original_wdate, Original_uid, Original_idx); + string Original_uid, + global::System.Nullable Original_appoval, + global::System.Nullable Original_no) { + return this.Update(gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no, Original_idx, Original_gcode, Original_project, Original_seq, Original_title, Original_sw, Original_ew, Original_swa, Original_ewa, Original_progress, Original_wuid, Original_wdate, Original_uid, Original_appoval, Original_no, Original_idx); } } diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 129598a..f39ea29 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -2440,7 +2440,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, - DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid))) + DELETE FROM [EETGW_ProjectsSchedule] WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_appoval = 1 AND [appoval] IS NULL) OR ([appoval] = @Original_appoval)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no))) @@ -2465,13 +2465,17 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status, + + + + - INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate], [uid]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate, @uid); -SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq + INSERT INTO [EETGW_ProjectsSchedule] ([gcode], [project], [seq], [title], [sw], [ew], [swa], [ewa], [memo], [progress], [wuid], [wdate], [uid], [appoval], [no]) VALUES (@gcode, @project, @seq, @title, @sw, @ew, @swa, @ewa, @memo, @progress, @wuid, @wdate, @uid, @appoval, @no); +SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no FROM EETGW_ProjectsSchedule WHERE (idx = SCOPE_IDENTITY()) ORDER BY seq @@ -2486,25 +2490,28 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, + + - SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid + SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no FROM EETGW_ProjectsSchedule -WHERE (gcode = @gcode) AND (project = @project) +WHERE (gcode = @gcode) AND (project = @project) AND (no = @no) ORDER BY seq + - UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate, [uid] = @uid WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid))); -SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq + UPDATE [EETGW_ProjectsSchedule] SET [gcode] = @gcode, [project] = @project, [seq] = @seq, [title] = @title, [sw] = @sw, [ew] = @ew, [swa] = @swa, [ewa] = @ewa, [memo] = @memo, [progress] = @progress, [wuid] = @wuid, [wdate] = @wdate, [uid] = @uid, [appoval] = @appoval, [no] = @no WHERE (([idx] = @Original_idx) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_project = 1 AND [project] IS NULL) OR ([project] = @Original_project)) AND ((@IsNull_seq = 1 AND [seq] IS NULL) OR ([seq] = @Original_seq)) AND ((@IsNull_title = 1 AND [title] IS NULL) OR ([title] = @Original_title)) AND ((@IsNull_sw = 1 AND [sw] IS NULL) OR ([sw] = @Original_sw)) AND ((@IsNull_ew = 1 AND [ew] IS NULL) OR ([ew] = @Original_ew)) AND ((@IsNull_swa = 1 AND [swa] IS NULL) OR ([swa] = @Original_swa)) AND ((@IsNull_ewa = 1 AND [ewa] IS NULL) OR ([ewa] = @Original_ewa)) AND ((@IsNull_progress = 1 AND [progress] IS NULL) OR ([progress] = @Original_progress)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_appoval = 1 AND [appoval] IS NULL) OR ([appoval] = @Original_appoval)) AND ((@IsNull_no = 1 AND [no] IS NULL) OR ([no] = @Original_no))); +SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, wdate, uid, appoval, no FROM EETGW_ProjectsSchedule WHERE (idx = @idx) ORDER BY seq @@ -2519,6 +2526,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, + + @@ -2542,7 +2551,11 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, - + + + + + @@ -2563,6 +2576,8 @@ SELECT idx, gcode, project, seq, title, sw, ew, swa, ewa, memo, progress, wuid, + + @@ -2615,7 +2630,7 @@ WHERE (idx = @idx) - + @@ -2882,7 +2897,7 @@ WHERE (idx = @idx) - + @@ -2926,7 +2941,7 @@ WHERE (idx = @idx) - + @@ -2971,7 +2986,7 @@ WHERE (idx = @idx) - + @@ -3087,7 +3102,7 @@ WHERE (idx = @idx) - + @@ -3212,7 +3227,7 @@ WHERE (idx = @idx) - + @@ -3250,7 +3265,7 @@ WHERE (idx = @idx) - + @@ -3366,7 +3381,7 @@ WHERE (idx = @idx) - + @@ -3417,7 +3432,7 @@ WHERE (idx = @idx) - + @@ -3430,7 +3445,7 @@ WHERE (idx = @idx) - + @@ -3600,7 +3615,7 @@ WHERE (idx = @idx) - + @@ -3777,7 +3792,7 @@ WHERE (idx = @idx) - + @@ -3822,7 +3837,7 @@ WHERE (idx = @idx) - + @@ -3891,7 +3906,7 @@ WHERE (idx = @idx) - + @@ -4081,7 +4096,7 @@ WHERE (idx = @idx) - + @@ -4220,7 +4235,7 @@ WHERE (idx = @idx) - + @@ -4267,6 +4282,8 @@ WHERE (idx = @idx) + + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index 5fbf766..8e99ae3 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,15 +4,15 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - + + - + @@ -20,7 +20,7 @@ - +