diff --git a/SubProject/FCOMMON/fSFI.Designer.cs b/SubProject/FCOMMON/fSFI.Designer.cs index 12ad14b..0dda9ea 100644 --- a/SubProject/FCOMMON/fSFI.Designer.cs +++ b/SubProject/FCOMMON/fSFI.Designer.cs @@ -40,6 +40,10 @@ namespace FCOMMON this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.panel2 = new System.Windows.Forms.Panel(); + this.label16 = new System.Windows.Forms.Label(); + this.nudCSFIMFG = new System.Windows.Forms.NumericUpDown(); + this.label15 = new System.Windows.Forms.Label(); + this.nudMultiMFG = new System.Windows.Forms.NumericUpDown(); this.label19 = new System.Windows.Forms.Label(); this.label18 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); @@ -62,15 +66,13 @@ namespace FCOMMON this.button1 = new System.Windows.Forms.Button(); this.label14 = new System.Windows.Forms.Label(); this.nudCnt = new System.Windows.Forms.NumericUpDown(); - this.nudMultiMFG = new System.Windows.Forms.NumericUpDown(); - this.label15 = new System.Windows.Forms.Label(); - this.nudCSFIMFG = new System.Windows.Forms.NumericUpDown(); - this.label16 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudSFIOffice)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudOsavetime)).BeginInit(); this.panel2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudCSFIMFG)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudMultiMFG)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudShiftCnt)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMSaveCnt)).BeginInit(); @@ -79,8 +81,6 @@ namespace FCOMMON ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudCnt)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudMultiMFG)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudCSFIMFG)).BeginInit(); this.SuspendLayout(); // // radO @@ -251,6 +251,61 @@ namespace FCOMMON this.panel2.Size = new System.Drawing.Size(720, 269); this.panel2.TabIndex = 2; // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(96, 220); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(133, 37); + this.label16.TabIndex = 23; + this.label16.Text = "(C-SFI) = "; + // + // nudCSFIMFG + // + this.nudCSFIMFG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.nudCSFIMFG.DecimalPlaces = 2; + this.nudCSFIMFG.Location = new System.Drawing.Point(233, 218); + this.nudCSFIMFG.Maximum = new decimal(new int[] { + 999999999, + 0, + 0, + 0}); + this.nudCSFIMFG.Name = "nudCSFIMFG"; + this.nudCSFIMFG.Size = new System.Drawing.Size(281, 43); + this.nudCSFIMFG.TabIndex = 22; + this.nudCSFIMFG.Tag = "m"; + this.nudCSFIMFG.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(395, 172); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(28, 37); + this.label15.TabIndex = 21; + this.label15.Text = "*"; + // + // nudMultiMFG + // + this.nudMultiMFG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.nudMultiMFG.DecimalPlaces = 2; + this.nudMultiMFG.Location = new System.Drawing.Point(425, 169); + this.nudMultiMFG.Maximum = new decimal(new int[] { + 999999999, + 0, + 0, + 0}); + this.nudMultiMFG.Name = "nudMultiMFG"; + this.nudMultiMFG.Size = new System.Drawing.Size(89, 43); + this.nudMultiMFG.TabIndex = 20; + this.nudMultiMFG.Tag = "m"; + this.nudMultiMFG.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudMultiMFG.Value = new decimal(new int[] { + 125, + 0, + 0, + 131072}); + // // label19 // this.label19.AutoSize = true; @@ -537,61 +592,6 @@ namespace FCOMMON 0}); this.nudCnt.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged); // - // nudMultiMFG - // - this.nudMultiMFG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.nudMultiMFG.DecimalPlaces = 2; - this.nudMultiMFG.Location = new System.Drawing.Point(425, 169); - this.nudMultiMFG.Maximum = new decimal(new int[] { - 999999999, - 0, - 0, - 0}); - this.nudMultiMFG.Name = "nudMultiMFG"; - this.nudMultiMFG.Size = new System.Drawing.Size(89, 43); - this.nudMultiMFG.TabIndex = 20; - this.nudMultiMFG.Tag = "m"; - this.nudMultiMFG.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.nudMultiMFG.Value = new decimal(new int[] { - 125, - 0, - 0, - 131072}); - // - // label15 - // - this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(395, 172); - this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(28, 37); - this.label15.TabIndex = 21; - this.label15.Text = "*"; - // - // nudCSFIMFG - // - this.nudCSFIMFG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.nudCSFIMFG.DecimalPlaces = 2; - this.nudCSFIMFG.Location = new System.Drawing.Point(233, 218); - this.nudCSFIMFG.Maximum = new decimal(new int[] { - 999999999, - 0, - 0, - 0}); - this.nudCSFIMFG.Name = "nudCSFIMFG"; - this.nudCSFIMFG.Size = new System.Drawing.Size(281, 43); - this.nudCSFIMFG.TabIndex = 22; - this.nudCSFIMFG.Tag = "m"; - this.nudCSFIMFG.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label16 - // - this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(96, 220); - this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(133, 37); - this.label16.TabIndex = 23; - this.label16.Text = "(C-SFI) = "; - // // fSFI // this.AutoScaleDimensions = new System.Drawing.SizeF(15F, 37F); @@ -617,6 +617,8 @@ namespace FCOMMON ((System.ComponentModel.ISupportInitialize)(this.nudOsavetime)).EndInit(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.nudCSFIMFG)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudMultiMFG)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudShiftCnt)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMSaveCnt)).EndInit(); @@ -625,8 +627,6 @@ namespace FCOMMON ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudCnt)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudMultiMFG)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.nudCSFIMFG)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -641,7 +641,6 @@ namespace FCOMMON private System.Windows.Forms.Label label4; private System.Windows.Forms.NumericUpDown nudSFIOffice; private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.NumericUpDown nudSFIMFG; private System.Windows.Forms.NumericUpDown numericUpDown5; private System.Windows.Forms.NumericUpDown numericUpDown6; private System.Windows.Forms.Label label5; @@ -670,5 +669,6 @@ namespace FCOMMON private System.Windows.Forms.NumericUpDown nudMultiMFG; private System.Windows.Forms.NumericUpDown nudCSFIMFG; private System.Windows.Forms.Label label16; + public System.Windows.Forms.NumericUpDown nudSFIMFG; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 162c09b..5060792 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -165,8 +165,11 @@ namespace FPJ0000 btMailAddr.Enabled = btPart.Enabled; btPath.Enabled = btPart.Enabled; btSendMail.Enabled = btPart.Enabled; - if(dr.IssficNull()==false) - tbSFI.Text = dr.sfic.ToString("N2"); + + //if (dr.Issfi_typeNull() == false && dr.sfi_type == "M") + // tbSFI.Text = dr.sfic.ToString("N2"); + //else + tbSFI.Text = dr.sfi.ToString("N2"); //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.project)); @@ -272,7 +275,10 @@ namespace FPJ0000 { if (float.TryParse(tbSFI.Text, out float sfi)) { - this.dr.sfi = sfi; + // if (dr.sfi_type == "O") + this.dr.sfic = sfi; + //else + // this.dr.sfic = sfi; //mfg는 이곳으로 } else { @@ -280,7 +286,7 @@ namespace FPJ0000 return; } } - else this.dr.sfi = 0.0; + else this.dr.sfic = 0.0; //날짜박스의 날짜데이터 검증 if (checkDateValue() == false) return; @@ -678,7 +684,7 @@ namespace FPJ0000 { int cnt; - if(int.TryParse(cntTextBox.Text, out cnt)==false) + if (int.TryParse(cntTextBox.Text, out cnt) == false) { FCOMMON.Util.MsgE($"수량이 입려되지 않았습니다"); cntTextBox.Focus(); @@ -695,20 +701,28 @@ namespace FPJ0000 if (dr.Issfi_shiftcountNull() == false) sfi_shiftcount = dr.sfi_shiftcount; if (sfi_shiftcount == 0) sfi_shiftcount = 4; - var f = new FCOMMON.fSFI(sfi_type, sfi_time, sfi_count,sfi_shiftcount, cnt); + var f = new FCOMMON.fSFI(sfi_type, sfi_time, sfi_count, sfi_shiftcount, cnt); if (f.ShowDialog() == DialogResult.OK) { tbSFI.Text = f.Value.ToString("N2"); dr.sfi_type = f.radO.Checked ? "O" : "M"; if (f.radO.Checked) + { + dr.sfi = f.Value; //office 는 sfi와 sfic 가 동일하다 dr.sfi_savetime = (float)f.nudOsavetime.Value; + } else + { + //m 데이터는 sfi가 아닌sfic에 값이 들어간다. + dr.sfi = (float)f.nudSFIMFG.Value; dr.sfi_savetime = (float)f.nudMsavetime.Value; + } + dr.sfi_savecount = (float)f.nudMSaveCnt.Value; dr.sfi_shiftcount = (float)f.nudShiftCnt.Value; dr.EndEdit(); } - + } private void arLabel9_Click(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/Project/fProjectList.Designer.cs b/SubProject/FPJ0000/Project/fProjectList.Designer.cs index 93da45d..9fa003e 100644 --- a/SubProject/FPJ0000/Project/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/Project/fProjectList.Designer.cs @@ -30,44 +30,45 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType2 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType41 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType101 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType102 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType42 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType103 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType104 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType105 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType106 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType107 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType108 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType109 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType43 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType44 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType110 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType111 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType112 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType113 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType114 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType115 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType45 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType46 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType47 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType48 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType49 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType116 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType117 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType118 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType119 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType120 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType121 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType122 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType123 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType124 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType125 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType50 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType17 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType18 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType19 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType20 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -216,6 +217,13 @@ this.lbcnt5 = new System.Windows.Forms.Label(); this.lbcnt6 = new System.Windows.Forms.Label(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); + this.panel6 = new System.Windows.Forms.Panel(); + this.panel7 = new System.Windows.Forms.Panel(); + this.label36 = new System.Windows.Forms.Label(); + this.panel8 = new System.Windows.Forms.Panel(); + this.label37 = new System.Windows.Forms.Label(); + this.panel9 = new System.Windows.Forms.Panel(); + this.label38 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -236,6 +244,7 @@ this.tableLayoutPanel3.SuspendLayout(); this.tableLayoutPanel4.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); + this.panel6.SuspendLayout(); this.SuspendLayout(); // // bn @@ -328,7 +337,6 @@ // this.bindingNavigatorPositionItem.AccessibleName = "위치"; this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F); this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -451,7 +459,6 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -689,10 +696,10 @@ this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1339, 295); + this.fpSpread1.Size = new System.Drawing.Size(1339, 261); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; - this.fpSpread1.SetViewportLeftColumn(0, 0, 14); + this.fpSpread1.SetViewportLeftColumn(0, 0, 15); // // toolStrip1 // @@ -1482,7 +1489,7 @@ this.prb1.SignAlign = System.Drawing.ContentAlignment.BottomRight; this.prb1.SignColor = System.Drawing.Color.Yellow; this.prb1.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic); - this.prb1.Size = new System.Drawing.Size(1181, 11); + this.prb1.Size = new System.Drawing.Size(1181, 15); this.prb1.TabIndex = 32; this.prb1.TextAlign = System.Drawing.ContentAlignment.TopCenter; this.prb1.TextShadow = false; @@ -1767,12 +1774,14 @@ this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel3.Controls.Add(this.label17, 0, 0); this.tableLayoutPanel3.Controls.Add(this.prb1, 1, 0); + this.tableLayoutPanel3.Controls.Add(this.panel6, 0, 1); this.tableLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Bottom; - this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 403); + this.tableLayoutPanel3.Location = new System.Drawing.Point(0, 369); this.tableLayoutPanel3.Name = "tableLayoutPanel3"; - this.tableLayoutPanel3.RowCount = 1; + this.tableLayoutPanel3.RowCount = 2; this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel3.Size = new System.Drawing.Size(1339, 21); + this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.tableLayoutPanel3.Size = new System.Drawing.Size(1339, 55); this.tableLayoutPanel3.TabIndex = 34; // // label17 @@ -1781,7 +1790,7 @@ this.label17.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label17.Location = new System.Drawing.Point(3, 0); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(142, 21); + this.label17.Size = new System.Drawing.Size(142, 25); this.label17.TabIndex = 0; this.label17.Text = "구매 진행"; this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1929,7 +1938,7 @@ this.fpSpread1_Sheet1.SheetName = "Sheet1"; // Formulas and custom names must be loaded with R1C1 reference style this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 38; + this.fpSpread1_Sheet1.ColumnCount = 39; this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2; this.fpSpread1_Sheet1.ActiveColumnIndex = -1; this.fpSpread1_Sheet1.ActiveRowIndex = -1; @@ -1965,7 +1974,9 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).RowSpan = 2; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "Fan Out"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).RowSpan = 2; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "Major Item"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "High\r\nLight"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 38).RowSpan = 2; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 38).Value = "Major\r\nItem"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 3).Value = "Project\r\nNo"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 4).Value = "Process / Equipment"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "Site"; @@ -1998,231 +2009,318 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 32).Value = "Model#"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 33).Value = "Serial#"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 34).Value = "자스민"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 37).Value = "Major Item"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 35).Value = "Cost\r\nSave"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 36).Value = "Fan\r\nOut"; + this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 37).Value = "High\r\nLight"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(1).Height = 44F; this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; + numberCellType41.DecimalPlaces = 0; + numberCellType41.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType41.MaximumValue = 2147483647D; + numberCellType41.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType41; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Locked = true; this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Width = 45F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType101; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "category"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType102; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "userprocess"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType2.DecimalPlaces = 0; - numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType2.MaximumValue = 2147483647D; - numberCellType2.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2; + numberCellType42.DecimalPlaces = 0; + numberCellType42.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType42.MaximumValue = 2147483647D; + numberCellType42.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType42; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "pno"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "Project\r\nNo"; this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType103; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "Process / Equipment"; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType104; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ReqSite"; this.fpSpread1_Sheet1.Columns.Get(5).Label = "Site"; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType105; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "ReqPlant"; this.fpSpread1_Sheet1.Columns.Get(6).Label = "Plant"; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType106; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "ReqPackage"; this.fpSpread1_Sheet1.Columns.Get(7).Label = "PKG"; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType107; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "ReqLine"; this.fpSpread1_Sheet1.Columns.Get(8).Label = "Line"; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType108; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "part"; this.fpSpread1_Sheet1.Columns.Get(9).Label = "Request Team"; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType109; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "name"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(10).Label = "Project Title"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType3.DecimalPlaces = 0; - numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType3.MaximumValue = 2147483647D; - numberCellType3.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3; + numberCellType43.DecimalPlaces = 0; + numberCellType43.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType43.MaximumValue = 2147483647D; + numberCellType43.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType43; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "finishrate"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(11).Label = "준수(%)"; this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType4.DecimalPlaces = 0; - numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType4.MaximumValue = 2147483647D; - numberCellType4.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType4; + numberCellType44.DecimalPlaces = 0; + numberCellType44.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType44.MaximumValue = 2147483647D; + numberCellType44.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = numberCellType44; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "ProgressPrj"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "완료(%)"; 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 = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType110; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(13).Label = "Status"; this.fpSpread1_Sheet1.Columns.Get(13).Tag = "Status"; this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType111; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "kdate"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "검토\r\n기한"; this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType112; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "lasthistory_date"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "업데이트"; this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Width = 58F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType113; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "sdate"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Label = "Start Date"; this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(16).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType114; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "ddate"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Label = "Due Date"; this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType115; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(18).Label = "Done Date"; this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType5.DecimalPlaces = 0; - numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType5.MaximumValue = 2147483647D; - numberCellType5.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType5; + numberCellType45.DecimalPlaces = 0; + numberCellType45.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType45.MaximumValue = 2147483647D; + numberCellType45.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType45; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "cnt"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).Label = "Q\'ty"; this.fpSpread1_Sheet1.Columns.Get(19).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).Width = 42F; - numberCellType6.MaximumValue = 999999999999999D; - numberCellType6.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType6; + numberCellType46.MaximumValue = 999999999999999D; + numberCellType46.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType46; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "costo"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "Outsourced Cost ($K)/Set\r\n"; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Width = 63F; - numberCellType7.MaximumValue = 999999999999999D; - numberCellType7.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType7; + numberCellType47.MaximumValue = 999999999999999D; + numberCellType47.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType47; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "costn"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Label = "In-house Cost ($K/Set)"; 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).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType8.MaximumValue = 999999999999999D; - numberCellType8.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType8; + numberCellType48.MaximumValue = 999999999999999D; + numberCellType48.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType48; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "coste"; this.fpSpread1_Sheet1.Columns.Get(22).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).Label = "Cost Save ($k)/Set"; this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).Width = 67F; - numberCellType9.MaximumValue = 999999999999999D; - numberCellType9.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType9; + numberCellType49.MaximumValue = 999999999999999D; + numberCellType49.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = numberCellType49; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "sfic"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Label = "SFI"; this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Width = 52F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType116; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(24).Label = "SCR/CF"; this.fpSpread1_Sheet1.Columns.Get(25).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType117; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "name_champion"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(25).Label = "Champion"; this.fpSpread1_Sheet1.Columns.Get(25).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(26).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType118; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "name_software"; this.fpSpread1_Sheet1.Columns.Get(26).Label = "S/W"; this.fpSpread1_Sheet1.Columns.Get(27).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = textCellType119; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "name_design"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Label = "Design"; this.fpSpread1_Sheet1.Columns.Get(27).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType120; this.fpSpread1_Sheet1.Columns.Get(28).DataField = "name_epanel"; this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(28).Label = "ePanel"; this.fpSpread1_Sheet1.Columns.Get(28).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = textCellType121; this.fpSpread1_Sheet1.Columns.Get(29).DataField = "lasthistory"; this.fpSpread1_Sheet1.Columns.Get(29).Label = "History"; - this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType122; this.fpSpread1_Sheet1.Columns.Get(30).DataField = "memo"; this.fpSpread1_Sheet1.Columns.Get(30).Label = "Memo"; this.fpSpread1_Sheet1.Columns.Get(30).Width = 77F; - this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType123; this.fpSpread1_Sheet1.Columns.Get(31).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(31).Label = "Asset"; this.fpSpread1_Sheet1.Columns.Get(31).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType124; this.fpSpread1_Sheet1.Columns.Get(32).DataField = "model"; this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(32).Label = "Model#"; this.fpSpread1_Sheet1.Columns.Get(32).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(33).CellType = textCellType125; this.fpSpread1_Sheet1.Columns.Get(33).DataField = "serial"; this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(33).Label = "Serial#"; this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - numberCellType10.DecimalPlaces = 0; - numberCellType10.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType10.MaximumValue = 2147483647D; - numberCellType10.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType10; + numberCellType50.DecimalPlaces = 0; + numberCellType50.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType50.MaximumValue = 2147483647D; + numberCellType50.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(34).CellType = numberCellType50; this.fpSpread1_Sheet1.Columns.Get(34).DataField = "jasmin"; this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(34).Label = "자스민"; this.fpSpread1_Sheet1.Columns.Get(34).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(35).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(35).CellType = checkBoxCellType17; this.fpSpread1_Sheet1.Columns.Get(35).DataField = "bCost"; + this.fpSpread1_Sheet1.Columns.Get(35).Label = "Cost\r\nSave"; + this.fpSpread1_Sheet1.Columns.Get(35).Tag = "costsave"; this.fpSpread1_Sheet1.Columns.Get(35).Width = 44F; - this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(36).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(36).CellType = checkBoxCellType18; this.fpSpread1_Sheet1.Columns.Get(36).DataField = "bFanOut"; + this.fpSpread1_Sheet1.Columns.Get(36).Label = "Fan\r\nOut"; this.fpSpread1_Sheet1.Columns.Get(36).Width = 44F; - this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType3; + this.fpSpread1_Sheet1.Columns.Get(37).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType19; this.fpSpread1_Sheet1.Columns.Get(37).DataField = "bHighlight"; - this.fpSpread1_Sheet1.Columns.Get(37).Label = "Major Item"; + this.fpSpread1_Sheet1.Columns.Get(37).Label = "High\r\nLight"; this.fpSpread1_Sheet1.Columns.Get(37).Tag = "Highlight"; this.fpSpread1_Sheet1.Columns.Get(37).Width = 39F; + this.fpSpread1_Sheet1.Columns.Get(38).AllowAutoFilter = true; + this.fpSpread1_Sheet1.Columns.Get(38).CellType = checkBoxCellType20; + this.fpSpread1_Sheet1.Columns.Get(38).DataField = "bmajoritem"; + this.fpSpread1_Sheet1.Columns.Get(38).Tag = "majoritem"; 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; // + // panel6 + // + this.tableLayoutPanel3.SetColumnSpan(this.panel6, 5); + this.panel6.Controls.Add(this.label38); + this.panel6.Controls.Add(this.panel9); + this.panel6.Controls.Add(this.label37); + this.panel6.Controls.Add(this.panel8); + this.panel6.Controls.Add(this.label36); + this.panel6.Controls.Add(this.panel7); + this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel6.Location = new System.Drawing.Point(3, 28); + this.panel6.Name = "panel6"; + this.panel6.Size = new System.Drawing.Size(1333, 24); + this.panel6.TabIndex = 33; + // + // panel7 + // + this.panel7.BackColor = System.Drawing.Color.Gold; + this.panel7.Dock = System.Windows.Forms.DockStyle.Left; + this.panel7.Location = new System.Drawing.Point(0, 0); + this.panel7.Name = "panel7"; + this.panel7.Size = new System.Drawing.Size(20, 24); + this.panel7.TabIndex = 0; + // + // label36 + // + this.label36.Dock = System.Windows.Forms.DockStyle.Left; + this.label36.Location = new System.Drawing.Point(20, 0); + this.label36.Name = "label36"; + this.label36.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label36.Size = new System.Drawing.Size(87, 24); + this.label36.TabIndex = 1; + this.label36.Text = "CostSave"; + this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // panel8 + // + this.panel8.BackColor = System.Drawing.Color.Lime; + this.panel8.Dock = System.Windows.Forms.DockStyle.Left; + this.panel8.Location = new System.Drawing.Point(107, 0); + this.panel8.Name = "panel8"; + this.panel8.Size = new System.Drawing.Size(20, 24); + this.panel8.TabIndex = 2; + // + // label37 + // + this.label37.Dock = System.Windows.Forms.DockStyle.Left; + this.label37.Location = new System.Drawing.Point(127, 0); + this.label37.Name = "label37"; + this.label37.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label37.Size = new System.Drawing.Size(87, 24); + this.label37.TabIndex = 3; + this.label37.Text = "HighLight"; + this.label37.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // panel9 + // + this.panel9.BackColor = System.Drawing.Color.HotPink; + this.panel9.Dock = System.Windows.Forms.DockStyle.Left; + this.panel9.Location = new System.Drawing.Point(214, 0); + this.panel9.Name = "panel9"; + this.panel9.Size = new System.Drawing.Size(20, 24); + this.panel9.TabIndex = 4; + // + // label38 + // + this.label38.Dock = System.Windows.Forms.DockStyle.Left; + this.label38.Location = new System.Drawing.Point(234, 0); + this.label38.Name = "label38"; + this.label38.Padding = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label38.Size = new System.Drawing.Size(87, 24); + this.label38.TabIndex = 5; + this.label38.Text = "MajorItem"; + this.label38.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // // fProjectList // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -2262,6 +2360,7 @@ this.tableLayoutPanel3.ResumeLayout(false); this.tableLayoutPanel4.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); + this.panel6.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -2417,5 +2516,12 @@ private System.Windows.Forms.Label lbcnt5; private System.Windows.Forms.Label lbcnt6; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; + private System.Windows.Forms.Panel panel6; + private System.Windows.Forms.Label label36; + private System.Windows.Forms.Panel panel7; + private System.Windows.Forms.Panel panel9; + private System.Windows.Forms.Label label37; + private System.Windows.Forms.Panel panel8; + private System.Windows.Forms.Label label38; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 65b4195..966d1a0 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -212,7 +212,7 @@ namespace FPJ0000 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]," + + " [costo],[costn],[cnt],[remark_req],[remark_ans],[sdate],[ddate],[edate],[odate],[progress],bmajoritem," + " [memo],[wuid],[wdate],[orderno],[crdue],[import],[path],[userprocess],[bCost],[bFanOut],[bHighlight],[div]," + " dbo.getScheduleProgress(idx) as ProgressPrj,'' AS lasthistory,'' AS wws, '' AS wwo, '' AS wwe, '' AS wwd,model,serial," + " [championid], dbo.getProjectFinishRate(gcode, idx) AS finishrate,sfic,sfi_shiftcount, sfi_type, sfi_savetime, sfi_savecount," + @@ -230,6 +230,7 @@ namespace FPJ0000 if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우 + // if(chk비용절감.Checked== false) State_where += " isnull(bcost,0)=0 and "; //삭제보기 햇을 경우 //만료,완료,출고 if (cmbDateType.SelectedIndex > 0) @@ -243,8 +244,6 @@ namespace FPJ0000 } - - // "ISNULL(usermain, '') LIKE @username OR " + // "ISNULL(reqstaff, '') LIKE @username OR " + // "ISNULL(usersub, '') LIKE @username) "; @@ -326,18 +325,33 @@ namespace FPJ0000 //삭제컬럼인덱스 this.fpSpread1.SuspendLayout(); var statindex = this.fpSpread1.ActiveSheet.Columns["Status"].Index; - var majorindex = this.fpSpread1.ActiveSheet.Columns["Highlight"].Index; + var hoighlightindex = this.fpSpread1.ActiveSheet.Columns["Highlight"].Index; + var costindex = this.fpSpread1.ActiveSheet.Columns["costsave"].Index; + var majorindex = this.fpSpread1.ActiveSheet.Columns["majoritem"].Index; for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) { - var major = this.fpSpread1.ActiveSheet.GetValue(i, majorindex); + var hightlight = this.fpSpread1.ActiveSheet.GetValue(i, hoighlightindex); var state = this.fpSpread1.ActiveSheet.GetValue(i, statindex); - string stateStr = string.Empty; - string majorstr = string.Empty; - if (major != null) majorstr = major.ToString(); - if (state != null) stateStr = state.ToString(); + var cost = this.fpSpread1.ActiveSheet.GetValue(i, costindex); + var major = this.fpSpread1.ActiveSheet.GetValue(i, majorindex); - if (majorstr == "True") + string stateStr = string.Empty; + string highstr = string.Empty; + string coststr = string.Empty; + string majorstr = string.Empty; + + if (hightlight != null) highstr = hightlight.ToString(); + if (state != null) stateStr = state.ToString(); + if (cost != null) coststr = cost.ToString(); + if (major != null) majorstr = major.ToString(); + + + if (highstr == "True") this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.Lime; + else if (coststr == "True") + this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.Gold; + else if (majorstr == "True") + this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.HotPink; else this.fpSpread1.ActiveSheet.Rows[i].BackColor = Color.White; diff --git a/SubProject/FPJ0000/Project/fProjectList.resx b/SubProject/FPJ0000/Project/fProjectList.resx index 2940841..6d932e7 100644 --- a/SubProject/FPJ0000/Project/fProjectList.resx +++ b/SubProject/FPJ0000/Project/fProjectList.resx @@ -290,6 +290,9 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + 17, 17 + 387, 17 @@ -347,6 +350,12 @@ 934, 17 + + 934, 17 + + + 561, 17 + 561, 17 @@ -356,6 +365,9 @@ 647, 17 + + 731, 17 + 828, 17 diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs b/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs index 714a67c..42e958c 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.Designer.cs @@ -91,6 +91,7 @@ this.linkLabel2 = new System.Windows.Forms.LinkLabel(); this.arLabel2 = new arCtl.arLabel(); this.panel3 = new System.Windows.Forms.Panel(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.tbSFI = new System.Windows.Forms.TextBox(); this.textBox3 = new System.Windows.Forms.TextBox(); this.textBox4 = new System.Windows.Forms.TextBox(); @@ -104,7 +105,6 @@ this.textBox1 = new System.Windows.Forms.TextBox(); this.arLabel7 = new arCtl.arLabel(); this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_SaveCostTableAdapter(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); nameLabel = new System.Windows.Forms.Label(); reqstaffLabel = new System.Windows.Forms.Label(); userManagerLabel = new System.Windows.Forms.Label(); @@ -840,11 +840,22 @@ this.panel3.Size = new System.Drawing.Size(546, 113); this.panel3.TabIndex = 86; // - // textBox5 + // linkLabel1 // - this.tbSFI.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sfi", true)); + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(62, 90); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(23, 12); + this.linkLabel1.TabIndex = 93; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "SFI"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // + // tbSFI + // + this.tbSFI.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "sfic", true)); this.tbSFI.Location = new System.Drawing.Point(93, 86); - this.tbSFI.Name = "textBox5"; + this.tbSFI.Name = "tbSFI"; this.tbSFI.Size = new System.Drawing.Size(88, 21); this.tbSFI.TabIndex = 92; this.tbSFI.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -994,6 +1005,7 @@ this.tam.EETGW_JobReport_AutoInputTableAdapter = null; this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; + this.tam.EETGW_Project_LayoutTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; this.tam.EETGW_ProjectResonTableAdapter = null; this.tam.EETGW_ProjectsScheduleTableAdapter = null; @@ -1008,6 +1020,7 @@ this.tam.ProjectsTableAdapter = null; this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + this.tam.vEETGW_Project_LayoutListTableAdapter = null; // // tabControl1 // @@ -1126,17 +1139,6 @@ // this.ta.ClearBeforeFill = true; // - // linkLabel1 - // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(62, 90); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(23, 12); - this.linkLabel1.TabIndex = 93; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "SFI"; - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); - // // fSaveCostData // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.cs b/SubProject/FPJ0000/SaveCost/fSaveCostData.cs index 1bb1146..838cf7c 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.cs @@ -195,9 +195,16 @@ namespace FPJ0000 tbSFI.Text = f.Value.ToString("N2"); dr.sfi_type = f.radO.Checked ? "O" : "M"; if (f.radO.Checked) + { + dr.sfi = f.Value; //office 는 sfi와 sfic 가 동일하다 dr.sfi_savetime = (float)f.nudOsavetime.Value; + } else + { + //m 데이터는 sfi가 아닌sfic에 값이 들어간다. + dr.sfi = (float)f.nudSFIMFG.Value; dr.sfi_savetime = (float)f.nudMsavetime.Value; + } dr.sfi_savecount = (float)f.nudMSaveCnt.Value; dr.sfi_shiftcount = (float)f.nudShiftCnt.Value; dr.EndEdit(); diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.resx b/SubProject/FPJ0000/SaveCost/fSaveCostData.resx index 82c4262..485e510 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.resx +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.resx @@ -177,12 +177,6 @@ 100, 17 - - 100, 17 - - - 17, 17 - 17, 17 @@ -193,7 +187,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -204,7 +198,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -213,7 +207,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -222,7 +216,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs b/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs index 17a4430..f9c4f16 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostList.Designer.cs @@ -214,6 +214,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(30, 23); this.bindingNavigatorPositionItem.Text = "0"; @@ -304,6 +305,7 @@ // tbFind // this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbFind.Name = "tbFind"; this.tbFind.Size = new System.Drawing.Size(100, 25); this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown); @@ -343,7 +345,7 @@ this.toolStripMenuItem1, this.엑셀파일로저장ToolStripMenuItem}); this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(243, 160); + this.cm.Size = new System.Drawing.Size(241, 160); // // columnSizeToolStripMenuItem // @@ -353,14 +355,14 @@ this.saveToolStripMenuItem, this.loadToolStripMenuItem}); this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(240, 36); this.columnSizeToolStripMenuItem.Text = "열 너비"; // // autoToolStripMenuItem // this.autoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("autoToolStripMenuItem.Image"))); this.autoToolStripMenuItem.Name = "autoToolStripMenuItem"; - this.autoToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.autoToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.autoToolStripMenuItem.Text = "Auto"; this.autoToolStripMenuItem.Click += new System.EventHandler(this.autoToolStripMenuItem_Click); // @@ -368,7 +370,7 @@ // this.resetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resetToolStripMenuItem.Image"))); this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.resetToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.resetToolStripMenuItem.Text = "Reset"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // @@ -376,7 +378,7 @@ // this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.saveToolStripMenuItem.Text = "Save"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // @@ -384,38 +386,38 @@ // this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(149, 36); + this.loadToolStripMenuItem.Size = new System.Drawing.Size(147, 36); this.loadToolStripMenuItem.Text = "Load"; this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(239, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(237, 6); // // 삭제ToolStripMenuItem // this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; - this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(240, 36); this.삭제ToolStripMenuItem.Text = "삭제"; this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); // // 편집ToolStripMenuItem1 // this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; - this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(242, 36); + this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(240, 36); this.편집ToolStripMenuItem1.Text = "편집"; this.편집ToolStripMenuItem1.Click += new System.EventHandler(this.편집ToolStripMenuItem1_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(239, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(237, 6); // // 엑셀파일로저장ToolStripMenuItem // this.엑셀파일로저장ToolStripMenuItem.Name = "엑셀파일로저장ToolStripMenuItem"; - this.엑셀파일로저장ToolStripMenuItem.Size = new System.Drawing.Size(242, 36); + this.엑셀파일로저장ToolStripMenuItem.Size = new System.Drawing.Size(240, 36); this.엑셀파일로저장ToolStripMenuItem.Text = "목록 내보내기"; this.엑셀파일로저장ToolStripMenuItem.Click += new System.EventHandler(this.엑셀파일로저장ToolStripMenuItem_Click); // @@ -468,6 +470,7 @@ // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(90, 27); this.dtSD.Text = "1982-11-23"; @@ -482,6 +485,7 @@ // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F); this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(90, 27); this.dtED.Text = "1982-11-23"; @@ -502,6 +506,7 @@ // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F); this.tbRequest.Name = "tbRequest"; this.tbRequest.Size = new System.Drawing.Size(120, 27); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; @@ -766,6 +771,7 @@ this.tam.EETGW_JobReport_AutoInputTableAdapter = null; this.tam.EETGW_JobReport_EBoardTableAdapter = null; this.tam.EETGW_NoteTableAdapter = null; + this.tam.EETGW_Project_LayoutTableAdapter = null; this.tam.EETGW_ProjecthistoryDTableAdapter = null; this.tam.EETGW_ProjectResonTableAdapter = null; this.tam.EETGW_ProjectsScheduleTableAdapter = null; @@ -780,6 +786,7 @@ this.tam.ProjectsTableAdapter = null; this.tam.SPMasterTableAdapter = null; this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + this.tam.vEETGW_Project_LayoutListTableAdapter = null; // // ta // @@ -882,7 +889,7 @@ numberCellType5.MaximumValue = 999999999999999D; numberCellType5.MinimumValue = -999999999999999D; this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType5; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "sfi"; + this.fpSpread1_Sheet1.Columns.Get(9).DataField = "sfic"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "SFI"; this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostList.cs b/SubProject/FPJ0000/SaveCost/fSaveCostList.cs index 8ec5318..3e3b62f 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostList.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostList.cs @@ -347,6 +347,9 @@ namespace FPJ0000 private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) { + util.MsgE("프로젝트로 등록하세요. 프로젝트 정보 중 [비용절감]을 체크하세요"); + return; + var newdr = this.dsMSSQL.EETGW_SaveCost.NewEETGW_SaveCostRow(); newdr.wuid = FCOMMON.info.Login.no; newdr.wdate = DateTime.Now; @@ -436,6 +439,9 @@ namespace FPJ0000 private void toolStripButton2_Click(object sender, EventArgs e) { + util.MsgE("프로젝트로 등록하세요. 프로젝트 정보 중 [비용절감]을 체크하세요"); + return; + var newdr = this.dsMSSQL.EETGW_SaveCost.NewEETGW_SaveCostRow(); newdr.wuid = FCOMMON.info.Login.no; newdr.wdate = DateTime.Now; diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostList.resx b/SubProject/FPJ0000/SaveCost/fSaveCostList.resx index 8a91aab..97166fb 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostList.resx +++ b/SubProject/FPJ0000/SaveCost/fSaveCostList.resx @@ -130,7 +130,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wgAADsIBFShKgAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA @@ -141,7 +141,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + wgAADsIBFShKgAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC @@ -150,7 +150,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + wgAADsIBFShKgAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f oAc0QjgAAAAASUVORK5CYII= @@ -159,7 +159,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + wgAADsIBFShKgAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG @@ -170,7 +170,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -182,7 +182,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + wgAADsIBFShKgAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA @@ -204,7 +204,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + wgAADsIBFShKgAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG @@ -216,7 +216,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo + wgAADsIBFShKgAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 2f694d6..1021847 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -1133,6 +1133,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnsfic; + private global::System.Data.DataColumn columnbmajoritem; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public ProjectsDataTable() : @@ -1879,6 +1881,14 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public global::System.Data.DataColumn bmajoritemColumn { + get { + return this.columnbmajoritem; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2003,7 +2013,8 @@ namespace FPJ0000 { double sfi_savetime, double sfi_savecount, double sfi_shiftcount, - double sfic) { + double sfic, + bool bmajoritem) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2093,7 +2104,8 @@ namespace FPJ0000 { sfi_savetime, sfi_savecount, sfi_shiftcount, - sfic}; + sfic, + bmajoritem}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2187,7 +2199,8 @@ namespace FPJ0000 { double sfi_savetime, double sfi_savecount, double sfi_shiftcount, - double sfic) { + double sfic, + bool bmajoritem) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2277,7 +2290,8 @@ namespace FPJ0000 { sfi_savetime, sfi_savecount, sfi_shiftcount, - sfic}; + sfic, + bmajoritem}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2395,6 +2409,7 @@ namespace FPJ0000 { this.columnsfi_savecount = base.Columns["sfi_savecount"]; this.columnsfi_shiftcount = base.Columns["sfi_shiftcount"]; this.columnsfic = base.Columns["sfic"]; + this.columnbmajoritem = base.Columns["bmajoritem"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2576,6 +2591,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnsfi_shiftcount); this.columnsfic = new global::System.Data.DataColumn("sfic", typeof(double), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnsfic); + this.columnbmajoritem = new global::System.Data.DataColumn("bmajoritem", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnbmajoritem); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -14285,6 +14302,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool bmajoritem { + get { + if (this.IsbmajoritemNull()) { + return false; + } + else { + return ((bool)(this[this.tableProjects.bmajoritemColumn])); + } + } + set { + this[this.tableProjects.bmajoritemColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsnameNull() { @@ -15292,6 +15325,18 @@ namespace FPJ0000 { public void SetsficNull() { this[this.tableProjects.sficColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool IsbmajoritemNull() { + return this.IsNull(this.tableProjects.bmajoritemColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void SetbmajoritemNull() { + this[this.tableProjects.bmajoritemColumn] = global::System.Convert.DBNull; + } } /// @@ -24956,6 +25001,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("sfi_savecount", "sfi_savecount"); tableMapping.ColumnMappings.Add("sfi_shiftcount", "sfi_shiftcount"); tableMapping.ColumnMappings.Add("sfic", "sfic"); + tableMapping.ColumnMappings.Add("bmajoritem", "bmajoritem"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -24964,82 +25010,97 @@ namespace FPJ0000.dsPRJTableAdapters { this._adapter.DeleteCommand.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.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"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, ReqLine, ReqSite, ReqPackage, ReqPlant, - pno, kdate, jasmin, bHighlight, effect_tangible, effect_intangible, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic) -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,@ReqLine,@ReqSite,@ReqPackage,@ReqPlant,@pno,@kdate,@jasmin,@bHighlight,@effect_tangible,@effect_intangible,@sfi,@sfi_type,@sfi_savetime,@sfi_savecount,@sfi_shiftcount,@sfic)"; + this._adapter.InsertCommand.CommandText = "INSERT INTO [Projects] ([status], [pdate], [name], [usermain], [usersub], [reqsta" + + "ff], [sdate], [edate], [odate], [memo], [wuid], [wdate], [rev], [pidx], [userMan" + + "ager], [level], [part], [process], [costo], [costn], [cnt], [remark_req], [remar" + + "k_ans], [ddate], [progress], [import], [asset], [isdel], [path], [userhw2], [ord" + + "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], [userAssembly], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant], [" + + "pno], [kdate], [jasmin], [bHighlight], [effect_tangible], [effect_intangible], [" + + "sfi], [sfi_type], [sfi_savetime], [sfi_savecount], [sfi_shiftcount], [sfic], [bm" + + "ajoritem]) VALUES (@status, @pdate, @name, @usermain, @usersub, @reqstaff, @sdat" + + "e, @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, @gcode, @category, @userproc" + + "ess, @CMP_Background, @CMP_Description, @CMP_Before, @CMP_After, @bCost, @bFanOu" + + "t, @div, @crdue, @model, @serial, @bdate, @qdate, @cdate, @championid, @designid" + + ", @assemblyid, @epanelid, @softwareid, @userAssembly, @ReqLine, @ReqSite, @ReqPa" + + "ckage, @ReqPlant, @pno, @kdate, @jasmin, @bHighlight, @effect_tangible, @effect_" + + "intangible, @sfi, @sfi_type, @sfi_savetime, @sfi_savecount, @sfi_shiftcount, @sf" + + "ic, @bmajoritem)"; 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, 50, 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, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usermain", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usersub", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqstaff", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@odate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 4, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rev", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userManager", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@level", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@part", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@costo", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@costn", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cnt", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_req", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "remark_req", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_ans", global::System.Data.SqlDbType.VarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "remark_ans", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@asset", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 300, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userhw2", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 2147483647, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@div", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@crdue", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "crdue", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@serial", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "bdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "qdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@championid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "championid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@designid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "designid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.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.InsertCommand.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.InsertCommand.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.InsertCommand.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.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqLine", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqLine", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqSite", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqSite", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPackage", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPlant", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pno", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "pno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kdate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "kdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jasmin", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "jasmin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bHighlight", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bHighlight", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_tangible", global::System.Data.SqlDbType.VarChar, 1000, global::System.Data.ParameterDirection.Input, 0, 0, "effect_tangible", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_intangible", global::System.Data.SqlDbType.VarChar, 1000, global::System.Data.ParameterDirection.Input, 0, 0, "effect_intangible", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_type", global::System.Data.SqlDbType.VarChar, 1, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savetime", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savecount", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_shiftcount", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfic", global::System.Data.SqlDbType.Float, 8, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + 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, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usermain", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usermain", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@usersub", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "usersub", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqstaff", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@odate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.SmallDateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@rev", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "rev", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userManager", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userManager", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@level", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "level", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@part", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@costo", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@costn", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "costn", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cnt", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cnt", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_req", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark_req", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@remark_ans", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "remark_ans", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@progress", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "progress", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@asset", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "asset", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@isdel", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "isdel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userhw2", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userhw2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@orderno", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "orderno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@category", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "category", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "userprocess", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Background", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Background", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Description", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Description", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_Before", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_Before", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CMP_After", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "CMP_After", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bCost", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bCost", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bFanOut", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bFanOut", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@div", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "div", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@crdue", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "crdue", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@serial", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "serial", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@qdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "qdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@championid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "championid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@designid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "designid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + 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.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqLine", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqLine", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqSite", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqSite", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPackage", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPackage", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ReqPlant", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ReqPlant", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pno", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pno", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@kdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "kdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@jasmin", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "jasmin", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bHighlight", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bHighlight", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_tangible", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "effect_tangible", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@effect_intangible", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "effect_intangible", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_type", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_type", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savetime", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savetime", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_savecount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_savecount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfi_shiftcount", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfi_shiftcount", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sfic", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sfic", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bmajoritem", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bmajoritem", 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, nam" + @@ -25165,31 +25226,29 @@ VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate, this._commandCollection = new global::System.Data.SqlClient.SqlCommand[5]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, eda" + - "te, odate, memo, wuid, wdate, rev, pidx, userManager, level, part, process, cost" + - "o, costn, cnt, remark_req, \r\n remark_ans, ddate, progress, " + - "import, asset, isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthis" + - "tory, gcode, category, userprocess, CMP_Background, \r\n CMP_" + - "Description, CMP_Before, CMP_After, bCost, bFanOut, div, crdue, dbo.getScheduleP" + - "rogressI(idx) AS ProgressPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model," + - " \r\n serial, bdate, qdate, cdate, championid, dbo.getProject" + - "FinishRate(gcode, idx) AS finishrate, designid, assemblyid, epanelid, softwareid" + - ", dbo.getUserName(championid) \r\n AS name_champion, dbo.getU" + - "serName(designid) AS name_design, dbo.getUserName(assemblyid) AS name_assembly, " + - "dbo.getUserName(epanelid) AS name_epanel, \r\n dbo.getUserNam" + - "e(softwareid) AS name_software, userAssembly, ReqLine, ReqSite, ReqPackage, ReqP" + - "lant, pno, kdate, jasmin, dbo.getLastHistoryD(idx) AS lasthistoryD, \r\n " + - " bHighlight, effect_tangible, effect_intangible,\r\n " + - " (SELECT MAX(pdate) AS Expr1\r\n FROM " + - " ProjectsHistory\r\n WHERE (pidx " + - "= Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount" + - ", sfi_shiftcount, sfic\r\nFROM Projects WITH (nolock)\r\nWHERE " + - "(status LIKE @state) AND (ISNULL(userManager, \'\') LIKE @username OR\r\n " + - " ISNULL(usermain, \'\') LIKE @username OR\r\n ISNULL(" + - "usersub, \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode)\r\nOR" + - "DER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' W" + - "HEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = " + - "\'취소\') \r\n THEN \'9\' ELSE \'5\' END)"; + this._commandCollection[0].CommandText = "SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat" + + "e, memo, wuid, wdate, rev, pidx, userManager, level, part, process, costo, costn" + + ", cnt, remark_req, remark_ans, ddate, \r\n progress, import, asset, " + + "isdel, path, userhw2, orderno, dbo.getLastHistory(idx) AS lasthistory, gcode, ca" + + "tegory, userprocess, CMP_Background, CMP_Description, CMP_Before, CMP_After, \r\n " + + " bCost, bFanOut, div, crdue, dbo.getScheduleProgressI(idx) AS Progr" + + "essPrj, \'\' AS wws, \'\' AS wwo, \'\' AS wwe, \'\' AS wwd, model, serial, bdate, qdate," + + " cdate, championid, \r\n dbo.getProjectFinishRate(gcode, idx) AS fin" + + "ishrate, designid, assemblyid, epanelid, softwareid, dbo.getUserName(championid)" + + " AS name_champion, dbo.getUserName(designid) \r\n AS name_design, db" + + "o.getUserName(assemblyid) AS name_assembly, dbo.getUserName(epanelid) AS name_ep" + + "anel, dbo.getUserName(softwareid) AS name_software, userAssembly, \r\n " + + " ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, dbo.getLastHistor" + + "yD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible,\r\n " + + " (SELECT MAX(pdate) AS Expr1\r\n FROM Projects" + + "History\r\n WHERE (pidx = Projects.idx)) AS lasthistory_date, " + + "sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem\r\nFR" + + "OM Projects WITH (nolock)\r\nWHERE (status LIKE @state) AND (ISNULL(userManag" + + "er, \'\') LIKE @username OR\r\n ISNULL(usermain, \'\') LIKE @username OR" + + "\r\n ISNULL(usersub, \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) " + + "AND (gcode = @gcode)\r\nORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status" + + "] = \'진행\') THEN \'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'" + + "3\' WHEN ([status] = \'취소\') \r\n THEN \'9\' ELSE \'5\' END)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@username", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -25201,12 +25260,12 @@ VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate, this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx)"; + this._commandCollection[2].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) 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 (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)"; + this._commandCollection[3].CommandText = @"SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) 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 (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search)"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -25478,7 +25537,8 @@ VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate, global::System.Nullable sfi_savetime, global::System.Nullable sfi_savecount, global::System.Nullable sfi_shiftcount, - global::System.Nullable sfic) { + global::System.Nullable sfic, + global::System.Nullable bmajoritem) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -25888,6 +25948,12 @@ VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate, else { this.Adapter.InsertCommand.Parameters[68].Value = global::System.DBNull.Value; } + if ((bmajoritem.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[69].Value = ((bool)(bmajoritem.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[69].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd index 632702d..8542b06 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -20,104 +20,99 @@ 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, userAssembly, ReqLine, ReqSite, ReqPackage, ReqPlant, - pno, kdate, jasmin, bHighlight, effect_tangible, effect_intangible, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic) -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,@ReqLine,@ReqSite,@ReqPackage,@ReqPlant,@pno,@kdate,@jasmin,@bHighlight,@effect_tangible,@effect_intangible,@sfi,@sfi_type,@sfi_savetime,@sfi_savecount,@sfi_shiftcount,@sfic) + + 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], [ReqLine], [ReqSite], [ReqPackage], [ReqPlant], [pno], [kdate], [jasmin], [bHighlight], [effect_tangible], [effect_intangible], [sfi], [sfi_type], [sfi_savetime], [sfi_savecount], [sfi_shiftcount], [sfic], [bmajoritem]) 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, @ReqLine, @ReqSite, @ReqPackage, @ReqPlant, @pno, @kdate, @jasmin, @bHighlight, @effect_tangible, @effect_intangible, @sfi, @sfi_type, @sfi_savetime, @sfi_savecount, @sfi_shiftcount, @sfic, @bmajoritem) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - 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, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, dbo.getLastHistoryD(idx) AS lasthistoryD, - bHighlight, effect_tangible, effect_intangible, - (SELECT MAX(pdate) AS Expr1 - FROM ProjectsHistory - WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic -FROM Projects WITH (nolock) -WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR - ISNULL(usermain, '') LIKE @username OR - ISNULL(usersub, '') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) -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, + ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin, dbo.getLastHistoryD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible, + (SELECT MAX(pdate) AS Expr1 + FROM ProjectsHistory + WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi, sfi_type, sfi_savetime, sfi_savecount, sfi_shiftcount, sfic, bmajoritem +FROM Projects WITH (nolock) +WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR + ISNULL(usermain, '') LIKE @username OR + ISNULL(usersub, '') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +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) @@ -126,7 +121,7 @@ ORDER BY (CASE WHEN [status] = '검토' THEN '0' WHEN ([status] = '진행') - + 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, @@ -141,77 +136,77 @@ SET status = @status, pdate = @pdate, name = @name, usermain = @u 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, 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, ReqLine, ReqSite, ReqPackage, ReqPlant, pno, kdate, jasmin 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) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -302,6 +297,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -324,7 +320,7 @@ WHERE (import = 1) AND (gcode = @gcode) - SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx) + SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) WHERE (idx = @idx) @@ -334,7 +330,7 @@ WHERE (import = 1) AND (gcode = @gcode) - SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) 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 (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search) + SELECT CMP_After, CMP_Background, CMP_Before, CMP_Description, dbo.getScheduleProgressI(idx) AS ProgressPrj, ReqLine, ReqPackage, ReqPlant, ReqSite, assemblyid, asset, bCost, bFanOut, bHighlight, bdate, bmajoritem, category, cdate, championid, cnt, costn, costo, crdue, ddate, designid, div, edate, effect_intangible, effect_tangible, epanelid, dbo.getProjectFinishRate(gcode, idx) AS finishrate, gcode, idx, import, isdel, jasmin, kdate, dbo.getLastHistory(idx) AS lasthistory, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory WHERE (pidx = Projects.idx)) AS lasthistory_date, level, memo, model, name, dbo.getUserName(assemblyid) AS name_assembly, dbo.getUserName(championid) AS name_champion, dbo.getUserName(designid) AS name_design, dbo.getUserName(epanelid) AS name_epanel, dbo.getUserName(softwareid) AS name_software, odate, orderno, part, path, pdate, pidx, pno, process, progress, qdate, remark_ans, remark_req, reqstaff, rev, sdate, serial, sfi, sfi_savecount, sfi_savetime, sfi_shiftcount, sfi_type, sfic, softwareid, status, userAssembly, userManager, userhw2, usermain, userprocess, usersub, wdate, wuid, '' AS wwd, '' AS wwe, '' AS wwo, '' AS wws FROM Projects WITH (nolock) 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 (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (ISNULL(memo, N'') LIKE @search) @@ -3550,6 +3546,7 @@ WHERE (idx = @idx) + @@ -4140,17 +4137,17 @@ WHERE (idx = @idx) - + - - - - + + + +