From 0762fad2a59b253787266321ca525ea8a9cf1d5b Mon Sep 17 00:00:00 2001 From: chi Date: Tue, 20 Apr 2021 13:12:04 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AC=EB=A7=A4=ED=98=84=ED=99=A9=EC=97=90?= =?UTF-8?q?=EC=84=9C=20pr/po=20=EC=9D=BC=EA=B4=84=20=EB=B3=80=EA=B2=BD=20?= =?UTF-8?q?=EA=B0=80=EB=8A=A5=E3=85=8E=20=E3=85=8F=EA=B2=8C=20=ED=95=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- JobReportMailService/fScheduleDay.cs | 4 +- Project/Properties/AssemblyInfo.cs | 4 +- Project/_Management/fLineCode.Designer.cs | 58 +-- Project/_Management/fLineCode.resx | 3 - .../FEQ0000/Equipment/fEquipment.Designer.cs | 288 ++++++------- SubProject/FEQ0000/Equipment/fEquipment.cs | 8 +- SubProject/FEQ0000/Equipment/fEquipment.resx | 45 +- SubProject/FEQ0000/Equipment/fImpEquipment.cs | 35 +- .../FPJ0000/JobReport_/rJobReportUser.cs | 9 +- .../Project/fPartBuyStatus.Designer.cs | 391 +++++++++++------- SubProject/FPJ0000/Project/fPartBuyStatus.cs | 179 +++++++- .../FPJ0000/Project/fPartBuyStatus.resx | 44 +- SubProject/FPJ0000/Project/fPartList.cs | 9 +- .../FPJ0000/Project/fProjectList.Designer.cs | 8 +- SubProject/FPJ0000/Project/fProjectList.cs | 3 +- SubProject/FPJ0000/Project/fProjectList.resx | 44 +- SubProject/FPJ0000/dsPRJ.Designer.cs | 83 +++- SubProject/FPJ0000/dsPRJ.xsd | 35 +- SubProject/FPJ0000/dsPRJ.xss | 4 +- SubProject/FPJ0000/dsReport.Designer.cs | 61 +-- SubProject/FPJ0000/dsReport.xsd | 41 +- SubProject/FPJ0000/dsReport.xss | 2 +- 22 files changed, 815 insertions(+), 543 deletions(-) diff --git a/JobReportMailService/fScheduleDay.cs b/JobReportMailService/fScheduleDay.cs index 245fe75..1df61fa 100644 --- a/JobReportMailService/fScheduleDay.cs +++ b/JobReportMailService/fScheduleDay.cs @@ -50,11 +50,11 @@ namespace JobReportMailService ConsoleTime = DateTime.Now; } } - else if (DateTime.Now.Hour < 10) //10시부터 동작한다 + else if (DateTime.Now.Hour < 10 ) //10시부터 동작한다 { if ((DateTime.Now - ConsoleTime).TotalHours >= 1.0) { - addmsg("9시 이전에는 동작하지 않습니다"); + addmsg("10시 이전에는 동작하지 않습니다"); ConsoleTime = DateTime.Now; } } diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index a037f59..3a5ea0f 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("21.04.05.1120")] -[assembly: AssemblyFileVersion("21.04.05.1120")] +[assembly: AssemblyVersion("21.04.19.1212")] +[assembly: AssemblyFileVersion("21.04.19.1212")] diff --git a/Project/_Management/fLineCode.Designer.cs b/Project/_Management/fLineCode.Designer.cs index ce37a13..7085f30 100644 --- a/Project/_Management/fLineCode.Designer.cs +++ b/Project/_Management/fLineCode.Designer.cs @@ -33,6 +33,8 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); 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.dsMSSQL = new Project.dsMSSQL(); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -45,23 +47,18 @@ this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.lineCodeBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); this.dv = new System.Windows.Forms.DataGridView(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsMSSQL = new Project.dsMSSQL(); this.ta = new Project.dsMSSQLTableAdapters.LineCodeTableAdapter(); this.tam = new Project.dsMSSQLTableAdapters.TableAdapterManager(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.plant = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.grp2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.except = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit(); this.SuspendLayout(); // // bn @@ -104,6 +101,16 @@ this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(23, 22); this.bindingNavigatorAddNewItem.Text = "새로 추가"; // + // bs + // + this.bs.DataMember = "LineCode"; + this.bs.DataSource = this.dsMSSQL; + // + // dsMSSQL + // + this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; @@ -147,7 +154,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -199,10 +205,7 @@ this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn2, - this.dataGridViewTextBoxColumn3, - this.dataGridViewTextBoxColumn4, this.plant, - this.grp2, this.except, this.dataGridViewTextBoxColumn5}); this.dv.DataSource = this.bs; @@ -213,16 +216,6 @@ this.dv.Size = new System.Drawing.Size(588, 392); this.dv.TabIndex = 1; // - // bs - // - this.bs.DataMember = "LineCode"; - this.bs.DataSource = this.dsMSSQL; - // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // ta // this.ta.ClearBeforeFill = true; @@ -259,32 +252,12 @@ this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; this.dataGridViewTextBoxColumn2.Width = 58; // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.DataPropertyName = "team"; - this.dataGridViewTextBoxColumn3.HeaderText = "team"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.Width = 58; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.DataPropertyName = "part"; - this.dataGridViewTextBoxColumn4.HeaderText = "part"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.Width = 51; - // // plant // this.plant.DataPropertyName = "plant"; this.plant.HeaderText = "plant"; this.plant.Name = "plant"; // - // grp2 - // - this.grp2.DataPropertyName = "grp2"; - this.grp2.HeaderText = "grp2"; - this.grp2.Name = "grp2"; - // // except // this.except.DataPropertyName = "except"; @@ -312,9 +285,9 @@ ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -342,10 +315,7 @@ private System.Windows.Forms.DataGridView dv; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; private System.Windows.Forms.DataGridViewTextBoxColumn plant; - private System.Windows.Forms.DataGridViewTextBoxColumn grp2; private System.Windows.Forms.DataGridViewCheckBoxColumn except; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; } diff --git a/Project/_Management/fLineCode.resx b/Project/_Management/fLineCode.resx index 7152d89..5c2b494 100644 --- a/Project/_Management/fLineCode.resx +++ b/Project/_Management/fLineCode.resx @@ -201,9 +201,6 @@ True - - True - True diff --git a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs index 1986a00..9475531 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.Designer.cs @@ -30,8 +30,8 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEquipment)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bsB = new System.Windows.Forms.BindingSource(this.components); @@ -54,6 +54,23 @@ this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.prb1 = new System.Windows.Forms.ToolStripProgressBar(); this.dv = new System.Windows.Forms.DataGridView(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.ing = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.except = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.plant = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.flag = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.type = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.lineT = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.lineP = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dvc_param = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.primary = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.memo = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.autosizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.label1 = new System.Windows.Forms.Label(); @@ -103,23 +120,6 @@ this.taOther = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter(); this.taAll = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentTableAdapter(); this.bsAll = new System.Windows.Forms.BindingSource(this.components); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ing = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.except = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.plant = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.flag = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.type = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.lineT = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.lineP = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dvc_param = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.primary = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.memo = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsB)).BeginInit(); @@ -310,8 +310,8 @@ 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(150, 22); - this.toolStripButton1.Text = "Tem/Part/Plant Update"; + this.toolStripButton1.Size = new System.Drawing.Size(96, 22); + this.toolStripButton1.Text = "Plant Update"; this.toolStripButton1.ToolTipText = "Tem/Part 정보는 서버의 정보를 기준으로 변경 합니다."; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1); // @@ -353,6 +353,129 @@ this.dv.Size = new System.Drawing.Size(1105, 479); this.dv.TabIndex = 1; // + // dataGridViewTextBoxColumn1 + // + this.dataGridViewTextBoxColumn1.DataPropertyName = "idx"; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewTextBoxColumn1.HeaderText = "idx"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + this.dataGridViewTextBoxColumn1.Width = 47; + // + // ing + // + this.ing.DataPropertyName = "ing"; + this.ing.HeaderText = "잉여"; + this.ing.Name = "ing"; + // + // except + // + this.except.DataPropertyName = "except"; + this.except.HeaderText = "제외"; + this.except.Name = "except"; + this.except.Width = 49; + // + // plant + // + this.plant.DataPropertyName = "plant"; + this.plant.HeaderText = "plant"; + this.plant.Name = "plant"; + this.plant.Width = 50; + // + // flag + // + this.flag.DataPropertyName = "flag"; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.flag.DefaultCellStyle = dataGridViewCellStyle2; + this.flag.HeaderText = "flag"; + this.flag.Name = "flag"; + // + // type + // + this.type.DataPropertyName = "type"; + this.type.HeaderText = "Process"; + this.type.Name = "type"; + this.type.Width = 120; + // + // dataGridViewTextBoxColumn8 + // + this.dataGridViewTextBoxColumn8.DataPropertyName = "manu"; + this.dataGridViewTextBoxColumn8.HeaderText = "Maker"; + this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; + this.dataGridViewTextBoxColumn8.Width = 120; + // + // dataGridViewTextBoxColumn5 + // + this.dataGridViewTextBoxColumn5.DataPropertyName = "model"; + this.dataGridViewTextBoxColumn5.HeaderText = "model"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.Width = 120; + // + // dataGridViewTextBoxColumn6 + // + this.dataGridViewTextBoxColumn6.DataPropertyName = "linecode"; + this.dataGridViewTextBoxColumn6.HeaderText = "linecode"; + this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.Width = 70; + // + // lineT + // + this.lineT.DataPropertyName = "lineT"; + this.lineT.HeaderText = "Team"; + this.lineT.Name = "lineT"; + this.lineT.Width = 50; + // + // lineP + // + this.lineP.DataPropertyName = "lineP"; + this.lineP.HeaderText = "Part"; + this.lineP.Name = "lineP"; + this.lineP.Width = 50; + // + // dvc_param + // + this.dvc_param.DataPropertyName = "param1"; + this.dvc_param.HeaderText = "Wafer Size"; + this.dvc_param.Name = "dvc_param"; + this.dvc_param.Width = 50; + // + // dataGridViewTextBoxColumn7 + // + this.dataGridViewTextBoxColumn7.DataPropertyName = "serial"; + this.dataGridViewTextBoxColumn7.HeaderText = "serial"; + this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; + this.dataGridViewTextBoxColumn7.Width = 61; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.DataPropertyName = "grp"; + this.dataGridViewTextBoxColumn4.HeaderText = "grp"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + this.dataGridViewTextBoxColumn4.Width = 48; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.DataPropertyName = "asset"; + this.dataGridViewTextBoxColumn3.HeaderText = "asset"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.Width = 61; + // + // primary + // + this.primary.DataPropertyName = "primary"; + this.primary.HeaderText = "primary"; + this.primary.Name = "primary"; + this.primary.Width = 54; + // + // memo + // + this.memo.DataPropertyName = "memo"; + this.memo.HeaderText = "memo"; + this.memo.Name = "memo"; + this.memo.Width = 66; + // // cm1 // this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -783,129 +906,6 @@ this.bsAll.DataMember = "EETGW_Equipment"; this.bsAll.DataSource = this.dsEQ; // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.DataPropertyName = "idx"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle3; - this.dataGridViewTextBoxColumn1.HeaderText = "idx"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; - this.dataGridViewTextBoxColumn1.Width = 47; - // - // ing - // - this.ing.DataPropertyName = "ing"; - this.ing.HeaderText = "잉여"; - this.ing.Name = "ing"; - // - // except - // - this.except.DataPropertyName = "except"; - this.except.HeaderText = "제외"; - this.except.Name = "except"; - this.except.Width = 49; - // - // plant - // - this.plant.DataPropertyName = "plant"; - this.plant.HeaderText = "plant"; - this.plant.Name = "plant"; - this.plant.Width = 50; - // - // flag - // - this.flag.DataPropertyName = "flag"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.flag.DefaultCellStyle = dataGridViewCellStyle4; - this.flag.HeaderText = "flag"; - this.flag.Name = "flag"; - // - // type - // - this.type.DataPropertyName = "type"; - this.type.HeaderText = "Process"; - this.type.Name = "type"; - this.type.Width = 120; - // - // dataGridViewTextBoxColumn8 - // - this.dataGridViewTextBoxColumn8.DataPropertyName = "manu"; - this.dataGridViewTextBoxColumn8.HeaderText = "Maker"; - this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; - this.dataGridViewTextBoxColumn8.Width = 120; - // - // dataGridViewTextBoxColumn5 - // - this.dataGridViewTextBoxColumn5.DataPropertyName = "model"; - this.dataGridViewTextBoxColumn5.HeaderText = "model"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.Width = 120; - // - // dataGridViewTextBoxColumn6 - // - this.dataGridViewTextBoxColumn6.DataPropertyName = "linecode"; - this.dataGridViewTextBoxColumn6.HeaderText = "linecode"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.Width = 70; - // - // lineT - // - this.lineT.DataPropertyName = "lineT"; - this.lineT.HeaderText = "Team"; - this.lineT.Name = "lineT"; - this.lineT.Width = 50; - // - // lineP - // - this.lineP.DataPropertyName = "lineP"; - this.lineP.HeaderText = "Part"; - this.lineP.Name = "lineP"; - this.lineP.Width = 50; - // - // dvc_param - // - this.dvc_param.DataPropertyName = "param1"; - this.dvc_param.HeaderText = "Wafer Size"; - this.dvc_param.Name = "dvc_param"; - this.dvc_param.Width = 50; - // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.DataPropertyName = "serial"; - this.dataGridViewTextBoxColumn7.HeaderText = "serial"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.Width = 61; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.DataPropertyName = "grp"; - this.dataGridViewTextBoxColumn4.HeaderText = "grp"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.Width = 48; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.DataPropertyName = "asset"; - this.dataGridViewTextBoxColumn3.HeaderText = "asset"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.Width = 61; - // - // primary - // - this.primary.DataPropertyName = "primary"; - this.primary.HeaderText = "primary"; - this.primary.Name = "primary"; - this.primary.Width = 54; - // - // memo - // - this.memo.DataPropertyName = "memo"; - this.memo.HeaderText = "memo"; - this.memo.Name = "memo"; - this.memo.Width = 66; - // // fEquipment // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FEQ0000/Equipment/fEquipment.cs b/SubProject/FEQ0000/Equipment/fEquipment.cs index 51b7462..be8e14c 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fEquipment.cs @@ -468,7 +468,7 @@ namespace FEQ0000 private void toolStripButton1_Click_1(object sender, EventArgs e) { - var dlg = FCOMMON.Util.MsgQ("Team/Part 정보를 서버의 정보로 변경 할까요?"); + var dlg = FCOMMON.Util.MsgQ("Plant 정보를 서버의 정보로 변경 할까요?"); if (dlg != DialogResult.Yes) return; this.prb1.Minimum = 0; @@ -490,10 +490,10 @@ namespace FEQ0000 { if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant) { - dr.lineP = linedata.part; - dr.lineT = linedata.team; + //dr.lineP = linedata.part; + //dr.lineT = linedata.team; dr.plant = linedata.plant; - dr.grp2 = linedata.grp2; + //dr.grp2 = linedata.grp2; dr.EndEdit(); ucnt += 1; } diff --git a/SubProject/FEQ0000/Equipment/fEquipment.resx b/SubProject/FEQ0000/Equipment/fEquipment.resx index 9ce1508..8a21bd5 100644 --- a/SubProject/FEQ0000/Equipment/fEquipment.resx +++ b/SubProject/FEQ0000/Equipment/fEquipment.resx @@ -228,9 +228,6 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - 147, 17 - True @@ -274,6 +271,17 @@ IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXPtZcmCGy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d 2z+AMYgNEgPJQZXhB6Hlu/mToYaANfefPAQSg0oTBwIq1gmnTjyzP3XCyf0h9TuEoMKkAZBGgpqj2vb7 xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAHNTC7nWY2FZAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95rSQFq1rqoi3dmi + laaCRJ0U1J26ak2TVX5BShaC6NIHhTH3OlMa8zB64MBlzv3OMDAkS5yTlfF5SR9b5TrM4riYAPBGqjnz + m3OwN1LMwiW6rq+6bO0s9Lfn/KXPwTDDGWRiLV0I23F4ucSxlWFmCQTeFR2G/k4CloYS2Ek8B9/MVDMP + loadKaODRQkMU5sOisDSWBIxWDKxyloYbH3K8OF2lzcbVZz7XY2f9mo4N4wqZnLvKTj8eLyobBLnMl5w + d93ihig4PtL4Sfe7wDDW+f1NK15gVTbwGS6j7ddZ+02Gvxl2gUFYymXq3nPQeU8Dlp0KS7k23c8rgQwu + EuvpyipBOMrEWr5+lvwJlvKYcgDgv2AQfJKJVao50T9Z/LqECPkCQFvo8kh4xsQAAAAASUVORK5CYII= @@ -283,11 +291,11 @@ s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6 Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef /oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjlx//ByEtxy+GcQQ23N4YufW - d/+7t3/4X7/u+p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb + d/+7t3/4X7/u2p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb IC+0zli9rr6+ngksiQVEdxwNKZh/42nx7CtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY - APaQLwl0R0q7AAAAAElFTkSuQmCC + APJdLweoPgUPAAAAAElFTkSuQmCC @@ -305,14 +313,14 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV/C7BNGlU0S3 - BqQwMzVN17bVtlw1S9vcdVNzNSt8KXrBSk8FQVHR+yWiyJp2YyQ3l7QHfpf5/Z9hhmEU5VCTK0qTZw0z - USGnyR3WaTB/J6r+Ro252sy+WDCcvXk5fIBQTOb+EzL7Jw/CRgQAoAaNliKU1VYvHzu4zX+LvxM/vvyY - dIcwNF6K3sn2pc4u3uXkQrj9szsVsdCFFCkEk6DlpOJk7j6gwRWcQIqUufBOXE76HWw5RiJFip1NcXJC - cTJCTJ6IGSlSdI6gavfqVVYshM+dPqutXiVSpPQbqWbCxz/KiWLE17F4eBqNSwGArNeS9Kolks5b/VtP - e9dvEjmZPc9bFqPRoTG8BSk/ALO5UTfPbJLsxue4zevtxfGGqYXwsI1LrtrZRHqa2aR1zmCPAsIqpPwA - DGSrwcGuM4lDqJ31BQS5FlXlGcAc7UaK3WaTR3CCpHkAlupQVZ4RPdUxRQUOuHQWCsePD2psTaiqDA3h - m+G2c1A8gfiB0HLlqKyO7lHcg4vXQEv/QKH4AvQCl0+zwKvQAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV+i7BNGlU0S3 + BqQwSzN1W9vW2nLNLLfN3VazVhNDs+gFDTsVSBFFmXWJKDKn3RixtSXtgd9lfv9nmGEYTTl01EaPxb2N + W+gtp8UVMOpxbyeq/kaHL7dhTMgfSN2/JrMQykk85iF3cpGVNiIBADVo9DdSWW3ziKHTh9y3WJrw2c3n + tGsLR+O/mXLy/fvp6w81uRDhJJ3RkitdSFFCclFWTfqZROYTmpb9BqQoWQwchtWk0uDrIQopSub5fUFN + +JmEFIt7B0OKEqPDrz26fVMVCxHPL190Nk8PUpQMmOlmkhGf1EQ58uvMuEUWjSsBgKqfpFgfthPP2bx7 + z8d37wo5lrrKzawGg8PjRAtSigAMazQucZEFLpyfsHs8fQTRYF0JjNiFmG+ej8ZnuQhrdPp7NRBWIaUI + MFGtJge/y0WTcHKB2ZTkWlSVZxB3tJtp/oCPnUEDxYoArNWhqjyjU3SHld48FeIpKB0/PKS3N6GqMvQk + MyccnEP5BPIHQsuVo7U5uscINyFfAy39A43mC+KPl0d6N00oAAAAAElFTkSuQmCC @@ -338,17 +346,6 @@ mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D TgDQASA1MVpwzwAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95piIPURV1WR7mzR - SlNBok4K6k5dtabJKr8gaqEguvRBYcy9zpTGPIweOHCZc78zDAzJEudkYXBa0gd2eQ1mcVxMAPh91XoM - NqZgv69YhUt0XV/02NLJONia8pcOB8MMZ5CJtXQh7MTh+RLXUXqZJRD4F7Q3DswELA0lsJN4Dr6ZqVYe - LA07I0a7sxIYRg7tFoGlsSRisGRol7WncPNThnfX23y9XsW509L4cbuGc92oYib3JuH+x/1ZZZW45/GC - m0uTG6Lg8EDjR63vAsNY5rdXZrzArqzgMzxGG68PjTcZ/mbYBQZhKY+pO89h8z0NmHcqLOU5dDevBDK4 - SKynK6sE4SgTa/n6WfInWMpnyh6A/4JB8EmGdqnmRv9k9usSIuQLjcrpDAPKoXQAAAAASUVORK5CYII= diff --git a/SubProject/FEQ0000/Equipment/fImpEquipment.cs b/SubProject/FEQ0000/Equipment/fImpEquipment.cs index 6a75d1d..a94649a 100644 --- a/SubProject/FEQ0000/Equipment/fImpEquipment.cs +++ b/SubProject/FEQ0000/Equipment/fImpEquipment.cs @@ -287,23 +287,28 @@ namespace FEQ0000 //if (linecode.StartsWith("AS9000S")) continue; //해외장비 제거 + //팀파트정보는 이걸로 쓴다 210412 - 진재훈 + //파일의 정보를 기준으로 생성하게한다. + var linebuf = linedesc.Split('-'); + if (linebuf.Length > 1) + { + lineT = linebuf[0]; + lineP = linebuf[1]; + } + else + { + lineT = linedesc; + lineP = string.Empty; + } + //없는 라인코드는 추가 var lineDrows = lineTd.Select("code='" + linecode + "'"); - if (lineDrows.Length == 0) + if (lineDrows.Length == 0) //라인코드가 없다. { - var linebuf = linedesc.Split('-'); - if (linebuf.Length > 1) - { - lineT = linebuf[0]; - lineP = linebuf[1]; - } - else - { - lineT = linedesc; - lineP = string.Empty; - } - + //var linebuf = linedesc.Split('-'); + + //신규추가한다. var newli = lineTd.NewLineCodeRow(); newli.code = linecode; newli.team = lineT; @@ -317,8 +322,8 @@ namespace FEQ0000 else { var lineDr = lineDrows[0] as dsEQ.LineCodeRow; - lineT = lineDr.team; - lineP = lineDr.part; + //lineT = lineT;// lineDr.team; + //lineP = lineDr.part; grp2 = lineDr.grp2; } diff --git a/SubProject/FPJ0000/JobReport_/rJobReportUser.cs b/SubProject/FPJ0000/JobReport_/rJobReportUser.cs index 24cbd9a..05c2fcf 100644 --- a/SubProject/FPJ0000/JobReport_/rJobReportUser.cs +++ b/SubProject/FPJ0000/JobReport_/rJobReportUser.cs @@ -253,6 +253,9 @@ namespace FPJ0000.JobReport_ var item = baseData.Where(t => t.process == prcitem.memo); //해당 프로세스에 해당하는 아이템을 가져온다 //} + if(prcitem.memo.StartsWith("ASM Feeder Center")) + Console.WriteLine("sdf"); + //foreach (var item in orProcess) //{ var processName = prcitem.memo; // item.FirstOrDefault().process; @@ -271,12 +274,14 @@ namespace FPJ0000.JobReport_ } else { - var colName = fpSpread1.Sheets[0].Cells[6, i].Value.ToString(); + var colData = fpSpread1.Sheets[0].Cells[6, i].Value; + var colName = string.Empty;// fpSpread1.Sheets[0].Cells[6, i].Value.ToString(); + if (colData != null) colName = colData.ToString(); //이 이름에 해당하는 데이터의 시간을 가져온다 double ot = 0.0; double hrs = 0.0; - if (colName != "*") + if (colName != "*" && colName.isEmpty()==false) { //double holytime = 0.0; var timeList = item.Where(t => t.svalue == colName); diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs index 90be500..7cb9f2d 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs @@ -37,6 +37,7 @@ FarPoint.Win.Spread.FlatFocusIndicatorRenderer flatFocusIndicatorRenderer1 = new FarPoint.Win.Spread.FlatFocusIndicatorRenderer(); FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer1 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); FarPoint.Win.Spread.FlatScrollBarRenderer flatScrollBarRenderer2 = new FarPoint.Win.Spread.FlatScrollBarRenderer(); + 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.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); @@ -52,8 +53,8 @@ FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); 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 numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); 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.NoPrinterPrintInfo noPrinterPrintInfo1 = new FarPoint.Win.Spread.NoPrinterPrintInfo(); this.panel1 = new System.Windows.Forms.Panel(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); @@ -77,6 +78,16 @@ this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); this.pMP조회ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.exportListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.선택반전ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.선택해제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.전체선택ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.선택값변경ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.oNToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.oFFToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.선택값POToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.oNToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.oFFToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.bsPart = new System.Windows.Forms.BindingSource(this.components); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); @@ -103,7 +114,7 @@ this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); - this.taPart = new FPJ0000.dsPRJTableAdapters.ProjectPartStatusTableAdapter(); + this.taPartStatus = new FPJ0000.dsPRJTableAdapters.ProjectPartStatusTableAdapter(); this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); this.textBox1 = new System.Windows.Forms.TextBox(); @@ -469,9 +480,15 @@ this.columnSizeToolStripMenuItem, this.toolStripMenuItem1, this.pMP조회ToolStripMenuItem, - this.exportListToolStripMenuItem}); + this.exportListToolStripMenuItem, + this.toolStripMenuItem2, + this.선택반전ToolStripMenuItem, + this.선택해제ToolStripMenuItem, + this.전체선택ToolStripMenuItem, + this.선택값변경ToolStripMenuItem, + this.선택값POToolStripMenuItem}); this.cm1.Name = "cm1"; - this.cm1.Size = new System.Drawing.Size(243, 118); + this.cm1.Size = new System.Drawing.Size(243, 304); // // columnSizeToolStripMenuItem // @@ -536,6 +553,78 @@ this.exportListToolStripMenuItem.Text = "목록 내보내기"; this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); // + // toolStripMenuItem2 + // + this.toolStripMenuItem2.Name = "toolStripMenuItem2"; + this.toolStripMenuItem2.Size = new System.Drawing.Size(239, 6); + // + // 선택반전ToolStripMenuItem + // + this.선택반전ToolStripMenuItem.Name = "선택반전ToolStripMenuItem"; + this.선택반전ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.선택반전ToolStripMenuItem.Text = "선택반전"; + this.선택반전ToolStripMenuItem.Click += new System.EventHandler(this.선택반전ToolStripMenuItem_Click); + // + // 선택해제ToolStripMenuItem + // + this.선택해제ToolStripMenuItem.Name = "선택해제ToolStripMenuItem"; + this.선택해제ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.선택해제ToolStripMenuItem.Text = "선택해제"; + this.선택해제ToolStripMenuItem.Click += new System.EventHandler(this.선택해제ToolStripMenuItem_Click); + // + // 전체선택ToolStripMenuItem + // + this.전체선택ToolStripMenuItem.Name = "전체선택ToolStripMenuItem"; + this.전체선택ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.전체선택ToolStripMenuItem.Text = "전체선택"; + this.전체선택ToolStripMenuItem.Click += new System.EventHandler(this.전체선택ToolStripMenuItem_Click); + // + // 선택값변경ToolStripMenuItem + // + this.선택값변경ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.oNToolStripMenuItem, + this.oFFToolStripMenuItem}); + this.선택값변경ToolStripMenuItem.Name = "선택값변경ToolStripMenuItem"; + this.선택값변경ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.선택값변경ToolStripMenuItem.Text = "선택 값 (PR)"; + // + // oNToolStripMenuItem + // + this.oNToolStripMenuItem.Name = "oNToolStripMenuItem"; + this.oNToolStripMenuItem.Size = new System.Drawing.Size(133, 36); + this.oNToolStripMenuItem.Text = "ON"; + this.oNToolStripMenuItem.Click += new System.EventHandler(this.oNToolStripMenuItem_Click); + // + // oFFToolStripMenuItem + // + this.oFFToolStripMenuItem.Name = "oFFToolStripMenuItem"; + this.oFFToolStripMenuItem.Size = new System.Drawing.Size(133, 36); + this.oFFToolStripMenuItem.Text = "OFF"; + this.oFFToolStripMenuItem.Click += new System.EventHandler(this.oFFToolStripMenuItem_Click); + // + // 선택값POToolStripMenuItem + // + this.선택값POToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.oNToolStripMenuItem1, + this.oFFToolStripMenuItem1}); + this.선택값POToolStripMenuItem.Name = "선택값POToolStripMenuItem"; + this.선택값POToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.선택값POToolStripMenuItem.Text = "선택 값 (PO)"; + // + // oNToolStripMenuItem1 + // + this.oNToolStripMenuItem1.Name = "oNToolStripMenuItem1"; + this.oNToolStripMenuItem1.Size = new System.Drawing.Size(133, 36); + this.oNToolStripMenuItem1.Text = "ON"; + this.oNToolStripMenuItem1.Click += new System.EventHandler(this.oNToolStripMenuItem1_Click); + // + // oFFToolStripMenuItem1 + // + this.oFFToolStripMenuItem1.Name = "oFFToolStripMenuItem1"; + this.oFFToolStripMenuItem1.Size = new System.Drawing.Size(133, 36); + this.oFFToolStripMenuItem1.Text = "OFF"; + this.oFFToolStripMenuItem1.Click += new System.EventHandler(this.oFFToolStripMenuItem1_Click); + // // bsPart // this.bsPart.DataMember = "ProjectPartStatus"; @@ -628,7 +717,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -710,7 +798,6 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 27); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -782,6 +869,7 @@ this.fpSpread1_Sheet1}); this.fpSpread1.Size = new System.Drawing.Size(1345, 549); this.fpSpread1.Skin = FarPoint.Win.Spread.DefaultSpreadSkins.Office2013; + this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; this.fpSpread1.TitleInfo.Text = "PartList"; this.fpSpread1.TitleInfo.Value = "PartList"; @@ -797,7 +885,7 @@ 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 = 23; + this.fpSpread1_Sheet1.ColumnCount = 24; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; this.fpSpread1_Sheet1.AutoGenerateColumns = false; @@ -807,192 +895,197 @@ this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.Parent = "CornerFooterFlat"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "담당자"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "CR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "PRJ"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "품명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "제조사"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "단가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "1대 수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "N대 수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "1대 금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "N대 금액"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "PMP"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "구매수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "PR"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "PO"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "공급사"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "납기일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "입고수량"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "담당자"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "CR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "PRJ"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "SID"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "품명"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "규격"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "제조사"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "단위"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "단가"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "1대 수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "N대 수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "1대 금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "N대 금액"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "PMP"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "구매수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "PR"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "PO"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "공급사"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "납기일"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "입고수량"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.Parent = "ColumnHeaderFlat"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 36F; - this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "userManager"; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "담당자"; + this.fpSpread1_Sheet1.Columns.Get(0).Tag = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "userManager"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "CR/CF"; + this.fpSpread1_Sheet1.Columns.Get(1).Label = "담당자"; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Project"; + this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "PRJ"; + this.fpSpread1_Sheet1.Columns.Get(2).Label = "CR/CF"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - textCellType4.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ItemSid"; - this.fpSpread1_Sheet1.Columns.Get(3).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "Project"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID"; - this.fpSpread1_Sheet1.Columns.Get(3).Tag = "sid"; + this.fpSpread1_Sheet1.Columns.Get(3).Label = "PRJ"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - textCellType5.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ItemName"; + textCellType4.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "ItemSid"; this.fpSpread1_Sheet1.Columns.Get(4).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "품명"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Label = "SID"; + this.fpSpread1_Sheet1.Columns.Get(4).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F; - textCellType6.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ItemModel"; + this.fpSpread1_Sheet1.Columns.Get(5).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + textCellType5.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ItemName"; this.fpSpread1_Sheet1.Columns.Get(5).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "규격"; + 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 = 99F; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 113F; + textCellType6.ReadOnly = true; this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ItemManu"; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ItemModel"; this.fpSpread1_Sheet1.Columns.Get(6).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "제조사"; - this.fpSpread1_Sheet1.Columns.Get(6).Tag = "manu"; + 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 = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ItemUnit"; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 99F; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ItemManu"; this.fpSpread1_Sheet1.Columns.Get(7).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "단위"; - this.fpSpread1_Sheet1.Columns.Get(7).Tag = "unit"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(7).Label = "제조사"; + this.fpSpread1_Sheet1.Columns.Get(7).Tag = "manu"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - textCellType7.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "price"; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "ItemUnit"; this.fpSpread1_Sheet1.Columns.Get(8).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "단가"; - this.fpSpread1_Sheet1.Columns.Get(8).Tag = "price"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Label = "단위"; + this.fpSpread1_Sheet1.Columns.Get(8).Tag = "unit"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - textCellType8.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "qty"; + textCellType7.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "price"; this.fpSpread1_Sheet1.Columns.Get(9).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "1대 수량"; - this.fpSpread1_Sheet1.Columns.Get(9).Tag = "qty"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "단가"; + this.fpSpread1_Sheet1.Columns.Get(9).Tag = "price"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "qtyn"; + this.fpSpread1_Sheet1.Columns.Get(10).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + textCellType8.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "qty"; this.fpSpread1_Sheet1.Columns.Get(10).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "N대 수량"; - this.fpSpread1_Sheet1.Columns.Get(10).Tag = "qtyn"; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "1대 수량"; + this.fpSpread1_Sheet1.Columns.Get(10).Tag = "qty"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - textCellType9.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "amt"; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "qtyn"; this.fpSpread1_Sheet1.Columns.Get(11).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1_Sheet1.Columns.Get(11).Formula = "RC[-3]*RC[-2]"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "1대 금액"; - this.fpSpread1_Sheet1.Columns.Get(11).Tag = "amt"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "N대 수량"; + this.fpSpread1_Sheet1.Columns.Get(11).Tag = "qtyn"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + textCellType9.ReadOnly = true; this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "amtn"; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "amt"; this.fpSpread1_Sheet1.Columns.Get(12).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[-4]*RC[-2]"; + this.fpSpread1_Sheet1.Columns.Get(12).Formula = "RC[-3]*RC[-2]"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "N대 금액"; - this.fpSpread1_Sheet1.Columns.Get(12).Tag = "amtn"; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "1대 금액"; + this.fpSpread1_Sheet1.Columns.Get(12).Tag = "amt"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "qtyjago"; + this.fpSpread1_Sheet1.Columns.Get(13).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "amtn"; this.fpSpread1_Sheet1.Columns.Get(13).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "PMP"; + this.fpSpread1_Sheet1.Columns.Get(13).Formula = "RC[-4]*RC[-2]"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "N대 금액"; + this.fpSpread1_Sheet1.Columns.Get(13).Tag = "amtn"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "qtybuy"; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "qtyjago"; this.fpSpread1_Sheet1.Columns.Get(14).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).Label = "구매수량"; - this.fpSpread1_Sheet1.Columns.Get(14).Tag = "buy"; + this.fpSpread1_Sheet1.Columns.Get(14).Label = "PMP"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = checkBoxCellType1; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "bbuy"; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "qtybuy"; + this.fpSpread1_Sheet1.Columns.Get(15).Font = new System.Drawing.Font("굴림", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).Label = "PR"; - this.fpSpread1_Sheet1.Columns.Get(15).Tag = "bbuy"; + this.fpSpread1_Sheet1.Columns.Get(15).Label = "구매수량"; + this.fpSpread1_Sheet1.Columns.Get(15).Tag = "buy"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = checkBoxCellType2; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "bconfirm"; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "bbuy"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Label = "PO"; - this.fpSpread1_Sheet1.Columns.Get(16).Tag = "bconfirm"; + this.fpSpread1_Sheet1.Columns.Get(16).Label = "PR"; + this.fpSpread1_Sheet1.Columns.Get(16).Tag = "bbuy"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(17).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "ItemSupply"; - this.fpSpread1_Sheet1.Columns.Get(17).Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(17).ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.fpSpread1_Sheet1.Columns.Get(17).Label = "공급사"; - this.fpSpread1_Sheet1.Columns.Get(17).Tag = "supply"; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "bconfirm"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Label = "PO"; + this.fpSpread1_Sheet1.Columns.Get(17).Tag = "bconfirm"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 113F; - textCellType11.ReadOnly = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "option2"; + this.fpSpread1_Sheet1.Columns.Get(18).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(18).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "ItemSupply"; this.fpSpread1_Sheet1.Columns.Get(18).Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(18).Label = "납기일"; + this.fpSpread1_Sheet1.Columns.Get(18).ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.fpSpread1_Sheet1.Columns.Get(18).Label = "공급사"; + this.fpSpread1_Sheet1.Columns.Get(18).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "qtyin"; - this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Label = "입고수량"; - this.fpSpread1_Sheet1.Columns.Get(19).Tag = "qtyin"; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 113F; + textCellType11.ReadOnly = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "option2"; + this.fpSpread1_Sheet1.Columns.Get(19).Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(19).Label = "납기일"; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(20).Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(20).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "qtyin"; + this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(20).Label = "입고수량"; + this.fpSpread1_Sheet1.Columns.Get(20).Tag = "qtyin"; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "Item"; - this.fpSpread1_Sheet1.Columns.Get(21).Tag = "item"; - this.fpSpread1_Sheet1.Columns.Get(21).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(21).Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "비고"; + this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "ItemSupplyidx"; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "Item"; + this.fpSpread1_Sheet1.Columns.Get(22).Tag = "item"; this.fpSpread1_Sheet1.Columns.Get(22).Visible = false; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType3; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "ItemSupplyidx"; + this.fpSpread1_Sheet1.Columns.Get(23).Visible = false; this.fpSpread1_Sheet1.DataAutoCellTypes = false; this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bsPart; @@ -1002,7 +1095,7 @@ this.fpSpread1_Sheet1.FilterBarHeaderStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.FilterBarHeaderStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.FilterBarHeaderStyle.Parent = "FilterBarHeaderFlat"; - this.fpSpread1_Sheet1.OperationMode = FarPoint.Win.Spread.OperationMode.SingleSelect; + this.fpSpread1_Sheet1.OperationMode = FarPoint.Win.Spread.OperationMode.MultiSelect; this.fpSpread1_Sheet1.PrintInfo.Footer = "EET Groupware - Alpha -"; this.fpSpread1_Sheet1.PrintInfo.Header = "PartList"; noPrinterPrintInfo1.Bounds = new System.Drawing.Rectangle(0, 0, 816, 1148); @@ -1016,18 +1109,20 @@ this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.RowHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.RowHeader.DefaultStyle.Parent = "RowHeaderFlat"; - this.fpSpread1_Sheet1.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.Single; + this.fpSpread1_Sheet1.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange; this.fpSpread1_Sheet1.SelectionUnit = FarPoint.Win.Spread.Model.SelectionUnit.Row; this.fpSpread1_Sheet1.SheetCornerStyle.BackColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.SheetCornerStyle.ForeColor = System.Drawing.Color.Empty; this.fpSpread1_Sheet1.SheetCornerStyle.Parent = "CornerHeaderFlat"; + this.fpSpread1_Sheet1.ShowEditingRowSelector = true; + this.fpSpread1_Sheet1.ShowRowSelector = true; this.fpSpread1_Sheet1.TitleInfo.Text = "Partlist"; this.fpSpread1_Sheet1.TitleInfo.Value = "Partlist"; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // taPart + // taPartStatus // - this.taPart.ClearBeforeFill = true; + this.taPartStatus.ClearBeforeFill = true; // // panel3 // @@ -1223,7 +1318,7 @@ private System.Windows.Forms.Panel panel5; private System.Windows.Forms.Button button4; private System.Windows.Forms.Panel panel7; - private dsPRJTableAdapters.ProjectPartStatusTableAdapter taPart; + private dsPRJTableAdapters.ProjectPartStatusTableAdapter taPartStatus; private System.Windows.Forms.Panel panel2; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.TextBox pdateTextBox; @@ -1233,9 +1328,19 @@ private System.Windows.Forms.TextBox textBox4; private System.Windows.Forms.Panel panel4; private System.Windows.Forms.TextBox textBox5; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.TextBox tbDue; private System.Windows.Forms.LinkLabel linkLabel1; private arCtl.arLabel prb4; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; + private System.Windows.Forms.ToolStripMenuItem 선택반전ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 선택해제ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 전체선택ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 선택값변경ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem oNToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem oFFToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 선택값POToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem oNToolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem oFFToolStripMenuItem1; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.cs index a7478f7..9c195da 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.cs @@ -1,10 +1,8 @@ using System; using System.Collections.Generic; -using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; -using System.Text; using System.Windows.Forms; using util = FCOMMON.Util; @@ -108,7 +106,7 @@ namespace FPJ0000 try { - this.taPart.Fill(this.dsPRJ.ProjectPartStatus, FCOMMON.info.Login.gcode); + this.taPartStatus.Fill(this.dsPRJ.ProjectPartStatus, FCOMMON.info.Login.gcode); //this.bsPart.Sort = "bbuy,bconfirm,userManager,project"; if (this.bsPart.Count > 0) this.bsPart.Position = 0; //210120 (박성민s) } @@ -307,22 +305,24 @@ namespace FPJ0000 { this.Validate(); this.bsPart.EndEdit(); + this.Validate(); + - //모든데이터의 공백을 제거(sid) - foreach (var item in this.dsPRJ.ProjectsPart) - { - //sid에 공백제거 - if (item.RowState == DataRowState.Deleted || item.RowState == DataRowState.Detached) continue; - if (item.ItemSid != item.ItemSid.Replace(" ", "").Trim()) - { - item.ItemSid = item.ItemSid.Replace(" ", "").Trim(); - item.EndEdit(); - } - } + ////모든데이터의 공백을 제거(sid) + //foreach (var item in this.dsPRJ.ProjectsPart) + //{ + // //sid에 공백제거 + // if (item.RowState == DataRowState.Deleted || item.RowState == DataRowState.Detached) continue; + // if (item.ItemSid != item.ItemSid.Replace(" ", "").Trim()) + // { + // item.ItemSid = item.ItemSid.Replace(" ", "").Trim(); + // item.EndEdit(); + // } + //} try { - var cnt = this.taPart.Update(this.dsPRJ.ProjectPartStatus); + var cnt = this.taPartStatus.Update(this.dsPRJ.ProjectPartStatus); FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 업데이트 되었습니다."); this.dsPRJ.AcceptChanges(); } @@ -888,5 +888,154 @@ namespace FPJ0000 else tbDue.BackColor = Color.White; } + + private void 선택반전ToolStripMenuItem_Click(object sender, EventArgs e) + { + + } + + private void 선택해제ToolStripMenuItem_Click(object sender, EventArgs e) + { + this.fpSpread1_Sheet1.ClearSelection(); + } + + private void 전체선택ToolStripMenuItem_Click(object sender, EventArgs e) + { + this.fpSpread1_Sheet1.AddSelection(0, 0, this.fpSpread1_Sheet1.RowCount, this.fpSpread1_Sheet1.ColumnCount); + } + + private void oNToolStripMenuItem_Click(object sender, EventArgs e) + { + //pr + var col_idx = this.fpSpread1_Sheet1.Columns["idx"].Index; + var col_bbuy = this.fpSpread1_Sheet1.Columns["bbuy"].Index; + var col_bcof = this.fpSpread1_Sheet1.Columns["bconfirm"].Index; + + var allselection = fpSpread1_Sheet1.GetSelections(); + if(allselection.Length < 1 ) + { + FCOMMON.Util.MsgE("선택된 대상이 없습니다"); + return; + } + else + { + if (FCOMMON.Util.MsgQ(allselection.Length.ToString() + "건의 PR 상태를 ON으로 변경할까요?") != DialogResult.Yes) return; + } + fpSpread1.EditMode = true; + foreach (var sel in allselection) + { + var vIDX = int.Parse(fpSpread1_Sheet1.Cells[sel.Row, col_idx].Value.ToString()); + var dr = this.dsPRJ.ProjectPartStatus.Where(t => t.idx == vIDX).FirstOrDefault(); + if (dr != null) + { + dr.bbuy = true; + dr.EndEdit(); + } + //fpSpread1_Sheet1.Cells[sel.Row, col_bbuy].Value = true; + + } + fpSpread1.EditMode = false; + + } + + private void oFFToolStripMenuItem_Click(object sender, EventArgs e) + { + //pr + var col_idx = this.fpSpread1_Sheet1.Columns["idx"].Index; + var col_bbuy = this.fpSpread1_Sheet1.Columns["bbuy"].Index; + var col_bcof = this.fpSpread1_Sheet1.Columns["bconfirm"].Index; + + var allselection = fpSpread1_Sheet1.GetSelections(); + if (allselection.Length < 1) + { + FCOMMON.Util.MsgE("선택된 대상이 없습니다"); + return; + } + else + { + if (FCOMMON.Util.MsgQ(allselection.Length.ToString() + "건의 PR 상태를 OFF 로 변경할까요?") != DialogResult.Yes) return; + } + fpSpread1.EditMode = true; + foreach (var sel in allselection) + { + var vIDX = int.Parse(fpSpread1_Sheet1.Cells[sel.Row, col_idx].Value.ToString()); + var dr = this.dsPRJ.ProjectPartStatus.Where(t => t.idx == vIDX).FirstOrDefault(); + if (dr != null) + { + dr.bbuy = false; + dr.EndEdit(); + } + //fpSpread1_Sheet1.Cells[sel.Row, col_bbuy].Value = true; + + } + fpSpread1.EditMode = false; + } + + private void oNToolStripMenuItem1_Click(object sender, EventArgs e) + { + //po + var col_idx = this.fpSpread1_Sheet1.Columns["idx"].Index; + var col_bbuy = this.fpSpread1_Sheet1.Columns["bbuy"].Index; + var col_bcof = this.fpSpread1_Sheet1.Columns["bconfirm"].Index; + + var allselection = fpSpread1_Sheet1.GetSelections(); + if (allselection.Length < 1) + { + FCOMMON.Util.MsgE("선택된 대상이 없습니다"); + return; + } + else + { + if (FCOMMON.Util.MsgQ(allselection.Length.ToString() + "건의 PO 상태를 ON 으로 변경할까요?") != DialogResult.Yes) return; + } + fpSpread1.EditMode = true; + foreach (var sel in allselection) + { + var vIDX = int.Parse(fpSpread1_Sheet1.Cells[sel.Row, col_idx].Value.ToString()); + var dr = this.dsPRJ.ProjectPartStatus.Where(t => t.idx == vIDX).FirstOrDefault(); + if (dr != null) + { + dr.bconfirm = true; + dr.EndEdit(); + } + //fpSpread1_Sheet1.Cells[sel.Row, col_bbuy].Value = true; + + } + fpSpread1.EditMode = false; + + } + + private void oFFToolStripMenuItem1_Click(object sender, EventArgs e) + { + //po + var col_idx = this.fpSpread1_Sheet1.Columns["idx"].Index; + var col_bbuy = this.fpSpread1_Sheet1.Columns["bbuy"].Index; + var col_bcof = this.fpSpread1_Sheet1.Columns["bconfirm"].Index; + + var allselection = fpSpread1_Sheet1.GetSelections(); + if (allselection.Length < 1) + { + FCOMMON.Util.MsgE("선택된 대상이 없습니다"); + return; + } + else + { + if (FCOMMON.Util.MsgQ(allselection.Length.ToString() + "건의 PO 상태를 OFF 로 변경할까요?") != DialogResult.Yes) return; + } + fpSpread1.EditMode = true; + foreach (var sel in allselection) + { + var vIDX = int.Parse(fpSpread1_Sheet1.Cells[sel.Row, col_idx].Value.ToString()); + var dr = this.dsPRJ.ProjectPartStatus.Where(t => t.idx == vIDX).FirstOrDefault(); + if (dr != null) + { + dr.bconfirm = false; + dr.EndEdit(); + } + //fpSpread1_Sheet1.Cells[sel.Row, col_bbuy].Value = true; + + } + fpSpread1.EditMode = false; + } } } diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index 65998e8..c798255 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -130,7 +130,7 @@ False - 327, 17 + 445, 17 @@ -189,10 +189,10 @@ - 17, 17 + 135, 17 - 252, 17 + 370, 17 @@ -234,10 +234,10 @@ - 100, 17 + 218, 17 - 186, 17 + 304, 17 @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALpSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF6WpTQ3s - ZipmOp1TNLWhC4NsMY3MG5q4gYUoSS8qtItObd7mnNtwRuYyNe83cLrUXc7Rnem355wtNRD6wYfnxXO+ - H87vew6PnZBH6sSrJXpVZKn+d6hUT5GT5ihjTwMdWaKjw59rTRckmkrfqLeHuND+CXvapzFb6VWTyeSy - 2Ddhse2xamWh8XPJivxPc4gtHXXwM5Venqh7Ioq0Zjasm3HCMMvAMMdAP8NAO70F9a9NtI3YsckAzaMU - 8j/MIvmFifpHEiptozYcWxicd+HrPENOBgOcZAu9E5v4MuIggm0MLrlgWHSiUDmHoIddb7hwTFng1G1p - 1I5IfhPJ1bdQ3V6PgsYyBEn9EEjgF55HiOwMKporuFVsNIPlNQdCEnoZThBdEvS+a7gFLeOvUK3P5SQJ - VeHIbYhHVn0shIprSFIkoXloGS0mGz5/38A66SlU1kdzAn4l38tXmu3Sj/Xg9bAMxepMTpIojyDh60ir - SYVmws6t0jlOQUV6WLM7EVrQ7xawE1bUS4trBTBOaKEwPMCzjhzElF1GYlUUjDMOGEmxbMGaSXcnFiII - ke0TXHwsdZ7NO4b4Sj4GJ3Uo7EmHTClGbHkw6tUf8W2BgZEUq5t2op9gtjoR9MQjOCXxFgVIjiKrLg53 - 5GGIq7jCScTKeEgaU8mbBIO9H5xzYYD9xAQrKdI/W+sWBEgOLwRIjpCHvBGQ640bxcHIeCmAZkSFQlUe - 0t8JIJRHw0gEBvJv6ImAdm4TgXpvhUvZffTSOo2hBRdH79gi7temIYUERYpY5NTd271jcWy5iKBpT8Da - 5i17gv9hZ1dI3Sc4J+52lNc07Bz08EF0d3dvn0hotnnipMi0jqnZDYeVvZhaoTBlpjDhYcXm5GCbt9Hu - MEVR6z53W3944jze6bT2DH9hW8dJkcriL2qid0lx4/cXYRPtI2xdO57U2uknUCbzeDzeH/pJngOO0GOv - AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSalFRL0pTmxrY + zVTMvM0pmtrQhUG2mEbmNDTRQYUoRS8qtItObeqcc7rhFpnL1Ob9Al6Wuss5bmf67TlnSw2EfvDhefGc + 74fz+57DYyfsvib5klyvii7X/w6X6ily0hwV7Gmgo+X9dOQTnfmsRFsVEPN2HxfaPRGPerVLNnrFbDZ7 + rI4NWO07rNhYaPxcsKHo0wziy0ecghzlfl/UO1GluiU23D/lhmGagWGGgX6KgW7SBc2vDbQNO7DBAM0j + FIo+TCPtmZn6RxIubaPWnS6YZj34OsuQk8EAJ3Ghx7KBL8NOItiEacEDw7wbJcoZhNzresOF4yqCJ25I + Y7ZEtdeQVnMdNe0NKG6sQIg0EMEEQckZhMlOorK5klvFTjNYXHUiLKmH4QSx8pD3XUMtaBl7iRp9ASdJ + qo5EwetE5DbEQ6i4jFRFKpoHF9FituPz93WskZ7CZb00JxBUCfYHSPM8+tFuvBqSoUyTw0mSa6NI+Aoy + n2dAa3Fwq3SOUVCRHlYdboQX93kF7ESU9tDiuhQYLTooDHfxuCMfcRUXkFwdA+OUE0ZSLFuwdtzbiZUI + wmS7BOceSN2nCg8jsUoA03g/SrqzIFOKEf80FA2aj/g2x8BIiu2fdKOPsGRzI+ShT3Bc4ifiSw4htz4B + N2sjkFB5kZOIlYmQNGaQNwkFe2+a8WCA/cQEGykyKE/nFfAlB+b4koPkIT/wC/xwtSwU2S9SoB1WoURV + iKx3KRDWxsJIBAbyb+iJgHZvEoFmZ4Xzeb30whqNwTkPR8/oPO7UZSKdBEWKeOTX396+Y3G6PETQtCNg + bbPWHcH/cLArZOwSnBarnXJFw9ZeD++FWq3ePJrUbPfFSZGZHRPT604bezGxTGFiiYLFx7LdzcE2b6e9 + YYqi1vxvtf7wxXm8E5nt2UHCto5jIpU1SNREb5PuJfAvwibaX9i6eiS1tTMwRZnG4/F4fwDzyJ36Qnza + YgAAAABJRU5ErkJggg== @@ -381,9 +381,9 @@ - 508, 17 + 542, 17 - - 424, 17 + + 17, 17 \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fPartList.cs b/SubProject/FPJ0000/Project/fPartList.cs index 895e202..fe1e538 100644 --- a/SubProject/FPJ0000/Project/fPartList.cs +++ b/SubProject/FPJ0000/Project/fPartList.cs @@ -94,6 +94,9 @@ namespace FPJ0000 private void fPartList_Load(object sender, EventArgs e) { + + + //정렬방식 저장값 불러오기 var SetFile = util.CurrentPath + "FormSetting.xml"; arUtil.XMLHelper xml = new arUtil.XMLHelper(SetFile); @@ -356,6 +359,10 @@ namespace FPJ0000 this.Validate(); this.bs.EndEdit(); this.bsPart.EndEdit(); + this.Validate(); + this.bs.EndEdit(); + this.bsPart.EndEdit(); + this.Focus(); //모든데이터의 공백을 제거(sid) foreach (var item in this.dsPRJ.ProjectsPart) @@ -371,8 +378,6 @@ namespace FPJ0000 try { - - var cnt = this.tam.UpdateAll(this.dsPRJ); FCOMMON.Util.MsgI(cnt.ToString() + "건의 자료가 업데이트 되었습니다."); this.dsPRJ.AcceptChanges(); diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index b92ba84..a306306 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -936,7 +936,7 @@ // // label8 // - this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "wwd", true)); + this.label8.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ddate", true)); this.label8.Dock = System.Windows.Forms.DockStyle.Fill; this.label8.Location = new System.Drawing.Point(420, 1); this.label8.Name = "label8"; @@ -947,7 +947,7 @@ // // label10 // - this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "wwo", true)); + this.label10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "odate", true)); this.label10.Dock = System.Windows.Forms.DockStyle.Fill; this.label10.Location = new System.Drawing.Point(755, 1); this.label10.Name = "label10"; @@ -958,7 +958,7 @@ // // label12 // - this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "wwe", true)); + this.label12.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "edate", true)); this.label12.Dock = System.Windows.Forms.DockStyle.Fill; this.label12.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.label12.Location = new System.Drawing.Point(1090, 1); @@ -1412,7 +1412,7 @@ 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 = "wwe"; + 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; diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 5996948..eadcb49 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -147,7 +147,8 @@ namespace FPJ0000 // var orgQuery = this.ta.Adapter.SelectCommand.CommandText; - string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, dbo.getWorkWeek(ddate) AS wwd FROM Projects"; + string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory,'' AS wws, '' AS wwo, '' AS wwe, '' AS wwd FROM Projects"; + //string State_Select = " SELECT [idx],[pidx],[gcode],[isdel],[status],[asset],[level],[rev],[process],[part],[pdate],[name],[userManager],[usermain],[usersub],[userhw2],[reqstaff],[costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],[memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[div],dbo.getScheduleProgress(idx) as ProgressPrj, dbo.getLastHistory(idx) AS lasthistory, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, dbo.getWorkWeek(ddate) AS wwd FROM Projects"; string State_where = " WHERE gcode=@gcode and isnull(div,'') <> 'EB' and "; if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우 diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 281f006..be2f14a 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -230,34 +230,34 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/SxNxHMbvPwoClVIkFrnKUtcmLY0WGChF - SKESs/ZFx1wyKiosXVMuc6WstRajstylk6lpS5vSV/sy+7Ld2tzW2sronu5uh+6WP9ULHg7u/TwPbz68 - if/G7PoI060gDPb30A0u4tTAG6jJV4+FsYj+sZimb3R5qe9RFFZPBD0PIyBSmV/IV5OJYoSMCJKKfc/3 - Eqd9bTB4NdCNqnHS08L/bLTMQ8iI6KW+8vOBhSsgA5dhnb0IAnlwhsOX5tYtsIxE+HkuhM0bRq44w6EL - flFBrU2mqCZ3o7JbCmWPTOQn7BMhoStLJJGB6uz0akGtrUIhN5Yz+pFWdIzpUXVuJx/kGBwPZQucU2E4 - J0Nwz4Tw9ksS+zon+QJlf4VC1r6DUd9rwl5LFUrbiyA1bsWQLww7pwn67w1ef0qg2uiDgtxVU6mXMi3u - Rki0xUyJtmC7+fYSEukVOKZo3utkv3wBvwW7gYNVvf0g5L3lqLu+H8dcR7BFu4nZrN1Yxm3U4fiAeGoF - rmkad2ayIoaf0kim115WdbUGOkqNo856lGqLmMLWbJijbegdlr/9xF1/doMHs+whuZ/QyJWyWw6JqRgl - ugIUntiwGubQ3FjkC4bZIBfmC26yD5HLi2AcKrNv3TtQX3uJGFvgeRbhvVSALeAC+drWSf0WMiKayeeI - Jn+AjmfwOZpGkE6B2GPwIl+S5vtOISPiuHVhvKErkGromkPdeT8OnFm7l3+EIP4Afqss34NUdTAAAAAA + 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= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ2SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ - Eg8mGi9gosGEgwcQFURNZnioCSIGQd6CMiRshhAMbAOEIatYxja6MSadQEe7PtZ1/frfqKImJj6+6Td9 - 5P/5/h6l/luLQwXzocHTWvgXLw8fD/hfHtob6CnI+clvC3LGxor2mDhFudssqmGkARjkynjnOaXEEBkr - Sa66zqnfHJ29ooRcZSHm9ZGzJk5R9EBh3NAVqBErpGAdJPYZ5FAfjBRPshIwdJF4e+c9tYUYxyWZfgtt - 4hTl6zgspLVtAjci4W+A8LEKm9MliM1cBu+tBr9wA/z8dWx5yonLSGccfP1HRRMnAb2FWkpeB083Ymuu - Ftz4NcjcFKkqmNUz9/j3DjLjeXrzFRPPdHBMy86fVollQJeyoC4zUKMPQdPdsDndaBll0TmxBocnjMze - TJwENFqShi5DF9xI8XZoG31IrjdDWb0P70IbhmY5LH+WsLKhYiogYGT+CwZt9bqJk7/QZFHTmgBt04Yk - 156tqoSrIQfL0eOMYjEiYpqV4QxKmCT2RlV0vWNh4hTleZCvGBpP4Faoa3VQQlUELoPku5ht2x9T4Qwk - MOFPYJQRMRtW0T4e2Q1YupsXleN0fMXdmU4st0D0PYLIWCF+qkEXmXlxTcK4bwfO+P2qiqbhpd0Apib3 - KlN7sIO+cyDmqc1TfvSbgQZ9yi9gjkAuVsEMqW77IOK29alhrzhx3oz4vert7L4mB1vZS3bRPRnFE8d0 - +qa11fCONMPdUCy8KM0tNo/+uV5VnLrkenyBD9rrMXyrSDI//52el+4vHqk8KTvundndxb+Jor4Cf2wk - UEWj3CsAAAAASUVORK5CYII= + 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== diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 3888518..1c7a412 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -19758,8 +19758,7 @@ namespace FPJ0000.dsPRJTableAdapters { this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, - dbo.getWorkWeek(ddate) AS wwd + bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -19779,8 +19778,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = @"SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, - dbo.getWorkWeek(ddate) AS wwd + bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -19789,8 +19787,7 @@ WHERE (idx = @idx)"; this._commandCollection[3].Connection = this.Connection; this._commandCollection[3].CommandText = @"SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, - dbo.getWorkWeek(ddate) AS wwd + bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR @@ -28494,7 +28491,7 @@ WHERE (idx = @idx)"; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[2]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[4]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT a.gcode, a.pdate, a.status, a.name, a.userManager, a.orderno, a.path, b.idx, b.no, b.Project, b.ItemGroup, b.ItemModel, b.ItemUnit, b.ItemName, b.ItemSid, b.ItemSupply, b.ItemSupplyidx, @@ -28522,6 +28519,18 @@ WHERE (a.gcode = @gcode) AND (b.idx = @idx) AND (ISNULL(b.qtybuy, 0) > 0) AND ( this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].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, "", "", "")); this._commandCollection[1].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, "", "", "")); + this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[2].Connection = this.Connection; + this._commandCollection[2].CommandText = "UPDATE ProjectsPart\r\nSET bbuy = @bbuy\r\nWHERE (idx = @idx)"; + this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bbuy", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bbuy", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].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.Original, false, null, "", "", "")); + this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[3].Connection = this.Connection; + this._commandCollection[3].CommandText = "UPDATE ProjectsPart\r\nSET bconfirm = @bconfirm\r\nWHERE (idx = @idx)"; + this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bconfirm", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bconfirm", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].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.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -28626,6 +28635,66 @@ WHERE (a.gcode = @gcode) AND (b.idx = @idx) AND (ISNULL(b.qtybuy, 0) > 0) AND ( public virtual int Update(global::System.Data.DataRow[] dataRows) { return this.Adapter.Update(dataRows); } + + [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.Update, false)] + public virtual int UpdatebBuy(global::System.Nullable bbuy, int idx) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((bbuy.HasValue == true)) { + command.Parameters[0].Value = ((bool)(bbuy.Value)); + } + else { + command.Parameters[0].Value = global::System.DBNull.Value; + } + command.Parameters[1].Value = ((int)(idx)); + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } + + [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.Update, false)] + public virtual int UpdateBConfirm(global::System.Nullable bconfirm, int idx) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[3]; + if ((bconfirm.HasValue == true)) { + command.Parameters[0].Value = ((bool)(bconfirm.Value)); + } + else { + command.Parameters[0].Value = global::System.DBNull.Value; + } + command.Parameters[1].Value = ((int)(idx)); + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + int returnValue; + try { + returnValue = command.ExecuteNonQuery(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + return returnValue; + } } /// diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 6624eeb..129598a 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -73,8 +73,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, - dbo.getWorkWeek(ddate) AS wwd + bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -222,8 +221,7 @@ WHERE (import = 1) AND (gcode = @gcode) SELECT asset, cnt, costn, costo, ddate, edate, idx, import, isdel, level, memo, name, odate, orderno, part, path, pdate, pidx, process, progress, remark_ans, remark_req, reqstaff, rev, sdate, status, userManager, userhw2, usermain, usersub, wdate, wuid, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, - dbo.getWorkWeek(ddate) AS wwd + bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd FROM Projects WHERE (idx = @idx) @@ -237,8 +235,7 @@ WHERE (idx = @idx) SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, - bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, dbo.getWorkWeek(sdate) AS wws, dbo.getWorkWeek(odate) AS wwo, dbo.getWorkWeek(edate) AS wwe, - dbo.getWorkWeek(ddate) AS wwd + bCost, bFanOut, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR @@ -1727,6 +1724,32 @@ WHERE (a.gcode = @gcode) AND (b.idx = @idx) AND (ISNULL(b.qtybuy, 0) > 0) AN + + + + UPDATE ProjectsPart +SET bbuy = @bbuy +WHERE (idx = @idx) + + + + + + + + + + + UPDATE ProjectsPart +SET bconfirm = @bconfirm +WHERE (idx = @idx) + + + + + + + diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss index f0ae45c..5fbf766 100644 --- a/SubProject/FPJ0000/dsPRJ.xss +++ b/SubProject/FPJ0000/dsPRJ.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + @@ -15,7 +15,7 @@ - + diff --git a/SubProject/FPJ0000/dsReport.Designer.cs b/SubProject/FPJ0000/dsReport.Designer.cs index cdb7c4f..37f52c2 100644 --- a/SubProject/FPJ0000/dsReport.Designer.cs +++ b/SubProject/FPJ0000/dsReport.Designer.cs @@ -817,8 +817,6 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnprocesss; - private global::System.Data.DataColumn columnUserProcess; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public JobReportDayDataTable() { @@ -900,14 +898,6 @@ namespace FPJ0000 { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn UserProcessColumn { - get { - return this.columnUserProcess; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -945,7 +935,7 @@ namespace FPJ0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public JobReportDayRow AddJobReportDayRow(string uid, string uname, string pdate, double hrs, double ot, string processs, string UserProcess) { + public JobReportDayRow AddJobReportDayRow(string uid, string uname, string pdate, double hrs, double ot, string processs) { JobReportDayRow rowJobReportDayRow = ((JobReportDayRow)(this.NewRow())); object[] columnValuesArray = new object[] { uid, @@ -953,8 +943,7 @@ namespace FPJ0000 { pdate, hrs, ot, - processs, - UserProcess}; + processs}; rowJobReportDayRow.ItemArray = columnValuesArray; this.Rows.Add(rowJobReportDayRow); return rowJobReportDayRow; @@ -991,7 +980,6 @@ namespace FPJ0000 { this.columnhrs = base.Columns["hrs"]; this.columnot = base.Columns["ot"]; this.columnprocesss = base.Columns["processs"]; - this.columnUserProcess = base.Columns["UserProcess"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1009,8 +997,6 @@ namespace FPJ0000 { base.Columns.Add(this.columnot); this.columnprocesss = new global::System.Data.DataColumn("processs", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnprocesss); - this.columnUserProcess = new global::System.Data.DataColumn("UserProcess", typeof(string), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnUserProcess); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnuid, this.columnpdate}, true)); @@ -1023,7 +1009,6 @@ namespace FPJ0000 { this.columnhrs.ReadOnly = true; this.columnot.ReadOnly = true; this.columnprocesss.MaxLength = 100; - this.columnUserProcess.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2622,22 +2607,6 @@ namespace FPJ0000 { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public string UserProcess { - get { - if (this.IsUserProcessNull()) { - return string.Empty; - } - else { - return ((string)(this[this.tableJobReportDay.UserProcessColumn])); - } - } - set { - this[this.tableJobReportDay.UserProcessColumn] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsunameNull() { @@ -2685,18 +2654,6 @@ namespace FPJ0000 { public void SetprocesssNull() { this[this.tableJobReportDay.processsColumn] = global::System.Convert.DBNull; } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsUserProcessNull() { - return this.IsNull(this.tableJobReportDay.UserProcessColumn); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetUserProcessNull() { - this[this.tableJobReportDay.UserProcessColumn] = global::System.Convert.DBNull; - } } /// @@ -3671,7 +3628,6 @@ namespace FPJ0000.dsReportTableAdapters { tableMapping.ColumnMappings.Add("hrs", "hrs"); tableMapping.ColumnMappings.Add("ot", "ot"); tableMapping.ColumnMappings.Add("processs", "processs"); - tableMapping.ColumnMappings.Add("UserProcess", "UserProcess"); this._adapter.TableMappings.Add(tableMapping); } @@ -3688,13 +3644,12 @@ namespace FPJ0000.dsReportTableAdapters { 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 ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot, - EETGW_GroupUser.Process AS UserProcess + this._commandCollection[0].CommandText = @"SELECT ISNULL(EETGW_GroupUser.Process, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot FROM JobReport INNER JOIN EETGW_GroupUser ON JobReport.gcode = EETGW_GroupUser.gcode AND JobReport.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users ON JobReport.uid = Users.id WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid <> '') AND (JobReport.gcode = @gcode) AND (ISNULL(EETGW_GroupUser.Process, '') LIKE @userprocess) -GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs, EETGW_GroupUser.Process +GROUP BY JobReport.uid, JobReport.pdate, Users.name, EETGW_GroupUser.Process ORDER BY processs, JobReport.pdate, uname"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yymm", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -3901,8 +3856,8 @@ ORDER BY processs, JobReport.pdate, uname"; 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 processs\r\nFROM Users\r\nWHERE (ISNULL(processs, N\'\') <> \'\') AND (gcode" + - " = @gcode)\r\nGROUP BY processs\r\nORDER BY processs"; + this._commandCollection[0].CommandText = "SELECT Process AS processs\r\nFROM EETGW_GroupUser\r\nWHERE (ISNULL(Process, N\'" + + "\') <> \'\') AND (gcode = @gcode)\r\nGROUP BY Process\r\nORDER BY processs"; 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, "", "", "")); } @@ -3914,7 +3869,7 @@ ORDER BY processs, JobReport.pdate, uname"; public virtual int Fill(dsReport.ProcessListDataTable dataTable, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((gcode == null)) { - this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("gcode"); } else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); @@ -3933,7 +3888,7 @@ ORDER BY processs, JobReport.pdate, uname"; public virtual dsReport.ProcessListDataTable GetData(string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((gcode == null)) { - this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("gcode"); } else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); diff --git a/SubProject/FPJ0000/dsReport.xsd b/SubProject/FPJ0000/dsReport.xsd index a731025..dc695b7 100644 --- a/SubProject/FPJ0000/dsReport.xsd +++ b/SubProject/FPJ0000/dsReport.xsd @@ -41,13 +41,12 @@ ORDER BY yymm - SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot, - EETGW_GroupUser.Process AS UserProcess + SELECT ISNULL(EETGW_GroupUser.Process, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot FROM JobReport INNER JOIN EETGW_GroupUser ON JobReport.gcode = EETGW_GroupUser.gcode AND JobReport.uid = EETGW_GroupUser.uid LEFT OUTER JOIN Users ON JobReport.uid = Users.id WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid <> '') AND (JobReport.gcode = @gcode) AND (ISNULL(EETGW_GroupUser.Process, '') LIKE @userprocess) -GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs, EETGW_GroupUser.Process +GROUP BY JobReport.uid, JobReport.pdate, Users.name, EETGW_GroupUser.Process ORDER BY processs, JobReport.pdate, uname @@ -65,22 +64,21 @@ ORDER BY processs, JobReport.pdate, uname - - + - SELECT processs -FROM Users -WHERE (ISNULL(processs, N'') <> '') AND (gcode = @gcode) -GROUP BY processs + SELECT Process AS processs +FROM EETGW_GroupUser +WHERE (ISNULL(Process, N'') <> '') AND (gcode = @gcode) +GROUP BY Process ORDER BY processs - + @@ -235,7 +233,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O - + @@ -272,10 +270,10 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O - + - + @@ -289,7 +287,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O - + @@ -305,17 +303,10 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O - - - - - - - - + @@ -328,7 +319,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O - + @@ -355,7 +346,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O - + @@ -367,7 +358,7 @@ SELECT idx, pdate, free, memo, wuid, wdate FROM HolidayLIst WHERE (idx = @idx) O - + diff --git a/SubProject/FPJ0000/dsReport.xss b/SubProject/FPJ0000/dsReport.xss index cbc0db4..6fb9f33 100644 --- a/SubProject/FPJ0000/dsReport.xss +++ b/SubProject/FPJ0000/dsReport.xss @@ -8,7 +8,7 @@ - +