diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 0f12fa5..87a3ecf 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.01.09.0830")] -[assembly: AssemblyFileVersion("23.01.09.0830")] +[assembly: AssemblyVersion("23.01.09.1530")] +[assembly: AssemblyFileVersion("23.01.09.1530")] diff --git a/SubProject/FPJ0000/Project/fProjectData.Designer.cs b/SubProject/FPJ0000/Project/fProjectData.Designer.cs index 28d2c02..d0216f6 100644 --- a/SubProject/FPJ0000/Project/fProjectData.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectData.Designer.cs @@ -50,9 +50,10 @@ System.Windows.Forms.Label label10; System.Windows.Forms.Label label5; System.Windows.Forms.Label label11; + System.Windows.Forms.Label label12; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectData)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = 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.tbIdx = new System.Windows.Forms.TextBox(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsPRJ = new FPJ0000.dsPRJ(); @@ -101,6 +102,7 @@ this.panel1 = new System.Windows.Forms.Panel(); this.textBox6 = new System.Windows.Forms.TextBox(); this.textBox1 = new System.Windows.Forms.TextBox(); + this.textBox5 = new System.Windows.Forms.TextBox(); this.tbDue = new System.Windows.Forms.TextBox(); this.checkBox2 = new System.Windows.Forms.CheckBox(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); @@ -109,14 +111,18 @@ this.textBox2 = new System.Windows.Forms.TextBox(); this.arLabel2 = new arCtl.arLabel(); this.panel5 = new System.Windows.Forms.Panel(); + this.textBox10 = new System.Windows.Forms.TextBox(); this.cmbSW = new System.Windows.Forms.ComboBox(); - this.bsChampionID = new System.Windows.Forms.BindingSource(this.components); + this.bsSW = new System.Windows.Forms.BindingSource(this.components); this.dSComm = new FPJ0000.DSComm(); this.cmbEpanel = new System.Windows.Forms.ComboBox(); + this.bsEPanel = new System.Windows.Forms.BindingSource(this.components); this.cmbAssembly = new System.Windows.Forms.ComboBox(); + this.bsAssembly = new System.Windows.Forms.BindingSource(this.components); this.cmbDesign = new System.Windows.Forms.ComboBox(); + this.bsDesignID = new System.Windows.Forms.BindingSource(this.components); this.cmbChampion = new System.Windows.Forms.ComboBox(); - this.textBox5 = new System.Windows.Forms.TextBox(); + this.bsChampionID = new System.Windows.Forms.BindingSource(this.components); this.textBox3 = new System.Windows.Forms.TextBox(); this.arLabel3 = new arCtl.arLabel(); this.panel2 = new System.Windows.Forms.Panel(); @@ -194,10 +200,6 @@ this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter(); this.taHistD = new FPJ0000.dsPRJTableAdapters.EETGW_ProjecthistoryDTableAdapter(); this.taToDo = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectToDoTableAdapter(); - this.bsDesignID = new System.Windows.Forms.BindingSource(this.components); - this.bsAssembly = new System.Windows.Forms.BindingSource(this.components); - this.bsEPanel = new System.Windows.Forms.BindingSource(this.components); - this.bsSW = new System.Windows.Forms.BindingSource(this.components); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); usermainLabel = new System.Windows.Forms.Label(); @@ -219,6 +221,7 @@ label10 = new System.Windows.Forms.Label(); label5 = new System.Windows.Forms.Label(); label11 = new System.Windows.Forms.Label(); + label12 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -228,8 +231,12 @@ this.panel7.SuspendLayout(); this.panel1.SuspendLayout(); this.panel5.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bsChampionID)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsSW)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dSComm)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsEPanel)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsAssembly)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsDesignID)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsChampionID)).BeginInit(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); this.arPanel1.SuspendLayout(); @@ -253,10 +260,6 @@ this.bindingNavigator2.SuspendLayout(); this.tabPage2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bsTodo)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsDesignID)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsAssembly)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsEPanel)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsSW)).BeginInit(); this.SuspendLayout(); // // nameLabel @@ -461,6 +464,16 @@ label11.TabIndex = 94; label11.Text = "Serial#"; // + // label12 + // + label12.AutoSize = true; + label12.Location = new System.Drawing.Point(56, 168); + label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label12.Name = "label12"; + label12.Size = new System.Drawing.Size(29, 12); + label12.TabIndex = 96; + label12.Text = "공정"; + // // tbIdx // this.tbIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "idx", true)); @@ -595,7 +608,7 @@ this.remark_reqTextBox.Multiline = true; this.remark_reqTextBox.Name = "remark_reqTextBox"; this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.remark_reqTextBox.Size = new System.Drawing.Size(485, 297); + this.remark_reqTextBox.Size = new System.Drawing.Size(485, 322); this.remark_reqTextBox.TabIndex = 49; // // tbXdate @@ -638,7 +651,7 @@ this.btMailAddr, this.btPath, this.btSendMail}); - this.bn.Location = new System.Drawing.Point(0, 696); + this.bn.Location = new System.Drawing.Point(0, 721); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; @@ -683,6 +696,7 @@ // 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"; @@ -824,8 +838,8 @@ // this.dataGridViewTextBoxColumn10.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn10.DataPropertyName = "remark"; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle1; this.dataGridViewTextBoxColumn10.HeaderText = "비고"; this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.ReadOnly = true; @@ -888,7 +902,7 @@ this.panel7.Controls.Add(reqstaffLabel); this.panel7.Controls.Add(this.cmbProcess); this.panel7.Controls.Add(label1); - this.panel7.Location = new System.Drawing.Point(6, 179); + this.panel7.Location = new System.Drawing.Point(6, 204); this.panel7.Name = "panel7"; this.panel7.Size = new System.Drawing.Size(547, 64); this.panel7.TabIndex = 85; @@ -953,11 +967,13 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.Gainsboro; + this.panel1.Controls.Add(label12); this.panel1.Controls.Add(label11); this.panel1.Controls.Add(this.textBox6); this.panel1.Controls.Add(label5); this.panel1.Controls.Add(this.textBox1); this.panel1.Controls.Add(label10); + this.panel1.Controls.Add(this.textBox5); this.panel1.Controls.Add(this.tbDue); this.panel1.Controls.Add(this.checkBox2); this.panel1.Controls.Add(this.linkLabel1); @@ -977,7 +993,7 @@ this.panel1.Controls.Add(this.tbIdx); this.panel1.Location = new System.Drawing.Point(6, 6); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(547, 167); + this.panel1.Size = new System.Drawing.Size(547, 193); this.panel1.TabIndex = 86; this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint); // @@ -999,6 +1015,16 @@ this.textBox1.TabIndex = 93; this.textBox1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // textBox5 + // + this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userprocess", true)); + this.textBox5.Font = new System.Drawing.Font("굴림", 9F); + this.textBox5.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.textBox5.Location = new System.Drawing.Point(93, 165); + this.textBox5.Name = "textBox5"; + this.textBox5.Size = new System.Drawing.Size(190, 21); + this.textBox5.TabIndex = 90; + // // tbDue // this.tbDue.Location = new System.Drawing.Point(413, 118); @@ -1101,13 +1127,13 @@ // panel5 // this.panel5.BackColor = System.Drawing.Color.Gainsboro; + this.panel5.Controls.Add(this.textBox10); this.panel5.Controls.Add(this.cmbSW); this.panel5.Controls.Add(this.cmbEpanel); this.panel5.Controls.Add(this.cmbAssembly); this.panel5.Controls.Add(this.cmbDesign); this.panel5.Controls.Add(this.cmbChampion); this.panel5.Controls.Add(label7); - this.panel5.Controls.Add(this.textBox5); this.panel5.Controls.Add(label8); this.panel5.Controls.Add(this.textBox3); this.panel5.Controls.Add(this.arLabel3); @@ -1117,11 +1143,21 @@ this.panel5.Controls.Add(this.usermainTextBox); this.panel5.Controls.Add(userManagerLabel); this.panel5.Controls.Add(this.userManagerTextBox); - this.panel5.Location = new System.Drawing.Point(6, 249); + this.panel5.Location = new System.Drawing.Point(6, 274); this.panel5.Name = "panel5"; this.panel5.Size = new System.Drawing.Size(547, 194); this.panel5.TabIndex = 85; // + // textBox10 + // + this.textBox10.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userAssembly", true)); + this.textBox10.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.textBox10.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.textBox10.Location = new System.Drawing.Point(353, 95); + this.textBox10.Name = "textBox10"; + this.textBox10.Size = new System.Drawing.Size(185, 29); + this.textBox10.TabIndex = 96; + // // cmbSW // this.cmbSW.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1140,10 +1176,10 @@ this.cmbSW.TabIndex = 95; this.cmbSW.ValueMember = "ID"; // - // bsChampionID + // bsSW // - this.bsChampionID.DataMember = "UserList"; - this.bsChampionID.DataSource = this.dSComm; + this.bsSW.DataMember = "UserList"; + this.bsSW.DataSource = this.dSComm; // // dSComm // @@ -1168,6 +1204,11 @@ this.cmbEpanel.TabIndex = 94; this.cmbEpanel.ValueMember = "ID"; // + // bsEPanel + // + this.bsEPanel.DataMember = "UserList"; + this.bsEPanel.DataSource = this.dSComm; + // // cmbAssembly // this.cmbAssembly.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1186,6 +1227,11 @@ this.cmbAssembly.TabIndex = 93; this.cmbAssembly.ValueMember = "ID"; // + // bsAssembly + // + this.bsAssembly.DataMember = "UserList"; + this.bsAssembly.DataSource = this.dSComm; + // // cmbDesign // this.cmbDesign.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1204,6 +1250,11 @@ this.cmbDesign.TabIndex = 92; this.cmbDesign.ValueMember = "ID"; // + // bsDesignID + // + this.bsDesignID.DataMember = "UserList"; + this.bsDesignID.DataSource = this.dSComm; + // // cmbChampion // this.cmbChampion.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; @@ -1222,15 +1273,10 @@ this.cmbChampion.TabIndex = 91; this.cmbChampion.ValueMember = "ID"; // - // textBox5 + // bsChampionID // - this.textBox5.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "userprocess", true)); - this.textBox5.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.textBox5.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.textBox5.Location = new System.Drawing.Point(353, 94); - this.textBox5.Name = "textBox5"; - this.textBox5.Size = new System.Drawing.Size(185, 29); - this.textBox5.TabIndex = 90; + this.bsChampionID.DataMember = "UserList"; + this.bsChampionID.DataSource = this.dSComm; // // textBox3 // @@ -1304,7 +1350,7 @@ this.panel2.Controls.Add(this.tbXdate); this.panel2.Controls.Add(this.tbEdate); this.panel2.Controls.Add(this.tbODate); - this.panel2.Location = new System.Drawing.Point(6, 448); + this.panel2.Location = new System.Drawing.Point(6, 473); this.panel2.Name = "panel2"; this.panel2.Size = new System.Drawing.Size(547, 126); this.panel2.TabIndex = 86; @@ -1469,7 +1515,7 @@ this.panel3.Controls.Add(costnLabel); this.panel3.Controls.Add(this.costoTextBox); this.panel3.Controls.Add(costoLabel); - this.panel3.Location = new System.Drawing.Point(6, 580); + this.panel3.Location = new System.Drawing.Point(6, 605); this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(546, 86); this.panel3.TabIndex = 86; @@ -1588,7 +1634,7 @@ this.arPanel1.ProgressValue = 0F; this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230))))); this.arPanel1.ShowBorder = true; - this.arPanel1.Size = new System.Drawing.Size(487, 322); + this.arPanel1.Size = new System.Drawing.Size(487, 347); this.arPanel1.TabIndex = 88; this.arPanel1.Text = "arPanel1"; this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -1691,6 +1737,7 @@ // this.bindingNavigatorPositionItem1.AccessibleName = "위치"; this.bindingNavigatorPositionItem1.AutoSize = false; + this.bindingNavigatorPositionItem1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem1.Name = "bindingNavigatorPositionItem1"; this.bindingNavigatorPositionItem1.Size = new System.Drawing.Size(50, 23); this.bindingNavigatorPositionItem1.Text = "0"; @@ -1759,7 +1806,7 @@ this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; this.panel4.Location = new System.Drawing.Point(3, 257); this.panel4.Name = "panel4"; - this.panel4.Size = new System.Drawing.Size(516, 412); + this.panel4.Size = new System.Drawing.Size(516, 397); this.panel4.TabIndex = 90; // // rtBef @@ -1768,7 +1815,7 @@ this.rtBef.Location = new System.Drawing.Point(0, 23); this.rtBef.Name = "rtBef"; this.rtBef.ReadOnly = true; - this.rtBef.Size = new System.Drawing.Size(516, 389); + this.rtBef.Size = new System.Drawing.Size(516, 374); this.rtBef.TabIndex = 87; this.rtBef.Text = ""; this.rtBef.Click += new System.EventHandler(this.rtBack_Click); @@ -1833,7 +1880,7 @@ this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 254F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(1044, 672); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1044, 657); this.tableLayoutPanel1.TabIndex = 91; // // panel8 @@ -1998,7 +2045,7 @@ this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.panel6.Location = new System.Drawing.Point(525, 257); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(516, 412); + this.panel6.Size = new System.Drawing.Size(516, 397); this.panel6.TabIndex = 90; // // rtAft @@ -2007,7 +2054,7 @@ this.rtAft.Location = new System.Drawing.Point(0, 23); this.rtAft.Name = "rtAft"; this.rtAft.ReadOnly = true; - this.rtAft.Size = new System.Drawing.Size(516, 389); + this.rtAft.Size = new System.Drawing.Size(516, 374); this.rtAft.TabIndex = 87; this.rtAft.Text = ""; this.rtAft.Click += new System.EventHandler(this.rtBack_Click); @@ -2065,7 +2112,7 @@ this.tabControl1.Location = new System.Drawing.Point(0, 0); this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(1058, 696); + this.tabControl1.Size = new System.Drawing.Size(1058, 721); this.tabControl1.TabIndex = 93; // // tabPage1 @@ -2080,7 +2127,7 @@ this.tabPage1.Location = new System.Drawing.Point(4, 22); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1050, 670); + this.tabPage1.Size = new System.Drawing.Size(1050, 695); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "일반사항"; this.tabPage1.UseVisualStyleBackColor = true; @@ -2091,7 +2138,7 @@ | System.Windows.Forms.AnchorStyles.Right))); this.tabControl2.Controls.Add(this.tabPage3); this.tabControl2.Controls.Add(this.tabPage4); - this.tabControl2.Location = new System.Drawing.Point(559, 335); + this.tabControl2.Location = new System.Drawing.Point(559, 360); this.tabControl2.Name = "tabControl2"; this.tabControl2.SelectedIndex = 0; this.tabControl2.Size = new System.Drawing.Size(488, 329); @@ -2197,8 +2244,8 @@ // this.dataGridViewTextBoxColumn5.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; this.dataGridViewTextBoxColumn5.DataPropertyName = "remark"; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewTextBoxColumn5.HeaderText = "비고"; this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; this.dataGridViewTextBoxColumn5.ReadOnly = true; @@ -2273,6 +2320,7 @@ // this.toolStripTextBox1.AccessibleName = "위치"; this.toolStripTextBox1.AutoSize = false; + this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F); this.toolStripTextBox1.Name = "toolStripTextBox1"; this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23); this.toolStripTextBox1.Text = "0"; @@ -2340,7 +2388,7 @@ this.tabPage2.Location = new System.Drawing.Point(4, 22); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1050, 710); + this.tabPage2.Size = new System.Drawing.Size(1050, 695); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "완료내역"; this.tabPage2.UseVisualStyleBackColor = true; @@ -2432,31 +2480,11 @@ // this.taToDo.ClearBeforeFill = true; // - // bsDesignID - // - this.bsDesignID.DataMember = "UserList"; - this.bsDesignID.DataSource = this.dSComm; - // - // bsAssembly - // - this.bsAssembly.DataMember = "UserList"; - this.bsAssembly.DataSource = this.dSComm; - // - // bsEPanel - // - this.bsEPanel.DataMember = "UserList"; - this.bsEPanel.DataSource = this.dSComm; - // - // bsSW - // - this.bsSW.DataMember = "UserList"; - this.bsSW.DataSource = this.dSComm; - // // fProjectData // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1058, 721); + this.ClientSize = new System.Drawing.Size(1058, 746); this.Controls.Add(this.tabControl1); this.Controls.Add(this.bn); this.MinimizeBox = false; @@ -2476,8 +2504,12 @@ this.panel1.PerformLayout(); this.panel5.ResumeLayout(false); this.panel5.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bsChampionID)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsSW)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dSComm)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsEPanel)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsAssembly)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsDesignID)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bsChampionID)).EndInit(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); this.panel3.ResumeLayout(false); @@ -2508,10 +2540,6 @@ this.bindingNavigator2.PerformLayout(); this.tabPage2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.bsTodo)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsDesignID)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsAssembly)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsEPanel)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bsSW)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -2664,5 +2692,6 @@ private System.Windows.Forms.BindingSource bsEPanel; private System.Windows.Forms.BindingSource bsAssembly; private System.Windows.Forms.BindingSource bsDesignID; + private System.Windows.Forms.TextBox textBox10; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index d703e9a..f9578f1 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -141,6 +141,14 @@ namespace FPJ0000 var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter(); var processStr = "%"; var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode); + var newdrnone = dSComm.UserList.NewUserListRow(); + newdrnone.ID = string.Empty; + newdrnone.Name = "(없음)"; + newdrnone.Outdate = null; + newdrnone.Description = string.Empty; + dSComm.UserList.AddUserListRow(newdrnone); + + foreach (dsReport.ProcessUserListRow dr in dtUserList.OrderBy(t => t.outdate)) { if (String.IsNullOrEmpty(dr.outdate) == false) diff --git a/SubProject/FPJ0000/Project/fProjectData.resx b/SubProject/FPJ0000/Project/fProjectData.resx index f6bda7c..229c628 100644 --- a/SubProject/FPJ0000/Project/fProjectData.resx +++ b/SubProject/FPJ0000/Project/fProjectData.resx @@ -180,8 +180,8 @@ False - - 100, 17 + + False 100, 17 @@ -189,9 +189,6 @@ 17, 17 - - 17, 17 - 299, 17 @@ -329,9 +326,6 @@ 449, 17 - - 449, 17 - 676, 56 @@ -350,12 +344,6 @@ 120, 56 - - 17, 56 - - - 566, 17 - 566, 17 @@ -438,12 +426,6 @@ bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - 922, 17 - - - 722, 17 - 722, 17 diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index ff7c702..369698c 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,29 +30,30 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType13 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType14 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -103,7 +104,6 @@ this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.cmbDateType = new System.Windows.Forms.ToolStripComboBox(); this.cmbYearS = new System.Windows.Forms.ToolStripComboBox(); @@ -165,13 +165,13 @@ this.button1 = new System.Windows.Forms.Button(); this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel(); this.label17 = new System.Windows.Forms.Label(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.cm.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.toolStrip1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); this.panel4.SuspendLayout(); @@ -181,6 +181,7 @@ this.toolStrip2.SuspendLayout(); this.panel1.SuspendLayout(); this.tableLayoutPanel3.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // bn @@ -623,220 +624,6 @@ this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 23; - this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "준수율\r\n(%)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "파트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "공정"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "요청"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "C.P"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 4; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "담당자"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "자산번호"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Model#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Serial#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "프로젝트"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "대수"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Original\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).StyleName = " "; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Input\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Effect\r\n($K)"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "SCR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "비고"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "Design"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Asmb"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "E-Panel"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "S/W"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "Asset No."; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "SCR/CF"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType3; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "finishrate"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "part"; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "reqstaff"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name_champion"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "name_design"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Label = "Design"; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name_assembly"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "Asmb"; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "name_epanel"; - this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).Label = "E-Panel"; - this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name_software"; - this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Label = "S/W"; - this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "asset"; - this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Label = "Asset No."; - this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "model"; - this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "serial"; - this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; - numberCellType4.DecimalPlaces = 0; - numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType4.MaximumValue = 2147483647D; - numberCellType4.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType4; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "cnt"; - this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; - numberCellType5.MaximumValue = 999999999999999D; - numberCellType5.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costo"; - this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType6; - this.fpSpread1_Sheet1.Columns.Get(19).DataField = "costn"; - this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(19).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7; - this.fpSpread1_Sheet1.Columns.Get(20).DataField = "coste"; - this.fpSpread1_Sheet1.Columns.Get(20).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); - this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(21).DataField = "orderno"; - this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).Label = "SCR/CF"; - this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(21).Width = 63F; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(22).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(22).Width = 63F; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // // toolStrip1 // this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; @@ -1583,6 +1370,227 @@ this.label17.Text = "구매 진행"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // fpSpread1_Sheet1 + // + this.fpSpread1_Sheet1.Reset(); + this.fpSpread1_Sheet1.SheetName = "Sheet1"; + // Formulas and custom names must be loaded with R1C1 reference style + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; + this.fpSpread1_Sheet1.ColumnCount = 24; + this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; + this.fpSpread1_Sheet1.ActiveColumnIndex = -1; + this.fpSpread1_Sheet1.ActiveRowIndex = -1; + this.fpSpread1_Sheet1.AutoGenerateColumns = false; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "준수율\r\n(%)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "파트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "요청"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "C.P"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).ColumnSpan = 4; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "담당자"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "자산번호"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Model#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Serial#"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "프로젝트"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "대수"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Original\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).StyleName = " "; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "Input\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Effect\r\n($K)"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 21).Value = "SCR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 22).Value = "담당자\r\n공정"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 23).Value = "비고"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "Design"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "Asmb"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "E-Panel"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 12).Value = "S/W"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 13).Value = "Asset No."; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 21).Value = "SCR/CF"; + this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; + this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType8.DecimalPlaces = 0; + numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType8.MaximumValue = 2147483647D; + numberCellType8.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType8; + this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; + this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; + this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(0).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status"; + this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state"; + this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType19; + 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).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F; + numberCellType9.DecimalPlaces = 0; + numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType9.MaximumValue = 2147483647D; + numberCellType9.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType9; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj"; + this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F; + numberCellType10.DecimalPlaces = 0; + numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType10.MaximumValue = 2147483647D; + numberCellType10.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType10; + this.fpSpread1_Sheet1.Columns.Get(4).DataField = "finishrate"; + this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(4).Width = 52F; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(5).DataField = "part"; + this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process"; + this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(7).DataField = "reqstaff"; + this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(8).DataField = "name_champion"; + this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "name_design"; + this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Label = "Design"; + this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name_assembly"; + this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Label = "Asmb"; + this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(11).DataField = "name_epanel"; + this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(11).Label = "E-Panel"; + this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name_software"; + this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Label = "S/W"; + this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType28; + this.fpSpread1_Sheet1.Columns.Get(13).DataField = "asset"; + this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Label = "Asset No."; + this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType29; + this.fpSpread1_Sheet1.Columns.Get(14).DataField = "model"; + this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType30; + this.fpSpread1_Sheet1.Columns.Get(15).DataField = "serial"; + this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType31; + this.fpSpread1_Sheet1.Columns.Get(16).DataField = "name"; + this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; + this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F; + numberCellType11.DecimalPlaces = 0; + numberCellType11.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType11.MaximumValue = 2147483647D; + numberCellType11.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType11; + this.fpSpread1_Sheet1.Columns.Get(17).DataField = "cnt"; + this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F; + numberCellType12.MaximumValue = 999999999999999D; + numberCellType12.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType12; + this.fpSpread1_Sheet1.Columns.Get(18).DataField = "costo"; + this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F; + numberCellType13.MaximumValue = 999999999999999D; + numberCellType13.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType13; + this.fpSpread1_Sheet1.Columns.Get(19).DataField = "costn"; + this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(19).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(20).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + numberCellType14.MaximumValue = 999999999999999D; + numberCellType14.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType14; + this.fpSpread1_Sheet1.Columns.Get(20).DataField = "coste"; + this.fpSpread1_Sheet1.Columns.Get(20).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType32; + this.fpSpread1_Sheet1.Columns.Get(21).DataField = "orderno"; + this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Label = "SCR/CF"; + this.fpSpread1_Sheet1.Columns.Get(21).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(21).Width = 65F; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType33; + this.fpSpread1_Sheet1.Columns.Get(22).DataField = "userprocess"; + this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; + this.fpSpread1_Sheet1.Columns.Get(22).Width = 58F; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType34; + this.fpSpread1_Sheet1.Columns.Get(23).DataField = "memo"; + this.fpSpread1_Sheet1.Columns.Get(23).Width = 63F; + this.fpSpread1_Sheet1.DataAutoSizeColumns = false; + this.fpSpread1_Sheet1.DataSource = this.bs; + this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1604,7 +1612,6 @@ ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.cm.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); @@ -1617,6 +1624,7 @@ this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.tableLayoutPanel3.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index edcf834..86109df 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -173,12 +173,12 @@ namespace FPJ0000 " [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,model,serial," + " [championid], dbo.getProjectFinishRate(gcode, idx) AS finishrate," + - " championid,designid,assemblyid,epanelid,softwareid," + - "dbo.getUserName(championid) as name_champion," + - "dbo.getUserName(designid) as name_design," + - "dbo.getUserName(assemblyid) as name_assembly," + - "dbo.getUserName(epanelid) as name_epanel," + - "dbo.getUserName(softwareid) as name_software" + + " championid,designid,assemblyid,epanelid,softwareid,userAssembly," + + "dbo.getUserName2(championid,usermanager) as name_champion," + + "dbo.getUserName2(designid,usermain) as name_design," + + "dbo.getUserName2(assemblyid,userAssembly) as name_assembly," + + "dbo.getUserName2(epanelid,userhw2) as name_epanel," + + "dbo.getUserName2(softwareid,usersub) as name_software" + " 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 "; @@ -196,6 +196,7 @@ namespace FPJ0000 State_where += " (ISNULL(userManager, '') LIKE @username OR " + "ISNULL(usermain, '') LIKE @username OR " + "ISNULL(reqstaff, '') LIKE @username OR " + + "ISNULL(userAssembly, '') LIKE @username OR " + "dbo.getUserName(championid) LIKE @username OR " + "dbo.getUserName(designid) LIKE @username OR " + "dbo.getUserName(assemblyid) LIKE @username OR " + diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index aca9dfc..9a94fc5 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -231,15 +231,15 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/SxNxHMbvPwoClVIsFrTKUtcmLY0WGChF - SKESs3bThpqMigpL15TLXClrrcWoLLd0MjV1aUv6al9mX7Zbm9taWxnd091nh+6WP9ULHg7u/TwPbz68 - qf/G6PiI9lsBGKzvoR9YwMn+N9Ayrx6LYwl9o1Fd78jSYu+jCMyuMLofhkEl07+Qq3raxIkZCYw7+j3X - S532tsDg0UE/osUJVyP5WWd6BjEjocf9lcz756+A8V+GefYiKOQgGA5dmluzwDQcJvNsKIsnhGwJhoMX - fJKCKotCVcHsQlmXHOpuhcRPWceDYleGcDwNzdmplYIqS6lKSZdwzcNNaBttRvm5HSQoMDAWzBTYJ0Ow - TwThnA7i7ZcE9nZMkAJ1X6lKQW/ntPfqscdUjuJTBZC3bsGgNwSroHH27w1ef4qjotULFbOzsoyWc43O - OsjoQq6IzttmvL2IeGoZtkmWeO38lxSQLfgNbLxqrAeg7ClB9fV9OOo4jM30Bm4jvX6rsFGb7QNiyWU4 - pljcmc6IGnrCIpFafVnN1Uro3VocsdegmC7g8psyYYGWwXdY+vYTd32ZDR7M8ofknGGRLXWXErL2QhTp - 85B/fN1KWEB3Y4EUDPFBIUwKbvIPkc2LQAwao3fNO9Bee4koX+B6GiZet58vEAK52tTh/i1mJDQwzxFJ - /AAbS+NzJIUAmwS12+BBrmQN9+1iRsIx8/xYbac/Wds5h+rzPuw/s3ov/whF/QHBaCyfq+CnsAAAAABJ + SKESs3bThpqMigprrimXuVLWWotRWW7pZGrq0pb01b7Mvmy3NjdbWxnd091nh+6WP9ULHg7u/TwPbz68 + qf/G6PyI9ltBGGzvoe+fx8m+N9Ayrx6LYwm9IzFdz/DiQs+jKCzuCLoeRkAl07+Qq3raxIkZCYwn9j3X + S532tcDg1UE/rMUJdyP5WWd+BjEjodvzlcz75q6ACVyGZeYiKOQgGA5dml2zwDwUIfNsKKs3jGwJhoMX + /JKCKqtCVcHsQplJDnWXQuKnbGMhsStDJJGG5uzkSkGVtVSlpEu45qEmtI00o/zcDhIU6B8NZQocE2E4 + xkNwTYXw9ssS9naMkwJ1b6lKQW/ntPfqscdcjuJTBZC3bsGALwyboDH27w1ef0qgotUHFbOzsoyWc42u + OsjoQq6IzttmvL2ARGoZ9gmWeB38lxSQLfgN7LxqbAeg7C5B9fV9OOo8jM30Bm4jvX6rsFGb/QPiyWU4 + J1ncmcqIGnzCYim1+rKaq5XQe7Q44qhBMV3A5TdlwgItA++w+O0n7vozGzyY4Q/JNc0iW2qTErL2QhTp + 85B/fN1KWEB3Y54UDPJBIUwKbvIPkc2LYBwao2/NO9Bee4kYX+B+GiFeT4AvEAK52tTh+S1mJDQwzxFd + +gE2nsbnaApBNglqt8GLXMka7jvEjIRjlrnR2s5AsrZzFtXn/dh/ZvVe/hGK+gO6eiydWJyRuQAAAABJ RU5ErkJggg== @@ -275,6 +275,9 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 17, 17 + 387, 17 @@ -332,12 +335,18 @@ 561, 17 + + 561, 17 + 731, 17 647, 17 + + 731, 17 + 828, 17 diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index c6470a5..11f10c6 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -1021,6 +1021,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnname_software; + private global::System.Data.DataColumn columnuserAssembly; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public ProjectsDataTable() : @@ -1599,6 +1601,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn userAssemblyColumn { + get { + return this.columnuserAssembly; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1702,7 +1712,8 @@ namespace FPJ0000 { string name_design, string name_assembly, string name_epanel, - string name_software) { + string name_software, + string userAssembly) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1771,7 +1782,8 @@ namespace FPJ0000 { name_design, name_assembly, name_epanel, - name_software}; + name_software, + userAssembly}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -1844,7 +1856,8 @@ namespace FPJ0000 { string name_design, string name_assembly, string name_epanel, - string name_software) { + string name_software, + string userAssembly) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1913,7 +1926,8 @@ namespace FPJ0000 { name_design, name_assembly, name_epanel, - name_software}; + name_software, + userAssembly}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2010,6 +2024,7 @@ namespace FPJ0000 { this.columnname_assembly = base.Columns["name_assembly"]; this.columnname_epanel = base.Columns["name_epanel"]; this.columnname_software = base.Columns["name_software"]; + this.columnuserAssembly = base.Columns["userAssembly"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2149,6 +2164,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnname_epanel); this.columnname_software = new global::System.Data.DataColumn("name_software", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnname_software); + this.columnuserAssembly = new global::System.Data.DataColumn("userAssembly", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnuserAssembly); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -2223,6 +2240,7 @@ namespace FPJ0000 { this.columnname_epanel.MaxLength = 200; this.columnname_software.ReadOnly = true; this.columnname_software.MaxLength = 200; + this.columnuserAssembly.MaxLength = 50; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -12761,6 +12779,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string userAssembly { + get { + if (this.IsuserAssemblyNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableProjects.userAssemblyColumn])); + } + } + set { + this[this.tableProjects.userAssemblyColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsnameNull() { @@ -13516,6 +13550,18 @@ namespace FPJ0000 { public void Setname_softwareNull() { this[this.tableProjects.name_softwareColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsuserAssemblyNull() { + return this.IsNull(this.tableProjects.userAssemblyColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetuserAssemblyNull() { + this[this.tableProjects.userAssemblyColumn] = global::System.Convert.DBNull; + } } /// @@ -22757,6 +22803,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("name_assembly", "name_assembly"); tableMapping.ColumnMappings.Add("name_epanel", "name_epanel"); tableMapping.ColumnMappings.Add("name_software", "name_software"); + tableMapping.ColumnMappings.Add("userAssembly", "userAssembly"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -22772,24 +22819,27 @@ namespace FPJ0000.dsPRJTableAdapters { "erno], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], " + "[CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial]" + ", [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid]," + - " [softwareid]) VALUES (@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, @progre" + - "ss, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, @category, @user" + - "process, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bF" + - "anOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @desi" + - "gnid, @assemblyid, @epanelid, @softwareid);\r\nSELECT idx, status, pdate, name, us" + - "ermain, usersub, reqstaff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, us" + - "erManager, level, part, process, costo, costn, cnt, remark_req, remark_ans, ddat" + - "e, progress, import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(id" + - "x) AS lasthistory, gcode, category, userprocess, CMP_Background, CMP_Description" + - ", CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(id" + - "x) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bd" + - "ate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrat" + - "e, designid, assemblyid, epanelid, softwareid FROM Projects WHERE (idx = SCOPE_I" + - "DENTITY()) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') T" + - "HEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([s" + - "tatus] = \'취소\') THEN \'9\' ELSE \'5\' END)"; + " [softwareid], [userAssembly]) VALUES (@status, @pdate, @name, @usermain, @users" + + "ub, @reqstaff, @sdate, @edate, @odate, @memo, @wuid, @wdate, @rev, @pidx, @userM" + + "anager, @level, @part, @process, @costo, @costn, @cnt, @remark_req, @remark_ans," + + " @ddate, @progress, @import, @asset, @isdel, @path, @userhw2, @orderno, @gcode, " + + "@category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_Af" + + "ter, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @c" + + "hampionid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly);\r\nSELE" + + "CT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, m" + + "emo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cn" + + "t, 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, crd" + + "ue, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS ww" + + "e, \'\' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFini" + + "shRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, db" + + "o.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_de" + + "sign, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS" + + " name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Pr" + + "ojects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'" + + "0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status" + + "] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -22843,6 +22893,7 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@assemblyid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "assemblyid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@epanelid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "epanelid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@softwareid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "softwareid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userAssembly", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userAssembly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE Projects\r\nSET status = @status, pdate = @pdate, name = @name, userm" + @@ -22858,19 +22909,22 @@ namespace FPJ0000.dsPRJTableAdapters { "e, CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut, div = @div, crdue" + " = @crdue, model = @model, serial = @serial, bdate = @bdate, \r\n qd" + "ate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, as" + - "semblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid\r\nWHERE (" + - "idx = @Original_idx); \r\nSELECT idx, status, pdate, name, usermain, usersub, reqs" + - "taff, sdate, edate, odate, memo, wuid, wdate, rev, pidx, userManager, level, par" + - "t, process, costo, costn, cnt, remark_req, remark_ans, ddate, progress, import, " + - "asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gc" + - "ode, category, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_Aft" + - "er, bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, \'\'" + - " AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qdate, cdate, ch" + - "ampionid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assembly" + - "id, epanelid, softwareid FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [s" + - "tatus] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') TH" + - "EN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' " + - "END)"; + "semblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, \r\n " + + " userAssembly = @userAssembly\r\nWHERE (idx = @Original_idx); \r\nSELECT id" + + "x, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odate, memo, " + + "wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn, cnt, re" + + "mark_req, remark_ans, ddate, progress, import, asset, isdel, path, userhw2, orde" + + "rno, dbo.getLastHistory(idx) AS lasthistory, gcode, category, userprocess, CMP_B" + + "ackground, CMP_Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, d" + + "bo.getScheduleProgressI(idx) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\'" + + " AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRat" + + "e(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.get" + + "UserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design," + + " dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name" + + "_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Project" + + "s WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status]" + + " = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3" + + "\' WHEN ([status] = \'취소\') THEN \'9\' ELSE \'5\' END)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -22924,6 +22978,7 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@assemblyid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "assemblyid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@epanelid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "epanelid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@softwareid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "softwareid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userAssembly", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userAssembly", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } @@ -22945,7 +23000,7 @@ namespace FPJ0000.dsPRJTableAdapters { 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, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) - AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software + AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -22967,7 +23022,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN 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, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, - dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software + dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -22978,7 +23033,7 @@ WHERE (idx = @idx)"; 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, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, - dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software + dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly 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 @@ -23237,7 +23292,8 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = string designid, string assemblyid, string epanelid, - string softwareid) { + string softwareid, + string userAssembly) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -23545,6 +23601,12 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = else { this.Adapter.InsertCommand.Parameters[51].Value = ((string)(softwareid)); } + if ((userAssembly == null)) { + this.Adapter.InsertCommand.Parameters[52].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[52].Value = ((string)(userAssembly)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -23618,6 +23680,7 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = string assemblyid, string epanelid, string softwareid, + string userAssembly, int Original_idx, int idx) { if ((status == null)) { @@ -23927,8 +23990,14 @@ WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = else { this.Adapter.UpdateCommand.Parameters[51].Value = ((string)(softwareid)); } - this.Adapter.UpdateCommand.Parameters[52].Value = ((int)(Original_idx)); - this.Adapter.UpdateCommand.Parameters[53].Value = ((int)(idx)); + if ((userAssembly == null)) { + this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(userAssembly)); + } + this.Adapter.UpdateCommand.Parameters[53].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[54].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 2b09ecf..d067b61 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -11,18 +11,18 @@ - + DELETE FROM Projects WHERE (idx = @Original_idx) - + - INSERT INTO [Projects] ([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], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], [CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial], [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid], [softwareid]) VALUES (@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, @gcode, @category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @assemblyid, @epanelid, @softwareid); -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, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) + INSERT INTO [Projects] ([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], [gcode], [category], [userprocess], [CMP_Background], [CMP_Description], [CMP_Before], [CMP_After], [bCost], [bFanOut], [div], [crdue], [model], [serial], [bdate], [qdate], [cdate], [championid], [designid], [assemblyid], [epanelid], [softwareid], [userAssembly]) VALUES (@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, @gcode, @category, @userprocess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOut, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid, @assemblyid, @epanelid, @softwareid, @userAssembly); +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, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Projects WHERE (idx = SCOPE_IDENTITY()) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) @@ -76,6 +76,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -85,7 +86,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat 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, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) - AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software + AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -100,71 +101,73 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN - + UPDATE Projects SET status = @status, pdate = @pdate, name = @name, usermain = @usermain, usersub = @usersub, reqstaff = @reqstaff, sdate = @sdate, edate = @edate, odate = @odate, memo = @memo, wuid = @wuid, wdate = @wdate, rev = @rev, pidx = @pidx, userManager = @userManager, level = @level, part = @part, process = @process, costo = @costo, costn = @costn, cnt = @cnt, remark_req = @remark_req, remark_ans = @remark_ans, ddate = @ddate, progress = @progress, import = @import, asset = @asset, isdel = @isdel, path = @path, userhw2 = @userhw2, orderno = @orderno, gcode = @gcode, category = @category, userprocess = @userprocess, CMP_Background = @CMP_Background, CMP_Description = @CMP_Description, CMP_Before = @CMP_Before, CMP_After = @CMP_After, bCost = @bCost, bFanOut = @bFanOut, div = @div, crdue = @crdue, model = @model, serial = @serial, bdate = @bdate, - qdate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, assemblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid + qdate = @qdate, cdate = @cdate, championid = @championid, designid = @designid, assemblyid = @assemblyid, epanelid = @epanelid, softwareid = @softwareid, + userAssembly = @userAssembly WHERE (idx = @Original_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, div, crdue, dbo.getScheduleProgressI(idx) AS ProgressPrj, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) +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, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Projects WHERE (idx = @idx) ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') THEN '1' WHEN ([status] = '보류') THEN '2' WHEN ([status] = '완료') THEN '3' WHEN ([status] = '취소') THEN '9' ELSE '5' END) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -236,6 +239,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -262,7 +266,7 @@ WHERE (import = 1) AND (gcode = @gcode) 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, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, - dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software + dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly FROM Projects WHERE (idx = @idx) @@ -278,7 +282,7 @@ WHERE (idx = @idx) 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, '' AS wws, '' AS wwo, '' AS wwe, '' AS wwd, model, serial, bdate, qdate, cdate, championid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, - dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software + dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, userAssembly 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 @@ -2990,7 +2994,7 @@ WHERE (idx = @idx) - + @@ -3360,10 +3364,17 @@ WHERE (idx = @idx) + + + + + + + - + @@ -3407,7 +3418,7 @@ WHERE (idx = @idx) - + @@ -3452,7 +3463,7 @@ WHERE (idx = @idx) - + @@ -3589,7 +3600,7 @@ WHERE (idx = @idx) - + @@ -3763,7 +3774,7 @@ WHERE (idx = @idx) - + @@ -3801,7 +3812,7 @@ WHERE (idx = @idx) - + @@ -3917,7 +3928,7 @@ WHERE (idx = @idx) - + @@ -3968,7 +3979,7 @@ WHERE (idx = @idx) - + @@ -3981,7 +3992,7 @@ WHERE (idx = @idx) - + @@ -4153,7 +4164,7 @@ WHERE (idx = @idx) - + @@ -4359,7 +4370,7 @@ WHERE (idx = @idx) - + @@ -4404,7 +4415,7 @@ WHERE (idx = @idx) - + @@ -4481,7 +4492,7 @@ WHERE (idx = @idx) - + @@ -4672,7 +4683,7 @@ WHERE (idx = @idx) - + @@ -4811,7 +4822,7 @@ WHERE (idx = @idx) - + @@ -4870,7 +4881,7 @@ WHERE (idx = @idx) - + @@ -4916,7 +4927,7 @@ WHERE (idx = @idx) - +