diff --git a/Project/Dialog/fLogin.Designer.cs b/Project/Dialog/fLogin.Designer.cs index 54253f8..c6336cc 100644 --- a/Project/Dialog/fLogin.Designer.cs +++ b/Project/Dialog/fLogin.Designer.cs @@ -31,6 +31,7 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLogin)); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.label4 = new System.Windows.Forms.Label(); this.cmbDept = new System.Windows.Forms.ComboBox(); this.label3 = new System.Windows.Forms.Label(); @@ -40,7 +41,6 @@ this.tbPW = new System.Windows.Forms.TextBox(); this.panel2 = new System.Windows.Forms.Panel(); this.btLogin = new System.Windows.Forms.Button(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -74,6 +74,18 @@ this.panel1.Size = new System.Drawing.Size(888, 415); this.panel1.TabIndex = 0; // + // linkLabel1 + // + this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.linkLabel1.AutoSize = true; + this.linkLabel1.Location = new System.Drawing.Point(806, 334); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(70, 23); + this.linkLabel1.TabIndex = 11; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "신규가입"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // // label4 // this.label4.AutoSize = true; @@ -111,6 +123,7 @@ // this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F); this.tbID.FormattingEnabled = true; + this.tbID.ImeMode = System.Windows.Forms.ImeMode.Alpha; this.tbID.Location = new System.Drawing.Point(16, 213); this.tbID.Name = "tbID"; this.tbID.Size = new System.Drawing.Size(860, 41); @@ -141,6 +154,7 @@ // tbPW // this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.tbPW.ImeMode = System.Windows.Forms.ImeMode.Alpha; this.tbPW.Location = new System.Drawing.Point(16, 287); this.tbPW.Name = "tbPW"; this.tbPW.PasswordChar = '●'; @@ -170,18 +184,6 @@ this.btLogin.UseVisualStyleBackColor = true; this.btLogin.Click += new System.EventHandler(this.button1_Click); // - // linkLabel1 - // - this.linkLabel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(806, 334); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(70, 23); - this.linkLabel1.TabIndex = 11; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "신규가입"; - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); - // // fLogin // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 22930bb..829852d 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("23.10.19.0042")] -[assembly: AssemblyFileVersion("23.10.19.0042")] +[assembly: AssemblyVersion("23.10.19.1230")] +[assembly: AssemblyFileVersion("23.10.19.1230")] diff --git a/SubProject/FCOMMON/Util.cs b/SubProject/FCOMMON/Util.cs index 585492d..af7b6bd 100644 --- a/SubProject/FCOMMON/Util.cs +++ b/SubProject/FCOMMON/Util.cs @@ -20,22 +20,22 @@ namespace FCOMMON public static partial class Util { - + #region "flag" - + //public static Boolean getBit(ref Int32 flag_, int idx) //{ // return getBit(ref (UInt32)flag_, idx); //} - public static Boolean getBit( Int32 flag_, int idx) + public static Boolean getBit(Int32 flag_, int idx) { var offset = (UInt32)(1 << (int)idx); return ((flag_ & offset) != 0); } public static void toggleBit(ref Int32 flag_, int idx) { - var curValue = getBit( flag_, idx); + var curValue = getBit(flag_, idx); setBit(ref flag_, idx, !curValue); } // public static void setBit(ref Int32 flag_, int idx, Boolean value) @@ -61,8 +61,68 @@ namespace FCOMMON #endregion - + public static string Number2Hangle(long lngNumber) + { + string[] NumberChar = new string[] { "", "일", "이", "삼" + , "사", "오", "육" + , "칠", "팔", "구" }; + string[] LevelChar = new string[] { "", "십", "백", "천" }; + string[] DecimalChar = new string[] { "", "만", "억", "조", "경" }; + + string strMinus = string.Empty; + + if (lngNumber < 0) + { + strMinus = "마이너스"; + lngNumber *= -1; + } + + string strValue = string.Format("{0}", lngNumber); + string NumToKorea = string.Empty; + bool UseDecimal = false; + + if (lngNumber == 0) return "영"; + + for (int i = 0; i < strValue.Length; i++) + { + int Level = strValue.Length - i; + if (strValue.Substring(i, 1) != "0") + { + UseDecimal = true; + if (((Level - 1) % 4) == 0) + { + if (DecimalChar[(Level - 1) / 4] != string.Empty + && strValue.Substring(i, 1) == "1") + NumToKorea = NumToKorea + DecimalChar[(Level - 1) / 4]; + else + NumToKorea = NumToKorea + + NumberChar[int.Parse(strValue.Substring(i, 1))] + + DecimalChar[(Level - 1) / 4]; + UseDecimal = false; + } + else + { + if (strValue.Substring(i, 1) == "1") + NumToKorea = NumToKorea + + LevelChar[(Level - 1) % 4]; + else + NumToKorea = NumToKorea + + NumberChar[int.Parse(strValue.Substring(i, 1))] + + LevelChar[(Level - 1) % 4]; + } + } + else + { + if ((Level % 4 == 0) && UseDecimal) + { + NumToKorea = NumToKorea + DecimalChar[Level / 4]; + UseDecimal = false; + } + } + } + return strMinus + NumToKorea; + } public static bool IsNumeric(string input) @@ -281,12 +341,12 @@ namespace FCOMMON m = string.Format(m, args); MessageBox.Show(m, "확인", MessageBoxButtons.OK, MessageBoxIcon.Information); } - public static void MsgE(string m,params string[] args) + public static void MsgE(string m, params string[] args) { m = string.Format(m, args); MessageBox.Show(m, "오류", MessageBoxButtons.OK, MessageBoxIcon.Error); } - public static DialogResult MsgQ(string m,params string[] args) + public static DialogResult MsgQ(string m, params string[] args) { m = string.Format(m, args); DialogResult dlg = MessageBox.Show(m, "확인", MessageBoxButtons.YesNo, MessageBoxIcon.Question); diff --git a/SubProject/FCOMMON/fSFI.Designer.cs b/SubProject/FCOMMON/fSFI.Designer.cs index e50150d..ca97197 100644 --- a/SubProject/FCOMMON/fSFI.Designer.cs +++ b/SubProject/FCOMMON/fSFI.Designer.cs @@ -33,6 +33,8 @@ namespace FCOMMON this.radM = new System.Windows.Forms.RadioButton(); this.panel1 = new System.Windows.Forms.Panel(); this.numericUpDown3 = new System.Windows.Forms.NumericUpDown(); + this.label16 = new System.Windows.Forms.Label(); + this.nudSFIOffice = new System.Windows.Forms.NumericUpDown(); this.numericUpDown2 = new System.Windows.Forms.NumericUpDown(); this.nudOsavetime = new System.Windows.Forms.NumericUpDown(); this.label3 = new System.Windows.Forms.Label(); @@ -40,8 +42,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.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); + this.label15 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label(); - this.numericUpDown10 = new System.Windows.Forms.NumericUpDown(); + this.nudShiftCnt = new System.Windows.Forms.NumericUpDown(); this.label11 = new System.Windows.Forms.Label(); this.numericUpDown9 = new System.Windows.Forms.NumericUpDown(); this.nudMSaveCnt = new System.Windows.Forms.NumericUpDown(); @@ -49,7 +53,7 @@ namespace FCOMMON this.nudMsavetime = new System.Windows.Forms.NumericUpDown(); this.label13 = new System.Windows.Forms.Label(); this.label9 = new System.Windows.Forms.Label(); - this.numericUpDown4 = new System.Windows.Forms.NumericUpDown(); + this.nudSFIMFG = new System.Windows.Forms.NumericUpDown(); this.numericUpDown5 = new System.Windows.Forms.NumericUpDown(); this.numericUpDown6 = new System.Windows.Forms.NumericUpDown(); this.label5 = new System.Windows.Forms.Label(); @@ -57,18 +61,24 @@ namespace FCOMMON this.label7 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label(); this.button1 = new System.Windows.Forms.Button(); + this.label14 = new System.Windows.Forms.Label(); + this.nudCnt = new System.Windows.Forms.NumericUpDown(); + this.label17 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).BeginInit(); + ((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.numericUpDown10)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudShiftCnt)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMSaveCnt)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMsavetime)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudSFIMFG)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudCnt)).BeginInit(); this.SuspendLayout(); // // radO @@ -91,9 +101,9 @@ namespace FCOMMON this.radM.Location = new System.Drawing.Point(21, 200); this.radM.Margin = new System.Windows.Forms.Padding(6, 10, 6, 10); this.radM.Name = "radM"; - this.radM.Size = new System.Drawing.Size(155, 41); + this.radM.Size = new System.Drawing.Size(258, 41); this.radM.TabIndex = 0; - this.radM.Text = "MFG 인원"; + this.radM.Text = "MFG 인원(단위:분)"; this.radM.UseVisualStyleBackColor = true; this.radM.CheckedChanged += new System.EventHandler(this.radioButton1_CheckedChanged); // @@ -101,6 +111,8 @@ namespace FCOMMON // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); this.panel1.Controls.Add(this.numericUpDown3); + this.panel1.Controls.Add(this.label16); + this.panel1.Controls.Add(this.nudSFIOffice); this.panel1.Controls.Add(this.numericUpDown2); this.panel1.Controls.Add(this.nudOsavetime); this.panel1.Controls.Add(this.label3); @@ -114,20 +126,45 @@ namespace FCOMMON // // numericUpDown3 // - this.numericUpDown3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.numericUpDown3.DecimalPlaces = 2; - this.numericUpDown3.Location = new System.Drawing.Point(233, 58); + this.numericUpDown3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.numericUpDown3.Location = new System.Drawing.Point(515, 57); this.numericUpDown3.Maximum = new decimal(new int[] { 999999999, 0, 0, 0}); this.numericUpDown3.Name = "numericUpDown3"; - this.numericUpDown3.Size = new System.Drawing.Size(161, 43); - this.numericUpDown3.TabIndex = 5; - this.numericUpDown3.Tag = "o"; + this.numericUpDown3.Size = new System.Drawing.Size(147, 43); + this.numericUpDown3.TabIndex = 18; + this.numericUpDown3.Tag = ""; this.numericUpDown3.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // label16 + // + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(400, 60); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(109, 37); + this.label16.TabIndex = 17; + this.label16.Text = "Indirect"; + // + // nudSFIOffice + // + this.nudSFIOffice.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.nudSFIOffice.DecimalPlaces = 2; + this.nudSFIOffice.Location = new System.Drawing.Point(233, 58); + this.nudSFIOffice.Maximum = new decimal(new int[] { + 999999999, + 0, + 0, + 0}); + this.nudSFIOffice.Name = "nudSFIOffice"; + this.nudSFIOffice.Size = new System.Drawing.Size(161, 43); + this.nudSFIOffice.TabIndex = 5; + this.nudSFIOffice.Tag = "o"; + this.nudSFIOffice.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudSFIOffice.ValueChanged += new System.EventHandler(this.nudSIFOffice_ValueChanged); + // // numericUpDown2 // this.numericUpDown2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); @@ -209,8 +246,11 @@ namespace FCOMMON // panel2 // this.panel2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.panel2.Controls.Add(this.label17); + this.panel2.Controls.Add(this.numericUpDown1); + this.panel2.Controls.Add(this.label15); this.panel2.Controls.Add(this.label12); - this.panel2.Controls.Add(this.numericUpDown10); + this.panel2.Controls.Add(this.nudShiftCnt); this.panel2.Controls.Add(this.label11); this.panel2.Controls.Add(this.numericUpDown9); this.panel2.Controls.Add(this.nudMSaveCnt); @@ -218,7 +258,7 @@ namespace FCOMMON this.panel2.Controls.Add(this.nudMsavetime); this.panel2.Controls.Add(this.label13); this.panel2.Controls.Add(this.label9); - this.panel2.Controls.Add(this.numericUpDown4); + this.panel2.Controls.Add(this.nudSFIMFG); this.panel2.Controls.Add(this.numericUpDown5); this.panel2.Controls.Add(this.numericUpDown6); this.panel2.Controls.Add(this.label5); @@ -231,39 +271,64 @@ namespace FCOMMON this.panel2.Size = new System.Drawing.Size(720, 223); this.panel2.TabIndex = 2; // + // numericUpDown1 + // + this.numericUpDown1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.numericUpDown1.Location = new System.Drawing.Point(515, 169); + this.numericUpDown1.Maximum = new decimal(new int[] { + 999999999, + 0, + 0, + 0}); + this.numericUpDown1.Name = "numericUpDown1"; + this.numericUpDown1.Size = new System.Drawing.Size(147, 43); + this.numericUpDown1.TabIndex = 16; + this.numericUpDown1.Tag = ""; + this.numericUpDown1.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label15 + // + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(400, 172); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(109, 37); + this.label15.TabIndex = 15; + this.label15.Text = "Indirect"; + // // label12 // this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(597, 67); + this.label12.Location = new System.Drawing.Point(588, 67); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(73, 37); this.label12.TabIndex = 14; this.label12.Text = "Shift"; // - // numericUpDown10 + // nudShiftCnt // - this.numericUpDown10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.numericUpDown10.Location = new System.Drawing.Point(529, 64); - this.numericUpDown10.Maximum = new decimal(new int[] { + this.nudShiftCnt.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.nudShiftCnt.Location = new System.Drawing.Point(520, 64); + this.nudShiftCnt.Maximum = new decimal(new int[] { 999999999, 0, 0, 0}); - this.numericUpDown10.Name = "numericUpDown10"; - this.numericUpDown10.Size = new System.Drawing.Size(62, 43); - this.numericUpDown10.TabIndex = 13; - this.numericUpDown10.Tag = "m"; - this.numericUpDown10.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - this.numericUpDown10.Value = new decimal(new int[] { + this.nudShiftCnt.Name = "nudShiftCnt"; + this.nudShiftCnt.Size = new System.Drawing.Size(62, 43); + this.nudShiftCnt.TabIndex = 13; + this.nudShiftCnt.Tag = "m"; + this.nudShiftCnt.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudShiftCnt.Value = new decimal(new int[] { 4, 0, 0, 0}); + this.nudShiftCnt.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged); // // label11 // this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(496, 67); + this.label11.Location = new System.Drawing.Point(487, 67); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(30, 37); this.label11.TabIndex = 12; @@ -274,7 +339,7 @@ namespace FCOMMON this.numericUpDown9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); this.numericUpDown9.DecimalPlaces = 2; this.numericUpDown9.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.numericUpDown9.Location = new System.Drawing.Point(317, 64); + this.numericUpDown9.Location = new System.Drawing.Point(264, 65); this.numericUpDown9.Maximum = new decimal(new int[] { 999999999, 0, @@ -336,9 +401,9 @@ namespace FCOMMON this.label13.AutoSize = true; this.label13.Location = new System.Drawing.Point(8, 67); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(313, 37); + this.label13.Size = new System.Drawing.Size(250, 37); this.label13.TabIndex = 6; - this.label13.Text = "1 Shift 당 개선절감 횟수"; + this.label13.Text = "1 Shift 당 개선절감"; // // label9 // @@ -349,21 +414,22 @@ namespace FCOMMON this.label9.TabIndex = 6; this.label9.Text = "1회 당 절감시간"; // - // numericUpDown4 + // nudSFIMFG // - this.numericUpDown4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.numericUpDown4.DecimalPlaces = 2; - this.numericUpDown4.Location = new System.Drawing.Point(233, 169); - this.numericUpDown4.Maximum = new decimal(new int[] { + this.nudSFIMFG.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); + this.nudSFIMFG.DecimalPlaces = 2; + this.nudSFIMFG.Location = new System.Drawing.Point(233, 169); + this.nudSFIMFG.Maximum = new decimal(new int[] { 999999999, 0, 0, 0}); - this.numericUpDown4.Name = "numericUpDown4"; - this.numericUpDown4.Size = new System.Drawing.Size(429, 43); - this.numericUpDown4.TabIndex = 5; - this.numericUpDown4.Tag = "m"; - this.numericUpDown4.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudSFIMFG.Name = "nudSFIMFG"; + this.nudSFIMFG.Size = new System.Drawing.Size(161, 43); + this.nudSFIMFG.TabIndex = 5; + this.nudSFIMFG.Tag = "m"; + this.nudSFIMFG.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudSFIMFG.ValueChanged += new System.EventHandler(this.numericUpDown4_ValueChanged); // // numericUpDown5 // @@ -444,7 +510,7 @@ namespace FCOMMON // // button1 // - this.button1.Location = new System.Drawing.Point(43, 487); + this.button1.Location = new System.Drawing.Point(43, 483); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(720, 55); this.button1.TabIndex = 3; @@ -452,11 +518,52 @@ namespace FCOMMON this.button1.UseVisualStyleBackColor = true; this.button1.Click += new System.EventHandler(this.button1_Click); // + // label14 + // + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(510, 20); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(125, 37); + this.label14.TabIndex = 8; + this.label14.Text = "적용대수"; + // + // nudCnt + // + this.nudCnt.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.nudCnt.Location = new System.Drawing.Point(641, 16); + this.nudCnt.Maximum = new decimal(new int[] { + 999999999, + 0, + 0, + 0}); + this.nudCnt.Name = "nudCnt"; + this.nudCnt.Size = new System.Drawing.Size(121, 43); + this.nudCnt.TabIndex = 6; + this.nudCnt.Tag = ""; + this.nudCnt.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.nudCnt.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.nudCnt.ValueChanged += new System.EventHandler(this.numericUpDown1_ValueChanged); + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(435, 70); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(44, 37); + this.label17.TabIndex = 17; + this.label17.Text = "분"; + // // fSFI // this.AutoScaleDimensions = new System.Drawing.SizeF(15F, 37F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(774, 553); + this.ClientSize = new System.Drawing.Size(774, 545); + this.Controls.Add(this.nudCnt); + this.Controls.Add(this.label14); this.Controls.Add(this.button1); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); @@ -467,20 +574,24 @@ namespace FCOMMON this.Name = "fSFI"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "fSFI"; + this.Load += new System.EventHandler(this.fSFI_Load); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown3)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudSFIOffice)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudOsavetime)).EndInit(); this.panel2.ResumeLayout(false); this.panel2.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown10)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numericUpDown1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudShiftCnt)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown9)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMSaveCnt)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.nudMsavetime)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.numericUpDown4)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudSFIMFG)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.numericUpDown6)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.nudCnt)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -493,9 +604,9 @@ namespace FCOMMON private System.Windows.Forms.NumericUpDown numericUpDown2; private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label4; - private System.Windows.Forms.NumericUpDown numericUpDown3; + private System.Windows.Forms.NumericUpDown nudSFIOffice; private System.Windows.Forms.Panel panel2; - private System.Windows.Forms.NumericUpDown numericUpDown4; + private System.Windows.Forms.NumericUpDown nudSFIMFG; private System.Windows.Forms.NumericUpDown numericUpDown5; private System.Windows.Forms.NumericUpDown numericUpDown6; private System.Windows.Forms.Label label5; @@ -505,7 +616,7 @@ namespace FCOMMON private System.Windows.Forms.Label label10; private System.Windows.Forms.Label label9; private System.Windows.Forms.NumericUpDown numericUpDown9; - private System.Windows.Forms.NumericUpDown numericUpDown10; + private System.Windows.Forms.NumericUpDown nudShiftCnt; private System.Windows.Forms.Label label11; private System.Windows.Forms.Label label12; private System.Windows.Forms.Label label13; @@ -515,5 +626,12 @@ namespace FCOMMON public System.Windows.Forms.NumericUpDown nudOsavetime; public System.Windows.Forms.NumericUpDown nudMSaveCnt; public System.Windows.Forms.NumericUpDown nudMsavetime; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.NumericUpDown nudCnt; + private System.Windows.Forms.NumericUpDown numericUpDown1; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.NumericUpDown numericUpDown3; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.Label label17; } } \ No newline at end of file diff --git a/SubProject/FCOMMON/fSFI.cs b/SubProject/FCOMMON/fSFI.cs index 9478278..2f0957b 100644 --- a/SubProject/FCOMMON/fSFI.cs +++ b/SubProject/FCOMMON/fSFI.cs @@ -4,6 +4,7 @@ using System.ComponentModel; using System.Data; using System.Drawing; using System.Linq; +using System.Runtime.CompilerServices; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; @@ -12,7 +13,7 @@ namespace FCOMMON { public partial class fSFI : Form { - public fSFI(string sfi_type, float time, float cnt) + public fSFI(string sfi_type, float time, float cnt, double shiftcount, int itemcnt) { InitializeComponent(); if (sfi_type == "M") @@ -23,10 +24,12 @@ namespace FCOMMON else { radO.Checked = true; - nudOsavetime.Value= (decimal)time; + nudOsavetime.Value = (decimal)time; } nudMSaveCnt.Value = (decimal)cnt; - + nudShiftCnt.Value = (decimal)shiftcount; + this.nudCnt.Value = (decimal)itemcnt; + } private void label1_Click(object sender, EventArgs e) @@ -46,7 +49,7 @@ namespace FCOMMON var nud = sender as NumericUpDown; if (nud.Tag.ToString().ToLower() == "o") { - updateOFF(); + UpdateOffice(); } else { @@ -58,36 +61,60 @@ namespace FCOMMON var nud = sender as NumericUpDown; //mfg의 총 절감 시간이 변경되었다 var 총절감시간 = (double)nud.Value; - var sfi = 총절감시간 / (int)numericUpDown5.Value; - numericUpDown4.Value = (Decimal)sfi; + var sfi = 총절감시간 / (float)numericUpDown5.Value; + nudSFIMFG.Value = (Decimal)sfi; } public double Value { get; set; } = 0; void updateMFG() { var 절감시간 = (double)nudMsavetime.Value; - var SHIFT수 = (int)nudMSaveCnt.Value; + var SHIFT수 = (float)nudMSaveCnt.Value; var shift총수 = (double)(절감시간 * SHIFT수); - numericUpDown9.Value = (decimal)shift총수; //1쉬프트 개선절감횟수 - var 쉬프트수 = (int)numericUpDown10.Value; - numericUpDown6.Value = (decimal)(shift총수 * 쉬프트수); + + if (numericUpDown9.Value != (decimal)shift총수) + numericUpDown9.Value = (decimal)shift총수; //1쉬프트 개선절감횟수 + + var 쉬프트수 = (int)nudShiftCnt.Value; + var 장비수 = (int)nudCnt.Value; + numericUpDown6.Value = (decimal)(shift총수 * 쉬프트수 * 장비수); } - void updateOFF() + void UpdateOffice() { var savetime = (double)nudOsavetime.Value; var min = (int)numericUpDown2.Value; var sfi = savetime / min; - numericUpDown3.Value = (decimal)sfi; + var cnt = (int)nudCnt.Value; + nudSFIOffice.Value = (decimal)(sfi * cnt); } private void button1_Click(object sender, EventArgs e) { this.Invalidate(); if (radO.Checked) - this.Value = (double)numericUpDown3.Value; + this.Value = (double)nudSFIOffice.Value; else - this.Value = (double)numericUpDown4.Value; + this.Value = (double)nudSFIMFG.Value; DialogResult = DialogResult.OK; } + + private void fSFI_Load(object sender, EventArgs e) + { + nudMSaveCnt.DecimalPlaces = 1; + } + + private void nudSIFOffice_ValueChanged(object sender, EventArgs e) + { + //offcie update + var sfi = (double)nudSFIOffice.Value; + numericUpDown3.Value = (decimal)(sfi * 1.25); + } + + private void numericUpDown4_ValueChanged(object sender, EventArgs e) + { + //mfg update + var sfi = (double)nudSFIMFG.Value; + numericUpDown1.Value = (decimal)(sfi * 1.25); + } } } diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index d0acc99..5073dd1 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -223,10 +223,10 @@ rPurchaseEB.cs - + Form - + fPurchaseNR_Ipgo.cs @@ -235,22 +235,22 @@ fPurchaseCR_Ipgo.cs - + Form - + fPurchaseNRList.cs - + Form - + fInputSC.cs - + Form - + fMailForm.cs @@ -259,46 +259,46 @@ fPurchaseCR_Add.cs - + Form - + fPurchase_excelimport.cs - + Form - + fPurchase_AddS.cs - + Form - + fPurchase_Add.cs - + Form - + fPurchase_Data.cs - + Form - + fPurchase_ImportO.cs - + Form - + fPurchase_Import.cs - + Form - + fPurchaseNR.cs @@ -307,24 +307,30 @@ rPurchaseCR.cs - + Form - + fSIDCheckNR.cs - + Form - + fSIDListSelect.cs - + Form - + rPurchaseNR.cs + + Form + + + fBatchUpdate.cs + EQFilterApply.cs @@ -377,60 +383,63 @@ rPurchaseEB.cs - + fPurchaseNR_Ipgo.cs fPurchaseCR_Ipgo.cs - + fPurchaseNRList.cs - + fInputSC.cs - + fMailForm.cs fPurchaseCR_Add.cs - + fPurchase_excelimport.cs - + fPurchase_AddS.cs - + fPurchase_Add.cs - + fPurchase_Data.cs - + fPurchase_ImportO.cs - + fPurchase_Import.cs - + fPurchaseNR.cs - + fSIDCheckNR.cs - + fSIDListSelect.cs - - - + + + rPurchaseCR.cs - + rPurchaseNR.cs + + fBatchUpdate.cs + MSLinqToSQLGenerator diff --git a/SubProject/FEQ0000/Purchase/fBatchUpdate.Designer.cs b/SubProject/FEQ0000/Purchase/fBatchUpdate.Designer.cs new file mode 100644 index 0000000..189c064 --- /dev/null +++ b/SubProject/FEQ0000/Purchase/fBatchUpdate.Designer.cs @@ -0,0 +1,112 @@ +namespace FEQ0000.Purchase +{ + partial class fBatchUpdate + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.button1 = new System.Windows.Forms.Button(); + this.cmbState = new System.Windows.Forms.ComboBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Dock = System.Windows.Forms.DockStyle.Left; + this.label1.Location = new System.Drawing.Point(0, 0); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(71, 37); + this.label1.TabIndex = 0; + this.label1.Text = "상태"; + // + // button1 + // + this.button1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.button1.Location = new System.Drawing.Point(10, 60); + this.button1.Margin = new System.Windows.Forms.Padding(6, 10, 6, 10); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(365, 50); + this.button1.TabIndex = 2; + this.button1.Text = "일괄 변경"; + this.button1.UseVisualStyleBackColor = true; + this.button1.Click += new System.EventHandler(this.button1_Click); + // + // cmbState + // + this.cmbState.Dock = System.Windows.Forms.DockStyle.Fill; + this.cmbState.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbState.FormattingEnabled = true; + this.cmbState.Location = new System.Drawing.Point(71, 0); + this.cmbState.Name = "cmbState"; + this.cmbState.Size = new System.Drawing.Size(294, 45); + this.cmbState.TabIndex = 4; + // + // panel1 + // + this.panel1.Controls.Add(this.cmbState); + this.panel1.Controls.Add(this.label1); + this.panel1.Dock = System.Windows.Forms.DockStyle.Top; + this.panel1.Location = new System.Drawing.Point(10, 10); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(365, 46); + this.panel1.TabIndex = 5; + // + // fBatchUpdate + // + this.AutoScaleDimensions = new System.Drawing.SizeF(15F, 37F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(385, 120); + this.Controls.Add(this.panel1); + this.Controls.Add(this.button1); + this.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.KeyPreview = true; + this.Margin = new System.Windows.Forms.Padding(6, 10, 6, 10); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fBatchUpdate"; + this.Padding = new System.Windows.Forms.Padding(10); + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "fInputSC"; + this.Load += new System.EventHandler(this.fBatchUpdate_Load); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Panel panel1; + public System.Windows.Forms.ComboBox cmbState; + } +} \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fBatchUpdate.cs b/SubProject/FEQ0000/Purchase/fBatchUpdate.cs new file mode 100644 index 0000000..7b0e2cb --- /dev/null +++ b/SubProject/FEQ0000/Purchase/fBatchUpdate.cs @@ -0,0 +1,45 @@ +using FCOMMON; +using NetOffice.OutlookApi; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace FEQ0000.Purchase +{ + public partial class fBatchUpdate : Form + { + public fBatchUpdate(List _rows) + { + InitializeComponent(); + Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; + Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; + this.Text = $"일괄변경 : {_rows.Count} 건"; + this.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.Escape) this.Close(); }; + } + + private void fBatchUpdate_Load(object sender, EventArgs e) + { + var code_state = DBM.getCodeTable("04"); + cmbState.DataSource = code_state; + cmbState.DisplayMember = "Value"; + cmbState.ValueMember = "Value"; + cmbState.SelectedIndex = -1; + } + + private void button1_Click(object sender, EventArgs e) + { + if(cmbState.SelectedIndex <0) + { + FCOMMON.Util.MsgE("값을 선택하지 않았습니다"); + return; + } + DialogResult = DialogResult.OK; + } + } +} diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Data.resx b/SubProject/FEQ0000/Purchase/fBatchUpdate.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_Data.resx rename to SubProject/FEQ0000/Purchase/fBatchUpdate.resx diff --git a/SubProject/FEQ0000/Purchase/Rpt_Purchase.rdlc b/SubProject/FEQ0000/PurchaseNR/Rpt_Purchase.rdlc similarity index 100% rename from SubProject/FEQ0000/Purchase/Rpt_Purchase.rdlc rename to SubProject/FEQ0000/PurchaseNR/Rpt_Purchase.rdlc diff --git a/SubProject/FEQ0000/Purchase/Rpt_PurchasePrc.rdlc b/SubProject/FEQ0000/PurchaseNR/Rpt_PurchasePrc.rdlc similarity index 100% rename from SubProject/FEQ0000/Purchase/Rpt_PurchasePrc.rdlc rename to SubProject/FEQ0000/PurchaseNR/Rpt_PurchasePrc.rdlc diff --git a/SubProject/FEQ0000/Purchase/Rpt_PurchasePrj.rdlc b/SubProject/FEQ0000/PurchaseNR/Rpt_PurchasePrj.rdlc similarity index 100% rename from SubProject/FEQ0000/Purchase/Rpt_PurchasePrj.rdlc rename to SubProject/FEQ0000/PurchaseNR/Rpt_PurchasePrj.rdlc diff --git a/SubProject/FEQ0000/Purchase/fInputSC.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fInputSC.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fInputSC.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fInputSC.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fInputSC.cs b/SubProject/FEQ0000/PurchaseNR/fInputSC.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fInputSC.cs rename to SubProject/FEQ0000/PurchaseNR/fInputSC.cs diff --git a/SubProject/FEQ0000/Purchase/fInputSC.resx b/SubProject/FEQ0000/PurchaseNR/fInputSC.resx similarity index 97% rename from SubProject/FEQ0000/Purchase/fInputSC.resx rename to SubProject/FEQ0000/PurchaseNR/fInputSC.resx index 1af7de1..29dcb1b 100644 --- a/SubProject/FEQ0000/Purchase/fInputSC.resx +++ b/SubProject/FEQ0000/PurchaseNR/fInputSC.resx @@ -1,120 +1,120 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fMailForm.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fMailForm.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fMailForm.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fMailForm.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fMailForm.cs b/SubProject/FEQ0000/PurchaseNR/fMailForm.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fMailForm.cs rename to SubProject/FEQ0000/PurchaseNR/fMailForm.cs diff --git a/SubProject/FEQ0000/Purchase/fMailForm.resx b/SubProject/FEQ0000/PurchaseNR/fMailForm.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/fMailForm.resx rename to SubProject/FEQ0000/PurchaseNR/fMailForm.resx diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs similarity index 91% rename from SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs index 4590a34..5d7eab8 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.Designer.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.Designer.cs @@ -30,42 +30,42 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchaseNR)); - 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.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = 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.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - 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.CheckBoxCellType checkBoxCellType3 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType7 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType8 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType49 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType50 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType51 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType52 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType53 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType54 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType55 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType56 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType60 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType61 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType62 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType63 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType64 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType65 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType25 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType66 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType26 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType67 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType68 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType69 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType27 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType70 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType71 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType72 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType9 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -104,7 +104,6 @@ this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -148,6 +147,7 @@ this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); + this.상태일괄변경ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -422,14 +422,14 @@ // 집계표ToolStripMenuItem // this.집계표ToolStripMenuItem.Name = "집계표ToolStripMenuItem"; - this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.집계표ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.집계표ToolStripMenuItem.Text = "집계표"; this.집계표ToolStripMenuItem.Click += new System.EventHandler(this.집계표ToolStripMenuItem_Click); // // 구매승인양식ToolStripMenuItem // this.구매승인양식ToolStripMenuItem.Name = "구매승인양식ToolStripMenuItem"; - this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(150, 22); + this.구매승인양식ToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.구매승인양식ToolStripMenuItem.Text = "구매승인 양식"; this.구매승인양식ToolStripMenuItem.Click += new System.EventHandler(this.구매승인양식ToolStripMenuItem_Click); // @@ -486,6 +486,7 @@ this.toolStripMenuItem3, this.exportDataToolStripMenuItem, this.toolStripMenuItem4, + this.상태일괄변경ToolStripMenuItem, this.입고ToolStripMenuItem, this.추가ToolStripMenuItem, this.makeRepeatToolStripMenuItem, @@ -495,49 +496,41 @@ this.sC검색ToolStripMenuItem, this.cRCF검색ToolStripMenuItem}); this.cm1.Name = "contextMenuStrip1"; - this.cm1.Size = new System.Drawing.Size(314, 400); + this.cm1.Size = new System.Drawing.Size(314, 464); + this.cm1.Opening += new System.ComponentModel.CancelEventHandler(this.cm1_Opening); // // columnSizeToolStripMenuItem // this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.autoToolStripMenuItem, this.resetToolStripMenuItem, this.saveToolStripMenuItem, this.loadToolStripMenuItem}); this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(313, 42); - this.columnSizeToolStripMenuItem.Text = "Column Size"; - // - // autoToolStripMenuItem - // - this.autoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("autoToolStripMenuItem.Image"))); - this.autoToolStripMenuItem.Name = "autoToolStripMenuItem"; - this.autoToolStripMenuItem.Size = new System.Drawing.Size(159, 42); - this.autoToolStripMenuItem.Text = "Auto"; - this.autoToolStripMenuItem.Click += new System.EventHandler(this.autoToolStripMenuItem_Click); + this.columnSizeToolStripMenuItem.Text = "열 너비 조정"; // // resetToolStripMenuItem // this.resetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resetToolStripMenuItem.Image"))); this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(159, 42); - this.resetToolStripMenuItem.Text = "Reset"; + this.resetToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.resetToolStripMenuItem.Text = "초기화"; this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); // // saveToolStripMenuItem // this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(159, 42); - this.saveToolStripMenuItem.Text = "Save"; + this.saveToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.saveToolStripMenuItem.Text = "저장"; this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // loadToolStripMenuItem // this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(159, 42); - this.loadToolStripMenuItem.Text = "Load"; + this.loadToolStripMenuItem.Size = new System.Drawing.Size(202, 42); + this.loadToolStripMenuItem.Text = "불러오기"; this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); // // toolStripMenuItem3 @@ -877,6 +870,13 @@ this.label2.Text = "--"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // 상태일괄변경ToolStripMenuItem + // + this.상태일괄변경ToolStripMenuItem.Name = "상태일괄변경ToolStripMenuItem"; + this.상태일괄변경ToolStripMenuItem.Size = new System.Drawing.Size(313, 42); + this.상태일괄변경ToolStripMenuItem.Text = "상태 일괄 변경"; + this.상태일괄변경ToolStripMenuItem.Click += new System.EventHandler(this.상태일괄변경ToolStripMenuItem_Click); + // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -926,17 +926,17 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 36).Value = "구매담당"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 37).Value = "삭제됨"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType1; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = checkBoxCellType7; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "chk1"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "요청\r\n검사"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 31F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType2; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = checkBoxCellType8; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "chk2"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "구매\r\n검사"; this.fpSpread1_Sheet1.Columns.Get(1).Width = 35F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType1; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType49; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "구매신청일"; @@ -945,7 +945,7 @@ this.fpSpread1_Sheet1.Columns.Get(2).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(3).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType2; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType50; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Label = "상태"; @@ -953,39 +953,39 @@ this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(3).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType51; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "place"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "보관소"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType52; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "공정"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType53; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "requestName"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "요청"; this.fpSpread1_Sheet1.Columns.Get(6).Tag = "requestName"; this.fpSpread1_Sheet1.Columns.Get(6).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType54; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "costcenter"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "Cost Center"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType55; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "linecode"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(8).Label = "LineCode"; this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType56; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "SC#"; @@ -993,7 +993,7 @@ this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType57; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "SCR/CF"; @@ -1001,202 +1001,202 @@ this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Visible = false; this.fpSpread1_Sheet1.Columns.Get(10).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType58; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(11).Label = "수령"; this.fpSpread1_Sheet1.Columns.Get(11).Tag = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(11).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType59; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(12).Tag = "sid"; this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(12).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType12; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType60; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(13).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(13).Tag = "pumname"; this.fpSpread1_Sheet1.Columns.Get(13).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(14).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(14).CellType = numberCellType1; + numberCellType19.DecimalPlaces = 0; + numberCellType19.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType19.MaximumValue = 2147483647D; + numberCellType19.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType19; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType13; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType61; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(15).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(15).Tag = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType62; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "dept"; this.fpSpread1_Sheet1.Columns.Get(16).Label = "장비\r\n제조사"; this.fpSpread1_Sheet1.Columns.Get(16).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType62; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "manuproc"; this.fpSpread1_Sheet1.Columns.Get(17).Label = "제조\r\n공정"; this.fpSpread1_Sheet1.Columns.Get(17).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType14; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType62; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(18).Label = "장비\r\n모델"; this.fpSpread1_Sheet1.Columns.Get(18).Width = 51F; - numberCellType2.DecimalPlaces = 0; - numberCellType2.NegativeRed = true; - numberCellType2.NullDisplay = "--"; - numberCellType2.Separator = ","; - numberCellType2.ShowSeparator = true; - numberCellType2.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType2; + numberCellType20.DecimalPlaces = 0; + numberCellType20.NegativeRed = true; + numberCellType20.NullDisplay = "--"; + numberCellType20.Separator = ","; + numberCellType20.ShowSeparator = true; + numberCellType20.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType20; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "pumqtyReq"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).Label = "수량\r\n(요청)"; this.fpSpread1_Sheet1.Columns.Get(19).Tag = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 51F; - numberCellType3.DecimalPlaces = 0; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType3; + numberCellType21.DecimalPlaces = 0; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType21; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Label = "수량\r\n(구매)"; this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(20).Width = 55F; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType15; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = textCellType63; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(21).Width = 51F; - numberCellType4.DecimalPlaces = 2; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType4; + numberCellType22.DecimalPlaces = 2; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = numberCellType22; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "pumpriceD"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(22).Label = "단가\r\n(해외)"; this.fpSpread1_Sheet1.Columns.Get(22).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType64; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "currency"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Label = "통화"; this.fpSpread1_Sheet1.Columns.Get(23).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Width = 33F; - numberCellType5.DecimalPlaces = 0; - numberCellType5.MaximumValue = 9999999999999.99D; - numberCellType5.MinimumValue = -9999999999999.99D; - numberCellType5.NegativeRed = true; - numberCellType5.NullDisplay = "--"; - numberCellType5.Separator = ","; - numberCellType5.ShowSeparator = true; - numberCellType5.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = numberCellType5; + numberCellType23.DecimalPlaces = 0; + numberCellType23.MaximumValue = 9999999999999.99D; + numberCellType23.MinimumValue = -9999999999999.99D; + numberCellType23.NegativeRed = true; + numberCellType23.NullDisplay = "--"; + numberCellType23.Separator = ","; + numberCellType23.ShowSeparator = true; + numberCellType23.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = numberCellType23; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(24).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(24).Tag = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(24).Width = 51F; - numberCellType6.DecimalPlaces = 0; - numberCellType6.MaximumValue = 9999999999999.99D; - numberCellType6.MinimumValue = -9999999999999.99D; - numberCellType6.NegativeRed = true; - numberCellType6.NullDisplay = "--"; - numberCellType6.Separator = ","; - numberCellType6.ShowSeparator = true; - numberCellType6.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType6; + numberCellType24.DecimalPlaces = 0; + numberCellType24.MaximumValue = 9999999999999.99D; + numberCellType24.MinimumValue = -9999999999999.99D; + numberCellType24.NegativeRed = true; + numberCellType24.NullDisplay = "--"; + numberCellType24.Separator = ","; + numberCellType24.ShowSeparator = true; + numberCellType24.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = numberCellType24; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(25).Label = "합계금액"; this.fpSpread1_Sheet1.Columns.Get(25).Tag = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(25).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(26).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType17; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = textCellType65; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(26).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(26).Label = "공급업체"; this.fpSpread1_Sheet1.Columns.Get(26).Tag = "supply"; this.fpSpread1_Sheet1.Columns.Get(26).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(27).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType7; + numberCellType25.DecimalPlaces = 0; + numberCellType25.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType25.MaximumValue = 2147483647D; + numberCellType25.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(27).CellType = numberCellType25; this.fpSpread1_Sheet1.Columns.Get(27).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(27).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(27).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(27).Visible = false; this.fpSpread1_Sheet1.Columns.Get(27).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(28).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType18; + this.fpSpread1_Sheet1.Columns.Get(28).CellType = textCellType66; this.fpSpread1_Sheet1.Columns.Get(28).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(28).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(28).Label = "프로젝트"; this.fpSpread1_Sheet1.Columns.Get(28).Width = 51F; this.fpSpread1_Sheet1.Columns.Get(29).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType8.DecimalPlaces = 0; - numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType8.MaximumValue = 2147483647D; - numberCellType8.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(29).CellType = numberCellType8; + numberCellType26.DecimalPlaces = 0; + numberCellType26.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType26.MaximumValue = 2147483647D; + numberCellType26.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(29).CellType = numberCellType26; this.fpSpread1_Sheet1.Columns.Get(29).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(29).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(29).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(29).Tag = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(29).Visible = false; this.fpSpread1_Sheet1.Columns.Get(29).Width = 51F; - textCellType19.WordWrap = true; - this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType19; + textCellType67.WordWrap = true; + this.fpSpread1_Sheet1.Columns.Get(30).CellType = textCellType67; this.fpSpread1_Sheet1.Columns.Get(30).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(30).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(30).Label = "비고(구매사유)\r\n(요청자)"; this.fpSpread1_Sheet1.Columns.Get(30).Tag = "bigo"; this.fpSpread1_Sheet1.Columns.Get(30).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(30).Width = 96F; - this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(31).CellType = textCellType68; this.fpSpread1_Sheet1.Columns.Get(31).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(31).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(31).Label = "입고예정"; this.fpSpread1_Sheet1.Columns.Get(31).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(32).CellType = textCellType69; this.fpSpread1_Sheet1.Columns.Get(32).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(32).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(32).Label = "입고일"; this.fpSpread1_Sheet1.Columns.Get(32).Tag = "indate"; this.fpSpread1_Sheet1.Columns.Get(32).Width = 51F; - numberCellType9.DecimalPlaces = 0; - numberCellType9.NegativeRed = true; - numberCellType9.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(33).CellType = numberCellType9; + numberCellType27.DecimalPlaces = 0; + numberCellType27.NegativeRed = true; + numberCellType27.ShowSeparator = true; + this.fpSpread1_Sheet1.Columns.Get(33).CellType = numberCellType27; this.fpSpread1_Sheet1.Columns.Get(33).DataField = "inqty"; this.fpSpread1_Sheet1.Columns.Get(33).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(33).Label = "입고수량"; this.fpSpread1_Sheet1.Columns.Get(33).Tag = "inqty"; this.fpSpread1_Sheet1.Columns.Get(33).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(33).Width = 51F; - this.fpSpread1_Sheet1.Columns.Get(34).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(34).CellType = textCellType70; this.fpSpread1_Sheet1.Columns.Get(34).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(34).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(34).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(34).Tag = "po"; this.fpSpread1_Sheet1.Columns.Get(34).Width = 51F; - textCellType23.WordWrap = true; - this.fpSpread1_Sheet1.Columns.Get(35).CellType = textCellType23; + textCellType71.WordWrap = true; + this.fpSpread1_Sheet1.Columns.Get(35).CellType = textCellType71; this.fpSpread1_Sheet1.Columns.Get(35).DataField = "chkremark"; this.fpSpread1_Sheet1.Columns.Get(35).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(35).Label = "비고\r\n(담당자)"; this.fpSpread1_Sheet1.Columns.Get(35).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(36).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(36).CellType = textCellType72; this.fpSpread1_Sheet1.Columns.Get(36).DataField = "purchase_manager"; this.fpSpread1_Sheet1.Columns.Get(36).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(36).Label = "구매담당"; this.fpSpread1_Sheet1.Columns.Get(36).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType3; + this.fpSpread1_Sheet1.Columns.Get(37).CellType = checkBoxCellType9; this.fpSpread1_Sheet1.Columns.Get(37).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(37).Label = "삭제됨"; this.fpSpread1_Sheet1.Columns.Get(37).Tag = "isdel"; @@ -1205,6 +1205,9 @@ this.fpSpread1_Sheet1.DataAutoSizeColumns = false; this.fpSpread1_Sheet1.DataSource = this.bs; this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; + this.fpSpread1_Sheet1.SelectionPolicy = FarPoint.Win.Spread.Model.SelectionPolicy.MultiRange; + this.fpSpread1_Sheet1.ShowEditingRowSelector = true; + this.fpSpread1_Sheet1.ShowRowSelector = true; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // // fPurchaseNR @@ -1275,7 +1278,6 @@ private System.Windows.Forms.ToolStripButton btFind; private FarPoint.Win.Spread.FpSpread fpSpread1; private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem autoToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem resetToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; @@ -1320,6 +1322,7 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel6; private System.Windows.Forms.ToolStripComboBox cmbManager; private System.Windows.Forms.ToolStripMenuItem 엑셀에서열기ToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem 상태일괄변경ToolStripMenuItem; private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs similarity index 94% rename from SubProject/FEQ0000/Purchase/fPurchaseNR.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs index 96e865c..60d8c3b 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.cs @@ -14,6 +14,7 @@ using NetOffice.OutlookApi.Enums; using FEQ0000.Purchase; using FCOMMON; using NetOffice.OfficeApi; +using System.Web.Services.Protocols; namespace FEQ0000 { @@ -148,6 +149,7 @@ namespace FEQ0000 //일반사용자의경우에는 상태를 변경하지 못한다. int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase)); + IsAdmin = curLevel >= 5; if (curLevel >= 5) { btSave.Visible = true; @@ -188,6 +190,7 @@ namespace FEQ0000 } } + bool IsAdmin = false; private void refreshData() { @@ -1123,7 +1126,7 @@ namespace FEQ0000 private void 엑셀에서가져오기ToolStripMenuItem_Click(object sender, EventArgs e) { - var f = new fPurchase_excelimport( fPurchase_excelimport.eImporttype.NR); + var f = new fPurchase_excelimport(fPurchase_excelimport.eImporttype.NR); f.Show(); } @@ -1419,5 +1422,49 @@ namespace FEQ0000 FCOMMON.Util.RunExplorer(fi.FullName); } + + private void 상태일괄변경ToolStripMenuItem_Click(object sender, EventArgs e) + { + + var selected = this.fpSpread1_Sheet1.GetSelections(); //선택된 개체확인 + List rows = new List(); + foreach (var item in selected) + { + for(int i = item.Row; i < item.Row + item.RowCount;i++) + { + if(rows.Contains(i)==false) + { + if(fpSpread1_Sheet1.IsRowBound(i)) + { + rows.Add(i); + } + + } + + } + } + + //이대상의 실제 데이터베이스 인덱스값을 생성해서 폼에 전송한다. + var codlist = DBM.getCodeList("04"); + + var f = new FEQ0000.Purchase.fBatchUpdate(rows); + if (f.ShowDialog() != DialogResult.OK) return; + + var colstat = fpSpread1_Sheet1.Columns["state"]; + var value = f.cmbState.Text; + + foreach(var rowindex in rows) + { + fpSpread1_Sheet1.SetValue(rowindex, colstat.Index, value); + } + + FCOMMON.Util.MsgI($"{rows.Count} 건의 자료가 변경되었습니다\n저장 버튼을 누르면 적용 됩니다\n취소하려면 새로고침을 누르세요"); + } + + private void cm1_Opening(object sender, CancelEventArgs e) + { + 상태일괄변경ToolStripMenuItem.Enabled = IsAdmin; + + } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR.resx b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.resx similarity index 96% rename from SubProject/FEQ0000/Purchase/fPurchaseNR.resx rename to SubProject/FEQ0000/PurchaseNR/fPurchaseNR.resx index af2b5c2..d5a6e65 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR.resx +++ b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR.resx @@ -279,6 +279,35 @@ pPXwne/C6mdp8McSRFzeZapS+wjkJRfymh5gT64ekcwWTlD+lz9zOBxaIMAzsgE+rQreDgWeJiTBEx1L fJLTRwnaZpAqNGFnisLBYJ7+IqS9SSApOf15fKLDx82HW1QOL7EXnohoYlemmopJazfvSJFLGSwyPLT+ brxxceG+j2Kl3h27zR5GDDxbI4jQ6H0RFvYPxczhJbhCpsgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX + EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl + 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR + BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT + Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz + tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV + iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i + DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA + AAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG + YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 + 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw + bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc + VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 + c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 + Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo + mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ + kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D + TgDQASA1MVpwzwAAAABJRU5ErkJggg== @@ -318,50 +347,11 @@ oQIAAAJCCriYcSOGDCgzBAiQYSTGDQM4AjBAEwGCCRRIftypoKcDBwcS5MQIYIBRBQ0aPCBAwIKDoR4A cFiZdKmFAgUOQAWwIKnSpgUkSOgA1UCCqmAlVKgAoWyCBQsSOLhwoAMECBfK2tw7oa9fqBYDL2yIMCAA Ow== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAG8SURBVDhPjZI5SwNRFIXzY+wsLGysAgqiop2NAXHBBQSX - EGNQEHsbFdMJWphCcCHggmgaUaIhLlHjJDHuqCjqjOKWxBk95l7mjQxRyYEPZh7vfO8Obyz/RVVVCPSl - 7CJKtdNBg6xFotjg3YLn9BXd/kss3Gomkb7VHHECbaLC6NEzCxyrZ/xMa4R10Jsp0TQN7rUmjATaWEAR - BdfqufHcG1JQNrljFtALlWPJJQTkcRbEHxNQUsCG/AnbzBY6g9cMCUongqAD9fqPgEISEsSUBNz7D5CT - Glp9UTj8V8zgSQrFnvXfBXfqId6+HlmwfPGEuUtASos6fHEuEiTJHZpHyFbHEv4UIbhSwxgPORFVVlAz - tY6I/A5JThjjU5HA7CKzUGA1C8aCDozu2nGjHsAT7jIKgmu7yyi/uvogFVX8CFiy0oibD4kF3tMeHjMV - iwOKAvgD2K+sxn1bD0OCvcLyzNuwT+cbsCB6iKcBNz4fFBw3t+Ou1cl89Q9j21piFlDENAQJXhZ96R9i - DqlwBGctHVwkSOLLycsUiAjJZlU9kgeRtEAyxqeiKP8pEKENoiAwri/biJME+rIei+Ub4tJbaW7QZrcA - AAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG - YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9 - 0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw - bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc - VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9 - c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32 - Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo - mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+ - kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D - TgDQASA1MVpwzwAAAABJRU5ErkJggg== 504, 23 - - - R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ - 4TaCromrvC9ymyV+0Dd3mTl1koe72YvN7LTj+9ne6N3g6v7+/0Cw2Stoh////////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAInwA/CBzooaAHgQUHKvRQoUABCgUlHFT4IYMCBAsQIIBg - wcBEgh0WCBDAgcAFDAc+fvDQIUKHDgMeEHDQIIFKlgoMGgjQoAGDmwUOehhg4EACBhM+GlzKVOkEBgkO - GBggNOhCBhgCBPBYUEGHmwkCOCDwYMCAll8XHghwgQCHkQDSLjRgAcKDBwAAKNCwgaIHiR4oOKygkuDE - pRQTK6YYEAA7 - - R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNRList.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNRList.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchaseNRList.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchaseNRList.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNRList.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNRList.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchaseNRList.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchaseNRList.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNRList.resx b/SubProject/FEQ0000/PurchaseNR/fPurchaseNRList.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchaseNRList.resx rename to SubProject/FEQ0000/PurchaseNR/fPurchaseNRList.resx diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.cs b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx b/SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx rename to SubProject/FEQ0000/PurchaseNR/fPurchaseNR_Ipgo.resx diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs similarity index 95% rename from SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs index fc2c670..fc80d40 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.Designer.cs @@ -57,7 +57,7 @@ System.Windows.Forms.Label label15; System.Windows.Forms.Label label17; System.Windows.Forms.Label label9; - System.Windows.Forms.Label label18; + this.label18 = new System.Windows.Forms.Label(); this.tbSC = new System.Windows.Forms.TextBox(); this.tbSID = new System.Windows.Forms.TextBox(); this.tbPumName = new System.Windows.Forms.TextBox(); @@ -114,8 +114,8 @@ this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components); this.dsPurchase = new FEQ0000.dsPurchase(); - this.purchaseBindingSource = new System.Windows.Forms.BindingSource(this.components); - this.purchaseTableAdapter = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); processLabel = new System.Windows.Forms.Label(); receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); @@ -143,12 +143,11 @@ label15 = new System.Windows.Forms.Label(); label17 = new System.Windows.Forms.Label(); label9 = new System.Windows.Forms.Label(); - label18 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.purchaseBindingSource)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); this.SuspendLayout(); // // processLabel @@ -433,13 +432,12 @@ // // label18 // - label18.AutoSize = true; - label18.Location = new System.Drawing.Point(277, 177); - label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label18.Name = "label18"; - label18.Size = new System.Drawing.Size(20, 20); - label18.TabIndex = 51; - label18.Text = "\\"; + this.label18.Location = new System.Drawing.Point(277, 177); + this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(198, 20); + this.label18.TabIndex = 51; + this.label18.Text = "원"; // // tbSC // @@ -719,7 +717,7 @@ // groupBox1 // this.groupBox1.Controls.Add(this.tbStorage); - this.groupBox1.Controls.Add(label18); + this.groupBox1.Controls.Add(this.label18); this.groupBox1.Controls.Add(this.cmbRemark); this.groupBox1.Controls.Add(this.cmbCurrency); this.groupBox1.Controls.Add(this.tbQtyReal); @@ -1118,14 +1116,14 @@ this.dsPurchase.DataSetName = "dsPurchase"; this.dsPurchase.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // - // purchaseBindingSource + // bs // - this.purchaseBindingSource.DataMember = "Purchase"; - this.purchaseBindingSource.DataSource = this.dsPurchase; + this.bs.DataMember = "Purchase"; + this.bs.DataSource = this.dsPurchase; // - // purchaseTableAdapter + // ta // - this.purchaseTableAdapter.ClearBeforeFill = true; + this.ta.ClearBeforeFill = true; // // fPurchase_Add // @@ -1152,7 +1150,7 @@ this.groupBox2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.purchaseBindingSource)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); this.ResumeLayout(false); } @@ -1188,8 +1186,8 @@ private System.Windows.Forms.GroupBox groupBox2; public System.Windows.Forms.PictureBox pictureBox1; private dsPurchase dsPurchase; - private System.Windows.Forms.BindingSource purchaseBindingSource; - private dsPurchaseTableAdapters.PurchaseTableAdapter purchaseTableAdapter; + private System.Windows.Forms.BindingSource bs; + private dsPurchaseTableAdapters.PurchaseTableAdapter ta; private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.TextBox tbOrderNo; private System.Windows.Forms.Button button1; @@ -1217,5 +1215,6 @@ private System.Windows.Forms.ComboBox cmbCurrency; private System.Windows.Forms.ComboBox cmbRemark; private System.Windows.Forms.ComboBox tbStorage; + private System.Windows.Forms.Label label18; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs similarity index 93% rename from SubProject/FEQ0000/Purchase/fPurchase_Add.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs index af7ee11..b215c4a 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.cs @@ -29,7 +29,7 @@ namespace FEQ0000 Properties.Settings.Default["gwcs"] = FCOMMON.info.CS; Properties.Settings.Default["EEEntities"] = FCOMMON.info.CS; - + this.bs.DataSource = dr_; bsManu = new BindingSource(); bsModel = new BindingSource(); @@ -59,6 +59,24 @@ namespace FEQ0000 tbLineCode.BackColor = Color.FromArgb(255, 255, 192); tbManager.BackColor = Color.FromArgb(255, 255, 192); } + this.tbPumPrice.Validated += (s1, e1) => { + + if(tbPumPrice.Tag != null && tbPumPrice.Tag.ToString().Equals(tbPumPrice.Text)) + { + + } + else + { + tbPumPrice.Tag = tbPumPrice.Text; + if (decimal.TryParse(tbPumPrice.Text.Replace(",", ""), out decimal value)) + { + tbPumPrice.Text = value.ToString("N0"); + + } + } + + + }; } Boolean advInput = false; @@ -225,8 +243,8 @@ namespace FEQ0000 if (dr.IspumidxNull()) tbPumIDX.Text = "-1"; else tbPumIDX.Text = dr.pumidx.ToString(); - tbPumPrice.Text = dr.pumprice.ToString(); - tbPumPriceD.Text = dr.pumpriceD.ToString(); + tbPumPrice.Text = dr.pumprice.ToString("N0"); + tbPumPriceD.Text = dr.pumpriceD.ToString("N0"); tbPumAmt.Text = dr.pumamt.ToString("N0"); //천단위 구분기호 추가 181222 tbPumUnit.Text = dr.pumunit; @@ -421,8 +439,8 @@ namespace FEQ0000 this.tbPumIDX.Text = f.item.ToString(); this.tbPumModel.Text = f.itemmodel; - this.tbPumPrice.Text = f.itemprice.ToString(); - this.tbPumPriceD.Text = f.itempriceD.ToString(); + this.tbPumPrice.Text = f.itemprice.ToString("N0"); + this.tbPumPriceD.Text = f.itempriceD.ToString("N0"); this.tbSID.Text = f.SID; this.tbSID.Tag = f.SID; this.tbPumUnit.Text = f.itemUnit; //181214 @@ -510,6 +528,7 @@ namespace FEQ0000 private bool saveData() { this.Validate(); + bs.EndEdit(); tbSID.Text = sidTrim(tbSID.Text); @@ -608,7 +627,7 @@ namespace FEQ0000 //실수량은 구매담당자만 입력한다 if (tbBigoChk.Enabled && (cmbState.Text == "PO" || cmbState.Text == "PR")) { - var qtycnv = int.TryParse(tbQtyReal.Text, out int qtyreq); + var qtycnv = int.TryParse(tbQtyReal.Text.Replace(",", ""), out int qtyreq); if (qtycnv == false || qtyreq < 1) { FCOMMON.Util.MsgE("수량(실 구매)을 입력하세요."); @@ -755,7 +774,7 @@ namespace FEQ0000 //품목정보에 없는 데이터이므로 자료를 추가한다. if (tbPumIDX.Text == "-1") { - var newidx = FCOMMON.DBM.addItem(tbPumName.Text, tbSID.Text, tbPumModel.Text.Trim(), decimal.Parse(tbPumPrice.Text), tbSupply.Text.Trim(), int.Parse(tbSupplyIndex.Text), null); + var newidx = FCOMMON.DBM.addItem(tbPumName.Text, tbSID.Text, tbPumModel.Text.Trim(), decimal.Parse(tbPumPrice.Text.Replace(",","")), tbSupply.Text.Trim(), int.Parse(tbSupplyIndex.Text), null); if (newidx > 0) tbPumIDX.Text = newidx.ToString(); } else if (tbSID.Text != "" && tbSID.Text != tbSID.Tag.ToString()) @@ -777,19 +796,19 @@ namespace FEQ0000 } //단가가없는경우 생성한다. - if (decimal.TryParse(tbPumPrice.Text, out decimal vprice) == false) + if (decimal.TryParse(tbPumPrice.Text.Replace(",",""), out decimal vprice) == false) { - if (decimal.TryParse(tbPumPriceD.Text, out decimal vpriced) == true) + if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal vpriced) == true) { applyDollerToWon(); } } - if (int.TryParse(tbQtyReq.Text, out int vqtyreq) == false) + if (int.TryParse(tbQtyReq.Text.Replace(",", ""), out int vqtyreq) == false) tbQtyReq.Text = "0"; - if (int.TryParse(tbQtyReal.Text, out int vqtyreal) == false) + if (int.TryParse(tbQtyReal.Text.Replace(",", ""), out int vqtyreal) == false) tbQtyReal.Text = "0"; - if (decimal.TryParse(tbPumPrice.Text, out decimal vpumprice) == false) + if (decimal.TryParse(tbPumPrice.Text.Replace(",", ""), out decimal vpumprice) == false) tbPumPrice.Text = "0"; //요청 구매 수량이 다를경우 비고 입력이 필요함 @@ -808,7 +827,7 @@ namespace FEQ0000 dr.pumprice = vpumprice;// decimal.Parse(tbPumPrice.Text); dr.currency = cmbCurrency.Text.Trim(); - if (decimal.TryParse(tbPumPriceD.Text, out decimal priced)) + if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) { dr.pumpriceD = priced; } @@ -981,9 +1000,11 @@ namespace FEQ0000 private void tbPumQty_TextChanged(object sender, EventArgs e) { - var b1 = int.TryParse(tbQtyReal.Text, out int qtyreal); - var b2 = int.TryParse(tbQtyReq.Text, out int qtyreq); - var b3 = double.TryParse(tbPumPrice.Text, out double price); + var b1 = int.TryParse(tbQtyReal.Text.Replace(",", ""), out int qtyreal); + var b2 = int.TryParse(tbQtyReq.Text.Replace(",", ""), out int qtyreq); + + var amtstr = tbPumPrice.Text.Replace("\\", "").Replace(",", "").Replace("₩",""); + var b3 = double.TryParse(amtstr, out double price); double amt = 0; //실구매수량이 잇으면 그걸로한다 @@ -991,6 +1012,7 @@ namespace FEQ0000 else amt = qtyreq * price; tbPumAmt.Text = amt.ToString("N0"); + //label18.Text = Util.Number2Hangle((long)price) + "원"; } private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) @@ -1133,7 +1155,7 @@ namespace FEQ0000 //if ( decimal.TryParse(tbPumPrice.Text, out decimal result) == false || result == 0) if (binit) { - if (decimal.TryParse(tbPumPriceD.Text, out decimal priced) == true) + if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced) == true) { applyDollerToWon(); } @@ -1147,7 +1169,7 @@ namespace FEQ0000 } void applyDollerToWon() { - if (decimal.TryParse(tbPumPriceD.Text, out decimal priced)) + if (decimal.TryParse(tbPumPriceD.Text.Replace(",", ""), out decimal priced)) { var price = FCOMMON.info.dollertowon * (double)priced; tbPumPrice.Text = (Math.Ceiling(price)).ToString(); diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.resx similarity index 94% rename from SubProject/FEQ0000/Purchase/fPurchase_Add.resx rename to SubProject/FEQ0000/PurchaseNR/fPurchase_Add.resx index 09f9f13..ff9977a 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Add.resx @@ -151,7 +151,7 @@ False - 490, 17 + 257, 17 * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) @@ -224,9 +224,6 @@ False - - False - * 공용 공구 / 상세한 사유 작성 (공용으로 함께 쓰는 것들.. 전동 드릴등) * 공용 파트 / 상세한 사유 작성 (공용으로 보관하여 정비에 사용되는 것들..WRITE , COnnector ,pin 등) @@ -242,16 +239,16 @@ * 기타 물품 / 상세한 사유 작성 (상기 항목에 포함되지 않는다고 판단되는 것들 .. SPR 파트정리용, Feeder 파트 정리 등) - 587, 17 + 354, 17 17, 17 - + 131, 17 - - 313, 17 + + 195, 17 58 diff --git a/SubProject/FEQ0000/Purchase/fPurchase_AddS.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_AddS.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchase_AddS.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_AddS.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchase_AddS.resx b/SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_AddS.resx rename to SubProject/FEQ0000/PurchaseNR/fPurchase_AddS.resx diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Data.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Data.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_Data.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_Data.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Data.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Data.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_Data.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_Data.cs diff --git a/SubProject/FEQ0000/PurchaseNR/fPurchase_Data.resx b/SubProject/FEQ0000/PurchaseNR/fPurchase_Data.resx new file mode 100644 index 0000000..29dcb1b --- /dev/null +++ b/SubProject/FEQ0000/PurchaseNR/fPurchase_Data.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Import.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Import.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_Import.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_Import.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Import.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_Import.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_Import.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_Import.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Import.resx b/SubProject/FEQ0000/PurchaseNR/fPurchase_Import.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_Import.resx rename to SubProject/FEQ0000/PurchaseNR/fPurchase_Import.resx diff --git a/SubProject/FEQ0000/Purchase/fPurchase_ImportO.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_ImportO.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchase_ImportO.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_ImportO.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchase_ImportO.resx b/SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_ImportO.resx rename to SubProject/FEQ0000/PurchaseNR/fPurchase_ImportO.resx diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_excelimport.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs b/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs rename to SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.cs diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.resx b/SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/fPurchase_excelimport.resx rename to SubProject/FEQ0000/PurchaseNR/fPurchase_excelimport.resx diff --git a/SubProject/FEQ0000/Purchase/fSIDCheckNR.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fSIDCheckNR.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fSIDCheckNR.cs b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fSIDCheckNR.cs rename to SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.cs diff --git a/SubProject/FEQ0000/Purchase/fSIDCheckNR.resx b/SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/fSIDCheckNR.resx rename to SubProject/FEQ0000/PurchaseNR/fSIDCheckNR.resx diff --git a/SubProject/FEQ0000/Purchase/fSIDListSelect.Designer.cs b/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fSIDListSelect.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/fSIDListSelect.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/fSIDListSelect.cs b/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/fSIDListSelect.cs rename to SubProject/FEQ0000/PurchaseNR/fSIDListSelect.cs diff --git a/SubProject/FEQ0000/Purchase/fSIDListSelect.resx b/SubProject/FEQ0000/PurchaseNR/fSIDListSelect.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/fSIDListSelect.resx rename to SubProject/FEQ0000/PurchaseNR/fSIDListSelect.resx diff --git a/SubProject/FEQ0000/Purchase/rPurchaseNR.Designer.cs b/SubProject/FEQ0000/PurchaseNR/rPurchaseNR.Designer.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/rPurchaseNR.Designer.cs rename to SubProject/FEQ0000/PurchaseNR/rPurchaseNR.Designer.cs diff --git a/SubProject/FEQ0000/Purchase/rPurchaseNR.cs b/SubProject/FEQ0000/PurchaseNR/rPurchaseNR.cs similarity index 100% rename from SubProject/FEQ0000/Purchase/rPurchaseNR.cs rename to SubProject/FEQ0000/PurchaseNR/rPurchaseNR.cs diff --git a/SubProject/FEQ0000/Purchase/rPurchaseNR.resx b/SubProject/FEQ0000/PurchaseNR/rPurchaseNR.resx similarity index 100% rename from SubProject/FEQ0000/Purchase/rPurchaseNR.resx rename to SubProject/FEQ0000/PurchaseNR/rPurchaseNR.resx diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index b90433c..472966e 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -675,14 +675,26 @@ namespace FPJ0000 private void linkLabel11_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { + + int cnt; + if(int.TryParse(cntTextBox.Text, out cnt)==false) + { + FCOMMON.Util.MsgE($"수량이 입려되지 않았습니다"); + cntTextBox.Focus(); + return; + } + var sfi_type = "O"; var sfi_count = 0f; var sfi_time = 0f; + var sfi_shiftcount = 0D; if (dr.Issfi_typeNull() == false) sfi_type = dr.sfi_type; if (dr.Issfi_savecountNull() == false) sfi_count = dr.sfi_savecount; if (dr.Issfi_savetimeNull() == false) sfi_time = dr.sfi_savetime; + 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); + 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"); diff --git a/SubProject/FPJ0000/SaveCost/fSaveCostData.cs b/SubProject/FPJ0000/SaveCost/fSaveCostData.cs index 2b5cbf3..890192e 100644 --- a/SubProject/FPJ0000/SaveCost/fSaveCostData.cs +++ b/SubProject/FPJ0000/SaveCost/fSaveCostData.cs @@ -170,7 +170,7 @@ namespace FPJ0000 private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) { - var f = new FCOMMON.fSFI("O",0f,0f); + var f = new FCOMMON.fSFI("O",0f,0f,4,1); if (f.ShowDialog() == DialogResult.OK) textBox5.Text = f.Value.ToString("N2"); } diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs index 81ba59e..5f6798a 100644 --- a/SubProject/FPJ0000/dsPRJ.Designer.cs +++ b/SubProject/FPJ0000/dsPRJ.Designer.cs @@ -1133,6 +1133,8 @@ namespace FPJ0000 { private global::System.Data.DataColumn columnlasthistory_date; + private global::System.Data.DataColumn columnsfi_shiftcount; + [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 sfi_shiftcountColumn { + get { + return this.columnsfi_shiftcount; + } + } + [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 { float sfi_savecount, double sfi_savetime1, double sfi_savecount1, - string lasthistory_date) { + string lasthistory_date, + double sfi_shiftcount) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2093,7 +2104,8 @@ namespace FPJ0000 { sfi_savecount, sfi_savetime1, sfi_savecount1, - lasthistory_date}; + lasthistory_date, + sfi_shiftcount}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2187,7 +2199,8 @@ namespace FPJ0000 { float sfi_savecount, double sfi_savetime1, double sfi_savecount1, - string lasthistory_date) { + string lasthistory_date, + double sfi_shiftcount) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -2277,7 +2290,8 @@ namespace FPJ0000 { sfi_savecount, sfi_savetime1, sfi_savecount1, - lasthistory_date}; + lasthistory_date, + sfi_shiftcount}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -2395,6 +2409,7 @@ namespace FPJ0000 { this.columnsfi_savetime1 = base.Columns["sfi_savetime1"]; this.columnsfi_savecount1 = base.Columns["sfi_savecount1"]; this.columnlasthistory_date = base.Columns["lasthistory_date"]; + this.columnsfi_shiftcount = base.Columns["sfi_shiftcount"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2576,6 +2591,8 @@ namespace FPJ0000 { base.Columns.Add(this.columnsfi_savecount1); this.columnlasthistory_date = new global::System.Data.DataColumn("lasthistory_date", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnlasthistory_date); + this.columnsfi_shiftcount = new global::System.Data.DataColumn("sfi_shiftcount", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsfi_shiftcount); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -14201,6 +14218,22 @@ namespace FPJ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public double sfi_shiftcount { + get { + if (this.Issfi_shiftcountNull()) { + return 0D; + } + else { + return ((double)(this[this.tableProjects.sfi_shiftcountColumn])); + } + } + set { + this[this.tableProjects.sfi_shiftcountColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] public bool IsnameNull() { @@ -15208,6 +15241,18 @@ namespace FPJ0000 { public void Setlasthistory_dateNull() { this[this.tableProjects.lasthistory_dateColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public bool Issfi_shiftcountNull() { + return this.IsNull(this.tableProjects.sfi_shiftcountColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")] + public void Setsfi_shiftcountNull() { + this[this.tableProjects.sfi_shiftcountColumn] = global::System.Convert.DBNull; + } } /// @@ -24730,6 +24775,7 @@ namespace FPJ0000.dsPRJTableAdapters { tableMapping.ColumnMappings.Add("sfi_savetime", "sfi_savetime1"); tableMapping.ColumnMappings.Add("sfi_savecount", "sfi_savecount1"); tableMapping.ColumnMappings.Add("lasthistory_date", "lasthistory_date"); + tableMapping.ColumnMappings.Add("sfi_shiftcount", "sfi_shiftcount"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -24738,80 +24784,76 @@ 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, sfi, bHighlight, effect_tangible, - effect_intangible, sfi_type, sfi_savetime, sfi_savecount) -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,@sfi,@bHighlight,@effect_tangible,@effect_intangible,@sfi_type,@sfi_savetime,@sfi_savecount)"; + 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], [sfi], [bHighlight], [effect_tangible], [effect_intangible], [sfi_type], [sfi_savetime], [sfi_savecount], [sfi_shiftcount]) 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, @sfi, @bHighlight, @effect_tangible, @effect_intangible, @sfi_type, @sfi_savetime, @sfi_savecount, @sfi_shiftcount)"; 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("@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("@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_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("@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("@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("@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_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.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; this._adapter.UpdateCommand.CommandText = "UPDATE Projects\r\nSET status = @status, pdate = @pdate, name = @name, userm" + @@ -24949,13 +24991,13 @@ VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate, "istoryD(idx) AS lasthistoryD, bHighlight, effect_tangible, effect_intangible, sf" + "i_type, sfi_savetime, \r\n sfi_savecount,\r\n (SELEC" + "T MAX(pdate) AS Expr1\r\n FROM ProjectsHistory\r\n " + - " WHERE (pidx = Projects.idx)) AS lasthistory_date\r\nFROM Projects\r\n" + - "WHERE (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\nORDER BY " + - "(CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN \'1\' WHEN ([statu" + - "s] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([status] = \'취소\') \r\n " + - " THEN \'9\' ELSE \'5\' END)"; + " WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi_shiftcount\r\nFRO" + + "M Projects\r\nWHERE (status LIKE @state) AND (ISNULL(userManager, \'\') LIKE @u" + + "sername OR\r\n ISNULL(usermain, \'\') LIKE @username OR\r\n " + + " ISNULL(usersub, \'\') LIKE @username) AND (ISNULL(isdel, 0) = 0) AND (gcode = @g" + + "code)\r\nORDER BY (CASE WHEN [status] = \'검토\' THEN \'0\' WHEN ([status] = \'진행\') THEN " + + "\'1\' WHEN ([status] = \'보류\') THEN \'2\' WHEN ([status] = \'완료\') THEN \'3\' WHEN ([statu" + + "s] = \'취소\') \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, "", "", "")); @@ -24975,7 +25017,7 @@ VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate, ReqPackage, ReqPlant, pno, kdate, jasmin, sfi, bHighlight, effect_tangible, effect_intangible, sfi_savecount, sfi_savetime, sfi_type, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory - WHERE (pidx = Projects.idx)) AS lasthistory_date + WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi_shiftcount FROM Projects WHERE (idx = @idx)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; @@ -24997,11 +25039,11 @@ WHERE (idx = @idx)"; " ReqPackage, ReqPlant, pno, kdate, jasmin, sfi, bHighlight, effect_tangi" + "ble, effect_intangible, sfi_savecount, sfi_savetime, sfi_type,\r\n " + " (SELECT MAX(pdate) AS Expr1\r\n FROM ProjectsHistory\r\n " + - " WHERE (pidx = Projects.idx)) AS lasthistory_date\r\nFROM P" + - "rojects\r\nWHERE (ISNULL(name, N\'\') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND " + - "(gcode = @gcode) OR\r\n (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) " + - "AND (CAST(idx AS varchar) LIKE @search) OR\r\n (ISNULL(isdel, 0) = 0" + - ") AND (gcode = @gcode) AND (ISNULL(memo, N\'\') LIKE @search)"; + " WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi_shiftc" + + "ount\r\nFROM Projects\r\nWHERE (ISNULL(name, N\'\') LIKE @search) AND (ISNULL(isd" + + "el, 0) = 0) AND (gcode = @gcode) OR\r\n (ISNULL(isdel, 0) = 0) AND (" + + "gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR\r\n (ISNU" + + "LL(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, "", "", "")); @@ -25271,7 +25313,8 @@ WHERE (idx = @idx)"; string effect_intangible, string sfi_type, global::System.Nullable sfi_savetime, - global::System.Nullable sfi_savecount) { + global::System.Nullable sfi_savecount, + global::System.Nullable sfi_shiftcount) { if ((status == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -25669,6 +25712,12 @@ WHERE (idx = @idx)"; else { this.Adapter.InsertCommand.Parameters[66].Value = global::System.DBNull.Value; } + if ((sfi_shiftcount.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[67].Value = ((double)(sfi_shiftcount.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[67].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 eee57ce..6eb1841 100644 --- a/SubProject/FPJ0000/dsPRJ.xsd +++ b/SubProject/FPJ0000/dsPRJ.xsd @@ -21,80 +21,76 @@ 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, sfi, bHighlight, effect_tangible, - effect_intangible, sfi_type, sfi_savetime, sfi_savecount) -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,@sfi,@bHighlight,@effect_tangible,@effect_intangible,@sfi_type,@sfi_savetime,@sfi_savecount) + 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], [sfi], [bHighlight], [effect_tangible], [effect_intangible], [sfi_type], [sfi_savetime], [sfi_savecount], [sfi_shiftcount]) 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, @sfi, @bHighlight, @effect_tangible, @effect_intangible, @sfi_type, @sfi_savetime, @sfi_savecount, @sfi_shiftcount) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -109,7 +105,7 @@ VALUES (@status,@pdate,@name,@usermain,@usersub,@reqstaff,@sdate,@edate,@odate, sfi_savecount, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory - WHERE (pidx = Projects.idx)) AS lasthistory_date + WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi_shiftcount FROM Projects WHERE (status LIKE @state) AND (ISNULL(userManager, '') LIKE @username OR ISNULL(usermain, '') LIKE @username OR @@ -295,6 +291,7 @@ SELECT idx, status, pdate, name, usermain, usersub, reqstaff, sdate, edate, odat + @@ -325,7 +322,7 @@ WHERE (import = 1) AND (gcode = @gcode) ReqPackage, ReqPlant, pno, kdate, jasmin, sfi, bHighlight, effect_tangible, effect_intangible, sfi_savecount, sfi_savetime, sfi_type, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory - WHERE (pidx = Projects.idx)) AS lasthistory_date + WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi_shiftcount FROM Projects WHERE (idx = @idx) @@ -345,7 +342,7 @@ WHERE (idx = @idx) ReqPackage, ReqPlant, pno, kdate, jasmin, sfi, bHighlight, effect_tangible, effect_intangible, sfi_savecount, sfi_savetime, sfi_type, (SELECT MAX(pdate) AS Expr1 FROM ProjectsHistory - WHERE (pidx = Projects.idx)) AS lasthistory_date + WHERE (pidx = Projects.idx)) AS lasthistory_date, sfi_shiftcount FROM Projects WHERE (ISNULL(name, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) OR (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) AND (CAST(idx AS varchar) LIKE @search) OR @@ -3517,15 +3514,16 @@ WHERE (idx = @idx) - - - + + + + @@ -5126,45 +5124,45 @@ WHERE (idx = @idx) - + - - + + - - - - - - - + + + + + + + - + - + - +