diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index fd494d9..9dd487d 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.04.24.1350")] -[assembly: AssemblyFileVersion("23.04.24.1350")] +[assembly: AssemblyVersion("23.04.28.1450")] +[assembly: AssemblyFileVersion("23.04.28.1450")] diff --git a/Project/StateMachine/_BW.cs b/Project/StateMachine/_BW.cs index 6dc94ca..703f0f6 100644 --- a/Project/StateMachine/_BW.cs +++ b/Project/StateMachine/_BW.cs @@ -188,9 +188,31 @@ namespace Project { sendMsg = ("받는 주소가 없습니다"); } + + if (sendMsg.isEmpty()==false) + { + //오류가 있다 + try + { + cmd.CommandText = "UPDATE MailData SET SendOK = 1, SendMsg = @msg WHERE(idx = @idx) and isnull(sendok,0) = 0"; + cmd.Parameters.Clear(); + cmd.Parameters.Add("msg", System.Data.SqlDbType.VarChar).Value = sendMsg; + cmd.Parameters.Add("idx", System.Data.SqlDbType.Int).Value = idx; + //Console.WriteLine(string.Format("Send Complete index={0},Msg={1}", dar["idx"], sendMsg)); + //ta.UpdateSendOK(sendMsg, dr.idx); + var ucnt = cmd.ExecuteNonQuery(); + if (ucnt == 1) + { + Console.WriteLine("send mail to" + list_to + ",subject=" + getdbdata(subject)); + } + } + catch (Exception eX) + { + sendMsg = eX.Message; + } + } else { - //var body = getdbdata(dar["body"]); body += "

" + @@ -248,12 +270,9 @@ namespace Project //sendMsg = eX.Message; //msgupdate = true; } - } - - cmd.Dispose(); cn.Close(); } diff --git a/Project/Util.cs b/Project/Util.cs index 07cf190..35aa623 100644 --- a/Project/Util.cs +++ b/Project/Util.cs @@ -39,8 +39,7 @@ namespace Project sendmailchecktime = DateTime.Now; bool retval = false; var sql = "select wdate from EETGW_ServerSetting" + - " where gcode = @gcode " + - " and active = 1" + + " where active = 1" + " order by wdate desc"; var cn = new SqlConnection(Properties.Settings.Default.gwcs); cn.Open(); @@ -68,10 +67,26 @@ namespace Project { //이 사용자가 나인지 체크한다 cmd.CommandText = sql = "select wuid from EETGW_ServerSetting" + - " where gcode = @gcode " + - " and active = 1" + + " where active = 1" + " order by wdate desc"; - var uid = cmd.ExecuteScalar(); + var uid = string.Empty;// cmd.ExecuteScalar(); + var dar2 = cmd.ExecuteReader(); + while(dar2.Read()) + { + var v = dar2[0]; + var id = string.Empty; + if (v != null) id = v.ToString(); + if (uid.isEmpty()) uid = id; //값이 비어있다면 추가한다 + + //현재 루프되는 id값이 로그인id와 같다면 그것을 우선 처리한다 + if (id.Equals(FCOMMON.info.Login.no)) + { + uid = id; + break; + } + } + dar2.Close(); + if(uid.ToString().Equals(FCOMMON.info.Login.no)) { //아직 10분전이므로 정상이다 @@ -84,11 +99,11 @@ namespace Project cmd.Parameters.Add("wuid", System.Data.SqlDbType.VarChar).Value = FCOMMON.info.Login.no; //기존데이터를 비활성화 - cmd.CommandText = "update EETGW_ServerSetting set active=0 where gcode =@gcode and active=1 and wuid <> @wuid "; + cmd.CommandText = "update EETGW_ServerSetting set active=0 where active=1 and wuid <> @wuid "; cmd.ExecuteNonQuery(); //내 데이터를 활성화 - cmd.CommandText = "update EETGW_ServerSetting set wdate = getdate() where gcode = @gcode and wuid = @wuid and active=1"; + cmd.CommandText = "update EETGW_ServerSetting set wdate = getdate() where wuid = @wuid and active=1"; var cnt = cmd.ExecuteNonQuery(); } retval = true; @@ -101,7 +116,7 @@ namespace Project else { //10분넘었으니 다시 생성한다 - cmd.CommandText = "update EETGW_ServerSetting set active=0 where gcode =@gcode and active=1"; + cmd.CommandText = $"update EETGW_ServerSetting set active=0 where active=1 and wuid <> '{FCOMMON.info.Login.no}'"; cmd.ExecuteNonQuery(); cmd.CommandText = "insert into EETGW_ServerSetting(gcode,active,wuid,wdate) values(@gcode,1,@wuid,GETDATE())"; cmd.Parameters.Clear(); diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.Designer.cs index 59081c2..0fbb83c 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.Designer.cs @@ -41,14 +41,15 @@ namespace FEQ0000.Purchase System.Windows.Forms.Label nameLabel; System.Windows.Forms.Label label16; System.Windows.Forms.Label label20; - System.Windows.Forms.Label label7; System.Windows.Forms.Label label8; System.Windows.Forms.Label receiveLabel; System.Windows.Forms.Label label13; - System.Windows.Forms.Label label10; - System.Windows.Forms.Label label14; System.Windows.Forms.Label label6; System.Windows.Forms.Label label1; + System.Windows.Forms.Label label10; + System.Windows.Forms.Label label15; + System.Windows.Forms.Label label14; + System.Windows.Forms.Label label7; this.panel1 = new System.Windows.Forms.Panel(); this.tbPrjStatus = new System.Windows.Forms.TextBox(); this.tbPrjIdx = new System.Windows.Forms.TextBox(); @@ -62,9 +63,6 @@ namespace FEQ0000.Purchase this.tbPrjName = new System.Windows.Forms.TextBox(); this.tbIdx = new System.Windows.Forms.TextBox(); this.panel2 = new System.Windows.Forms.Panel(); - this.tbSCRCF = new System.Windows.Forms.TextBox(); - this.tbSC = new System.Windows.Forms.TextBox(); - this.tbPO = new System.Windows.Forms.TextBox(); this.tbRemarkO = new System.Windows.Forms.TextBox(); this.tbAmt = new System.Windows.Forms.TextBox(); this.tbPriceO = new System.Windows.Forms.TextBox(); @@ -74,6 +72,7 @@ namespace FEQ0000.Purchase this.arLabel1 = new System.Windows.Forms.Label(); this.tbPumname = new System.Windows.Forms.TextBox(); this.textBox16 = new System.Windows.Forms.TextBox(); + this.tbPO = new System.Windows.Forms.TextBox(); this.panel3 = new System.Windows.Forms.Panel(); this.tbInPrice = new System.Windows.Forms.TextBox(); this.cmbReceive = new System.Windows.Forms.ComboBox(); @@ -83,6 +82,9 @@ namespace FEQ0000.Purchase this.dtInDate = new System.Windows.Forms.DateTimePicker(); this.btOK = new System.Windows.Forms.Button(); this.arLabel3 = new System.Windows.Forms.Label(); + this.tbSID = new System.Windows.Forms.TextBox(); + this.tbSCRCF = new System.Windows.Forms.TextBox(); + this.tbSC = new System.Windows.Forms.TextBox(); label17 = new System.Windows.Forms.Label(); label12 = new System.Windows.Forms.Label(); label11 = new System.Windows.Forms.Label(); @@ -95,14 +97,15 @@ namespace FEQ0000.Purchase nameLabel = new System.Windows.Forms.Label(); label16 = new System.Windows.Forms.Label(); label20 = new System.Windows.Forms.Label(); - label7 = new System.Windows.Forms.Label(); label8 = new System.Windows.Forms.Label(); receiveLabel = new System.Windows.Forms.Label(); label13 = new System.Windows.Forms.Label(); - label10 = new System.Windows.Forms.Label(); - label14 = new System.Windows.Forms.Label(); label6 = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); + label10 = new System.Windows.Forms.Label(); + label15 = new System.Windows.Forms.Label(); + label14 = new System.Windows.Forms.Label(); + label7 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); @@ -111,7 +114,7 @@ namespace FEQ0000.Purchase // label17 // label17.AutoSize = true; - label17.Location = new System.Drawing.Point(338, 170); + label17.Location = new System.Drawing.Point(300, 148); label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label17.Name = "label17"; label17.Size = new System.Drawing.Size(68, 12); @@ -121,7 +124,7 @@ namespace FEQ0000.Purchase // label12 // label12.AutoSize = true; - label12.Location = new System.Drawing.Point(56, 168); + label12.Location = new System.Drawing.Point(56, 148); label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label12.Name = "label12"; label12.Size = new System.Drawing.Size(29, 12); @@ -131,7 +134,7 @@ namespace FEQ0000.Purchase // label11 // label11.AutoSize = true; - label11.Location = new System.Drawing.Point(300, 145); + label11.Location = new System.Drawing.Point(325, 125); label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label11.Name = "label11"; label11.Size = new System.Drawing.Size(43, 12); @@ -141,7 +144,7 @@ namespace FEQ0000.Purchase // label5 // label5.AutoSize = true; - label5.Location = new System.Drawing.Point(39, 144); + label5.Location = new System.Drawing.Point(39, 125); label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label5.Name = "label5"; label5.Size = new System.Drawing.Size(46, 12); @@ -151,7 +154,7 @@ namespace FEQ0000.Purchase // label9 // label9.AutoSize = true; - label9.Location = new System.Drawing.Point(27, 99); + label9.Location = new System.Drawing.Point(27, 101); label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label9.Name = "label9"; label9.Size = new System.Drawing.Size(58, 12); @@ -208,7 +211,7 @@ namespace FEQ0000.Purchase // label16 // label16.AutoSize = true; - label16.Location = new System.Drawing.Point(40, 57); + label16.Location = new System.Drawing.Point(40, 62); label16.Name = "label16"; label16.Size = new System.Drawing.Size(59, 12); label16.TabIndex = 2; @@ -217,27 +220,17 @@ namespace FEQ0000.Purchase // label20 // label20.AutoSize = true; - label20.Location = new System.Drawing.Point(70, 34); + label20.Location = new System.Drawing.Point(70, 33); label20.Name = "label20"; label20.Size = new System.Drawing.Size(29, 12); label20.TabIndex = 0; label20.Text = "품명"; // - // label7 - // - label7.AutoSize = true; - label7.Location = new System.Drawing.Point(52, 225); - label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - label7.Name = "label7"; - label7.Size = new System.Drawing.Size(63, 12); - label7.TabIndex = 109; - label7.Text = "비고(입고)"; - // // label8 // label8.AutoSize = true; label8.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - label8.Location = new System.Drawing.Point(23, 149); + label8.Location = new System.Drawing.Point(13, 148); label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label8.Name = "label8"; label8.Size = new System.Drawing.Size(92, 28); @@ -247,7 +240,7 @@ namespace FEQ0000.Purchase // receiveLabel // receiveLabel.AutoSize = true; - receiveLabel.Location = new System.Drawing.Point(25, 38); + receiveLabel.Location = new System.Drawing.Point(14, 38); receiveLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); receiveLabel.Name = "receiveLabel"; receiveLabel.Size = new System.Drawing.Size(41, 12); @@ -258,35 +251,17 @@ namespace FEQ0000.Purchase // label13.AutoSize = true; label13.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - label13.Location = new System.Drawing.Point(63, 187); + label13.Location = new System.Drawing.Point(53, 186); label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label13.Name = "label13"; label13.Size = new System.Drawing.Size(52, 28); label13.TabIndex = 113; label13.Text = "단가"; // - // label10 - // - label10.AutoSize = true; - label10.Location = new System.Drawing.Point(9, 157); - label10.Name = "label10"; - label10.Size = new System.Drawing.Size(89, 12); - label10.TabIndex = 105; - label10.Text = "SC / SCR/CF#"; - // - // label14 - // - label14.AutoSize = true; - label14.Location = new System.Drawing.Point(92, 301); - label14.Name = "label14"; - label14.Size = new System.Drawing.Size(22, 12); - label14.TabIndex = 103; - label14.Text = "PO"; - // // label6 // label6.AutoSize = true; - label6.Location = new System.Drawing.Point(69, 120); + label6.Location = new System.Drawing.Point(69, 126); label6.Name = "label6"; label6.Size = new System.Drawing.Size(29, 12); label6.TabIndex = 97; @@ -295,7 +270,7 @@ namespace FEQ0000.Purchase // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(9, 90); + label1.Location = new System.Drawing.Point(9, 97); label1.Name = "label1"; label1.Size = new System.Drawing.Size(89, 12); label1.TabIndex = 98; @@ -328,7 +303,7 @@ namespace FEQ0000.Purchase this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(584, 193); + this.panel1.Size = new System.Drawing.Size(582, 171); this.panel1.TabIndex = 87; // // tbPrjStatus @@ -336,32 +311,32 @@ namespace FEQ0000.Purchase this.tbPrjStatus.Location = new System.Drawing.Point(413, 52); this.tbPrjStatus.Name = "tbPrjStatus"; this.tbPrjStatus.ReadOnly = true; - this.tbPrjStatus.Size = new System.Drawing.Size(127, 21); + this.tbPrjStatus.Size = new System.Drawing.Size(161, 21); this.tbPrjStatus.TabIndex = 99; this.tbPrjStatus.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // tbPrjIdx // this.tbPrjIdx.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbPrjIdx.Location = new System.Drawing.Point(413, 165); + this.tbPrjIdx.Location = new System.Drawing.Point(376, 144); this.tbPrjIdx.Name = "tbPrjIdx"; this.tbPrjIdx.ReadOnly = true; - this.tbPrjIdx.Size = new System.Drawing.Size(127, 21); + this.tbPrjIdx.Size = new System.Drawing.Size(198, 21); this.tbPrjIdx.TabIndex = 98; this.tbPrjIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // tbPrjSerial // - this.tbPrjSerial.Location = new System.Drawing.Point(350, 141); + this.tbPrjSerial.Location = new System.Drawing.Point(376, 121); this.tbPrjSerial.Name = "tbPrjSerial"; this.tbPrjSerial.ReadOnly = true; - this.tbPrjSerial.Size = new System.Drawing.Size(190, 21); + this.tbPrjSerial.Size = new System.Drawing.Size(198, 21); this.tbPrjSerial.TabIndex = 95; this.tbPrjSerial.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // tbPrjModel // - this.tbPrjModel.Location = new System.Drawing.Point(93, 139); + this.tbPrjModel.Location = new System.Drawing.Point(93, 121); this.tbPrjModel.Name = "tbPrjModel"; this.tbPrjModel.ReadOnly = true; this.tbPrjModel.Size = new System.Drawing.Size(190, 21); @@ -372,7 +347,7 @@ namespace FEQ0000.Purchase // this.tbPrjProcess.Font = new System.Drawing.Font("굴림", 9F); this.tbPrjProcess.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPrjProcess.Location = new System.Drawing.Point(93, 165); + this.tbPrjProcess.Location = new System.Drawing.Point(93, 144); this.tbPrjProcess.Name = "tbPrjProcess"; this.tbPrjProcess.ReadOnly = true; this.tbPrjProcess.Size = new System.Drawing.Size(190, 21); @@ -380,10 +355,10 @@ namespace FEQ0000.Purchase // // tbProjOrderNo // - this.tbProjOrderNo.Location = new System.Drawing.Point(93, 96); + this.tbProjOrderNo.Location = new System.Drawing.Point(93, 98); this.tbProjOrderNo.Name = "tbProjOrderNo"; this.tbProjOrderNo.ReadOnly = true; - this.tbProjOrderNo.Size = new System.Drawing.Size(447, 21); + this.tbProjOrderNo.Size = new System.Drawing.Size(481, 21); this.tbProjOrderNo.TabIndex = 13; this.tbProjOrderNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -410,10 +385,10 @@ namespace FEQ0000.Purchase this.arLabel2.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel2.Dock = System.Windows.Forms.DockStyle.Top; this.arLabel2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.arLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel2.ForeColor = System.Drawing.Color.Black; this.arLabel2.Location = new System.Drawing.Point(0, 0); this.arLabel2.Name = "arLabel2"; - this.arLabel2.Size = new System.Drawing.Size(584, 23); + this.arLabel2.Size = new System.Drawing.Size(582, 23); this.arLabel2.TabIndex = 86; this.arLabel2.Text = "프로젝트"; this.arLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -424,7 +399,7 @@ namespace FEQ0000.Purchase this.tbPrjName.Location = new System.Drawing.Point(93, 30); this.tbPrjName.Name = "tbPrjName"; this.tbPrjName.ReadOnly = true; - this.tbPrjName.Size = new System.Drawing.Size(447, 21); + this.tbPrjName.Size = new System.Drawing.Size(481, 21); this.tbPrjName.TabIndex = 1; // // tbIdx @@ -432,7 +407,7 @@ namespace FEQ0000.Purchase this.tbIdx.Location = new System.Drawing.Point(413, 74); this.tbIdx.Name = "tbIdx"; this.tbIdx.ReadOnly = true; - this.tbIdx.Size = new System.Drawing.Size(127, 21); + this.tbIdx.Size = new System.Drawing.Size(161, 21); this.tbIdx.TabIndex = 9; this.tbIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // @@ -442,6 +417,8 @@ namespace FEQ0000.Purchase this.panel2.Controls.Add(this.tbSCRCF); this.panel2.Controls.Add(this.tbSC); this.panel2.Controls.Add(label10); + this.panel2.Controls.Add(label15); + this.panel2.Controls.Add(this.tbSID); this.panel2.Controls.Add(this.tbRemarkO); this.panel2.Controls.Add(this.tbAmt); this.panel2.Controls.Add(this.tbPriceO); @@ -456,54 +433,25 @@ namespace FEQ0000.Purchase this.panel2.Controls.Add(label20); this.panel2.Controls.Add(this.textBox16); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; - this.panel2.Location = new System.Drawing.Point(0, 193); + this.panel2.Location = new System.Drawing.Point(0, 171); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(584, 188); + this.panel2.Size = new System.Drawing.Size(582, 192); this.panel2.TabIndex = 88; // - // tbSCRCF - // - this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbSCRCF.Location = new System.Drawing.Point(340, 144); - this.tbSCRCF.Name = "tbSCRCF"; - this.tbSCRCF.ReadOnly = true; - this.tbSCRCF.Size = new System.Drawing.Size(232, 38); - this.tbSCRCF.TabIndex = 107; - // - // tbSC - // - this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbSC.Location = new System.Drawing.Point(104, 143); - this.tbSC.Name = "tbSC"; - this.tbSC.ReadOnly = true; - this.tbSC.Size = new System.Drawing.Size(232, 38); - this.tbSC.TabIndex = 106; - // - // tbPO - // - this.tbPO.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbPO.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPO.Location = new System.Drawing.Point(120, 298); - this.tbPO.Name = "tbPO"; - this.tbPO.Size = new System.Drawing.Size(320, 38); - this.tbPO.TabIndex = 104; - // // tbRemarkO // this.tbRemarkO.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbRemarkO.Location = new System.Drawing.Point(104, 117); + this.tbRemarkO.Location = new System.Drawing.Point(104, 123); this.tbRemarkO.Name = "tbRemarkO"; this.tbRemarkO.ReadOnly = true; - this.tbRemarkO.Size = new System.Drawing.Size(437, 21); + this.tbRemarkO.Size = new System.Drawing.Size(466, 21); this.tbRemarkO.TabIndex = 102; // // tbAmt // this.tbAmt.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbAmt.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbAmt.Location = new System.Drawing.Point(372, 79); + this.tbAmt.Location = new System.Drawing.Point(370, 86); this.tbAmt.Name = "tbAmt"; this.tbAmt.ReadOnly = true; this.tbAmt.Size = new System.Drawing.Size(200, 34); @@ -514,7 +462,7 @@ namespace FEQ0000.Purchase // this.tbPriceO.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbPriceO.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPriceO.Location = new System.Drawing.Point(237, 79); + this.tbPriceO.Location = new System.Drawing.Point(237, 86); this.tbPriceO.Name = "tbPriceO"; this.tbPriceO.ReadOnly = true; this.tbPriceO.Size = new System.Drawing.Size(129, 34); @@ -525,7 +473,7 @@ namespace FEQ0000.Purchase // this.tbQty.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbQty.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbQty.Location = new System.Drawing.Point(104, 79); + this.tbQty.Location = new System.Drawing.Point(104, 86); this.tbQty.Name = "tbQty"; this.tbQty.ReadOnly = true; this.tbQty.Size = new System.Drawing.Size(127, 34); @@ -533,19 +481,21 @@ namespace FEQ0000.Purchase // // tbUnit // + this.tbUnit.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); this.tbUnit.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbUnit.Location = new System.Drawing.Point(413, 54); + this.tbUnit.Location = new System.Drawing.Point(302, 53); this.tbUnit.Name = "tbUnit"; this.tbUnit.ReadOnly = true; - this.tbUnit.Size = new System.Drawing.Size(127, 21); + this.tbUnit.Size = new System.Drawing.Size(127, 30); this.tbUnit.TabIndex = 7; // // tbModel // + this.tbModel.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F); this.tbModel.Location = new System.Drawing.Point(104, 53); this.tbModel.Name = "tbModel"; this.tbModel.ReadOnly = true; - this.tbModel.Size = new System.Drawing.Size(302, 21); + this.tbModel.Size = new System.Drawing.Size(192, 30); this.tbModel.TabIndex = 3; // // arLabel1 @@ -554,10 +504,10 @@ namespace FEQ0000.Purchase this.arLabel1.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel1.Dock = System.Windows.Forms.DockStyle.Top; this.arLabel1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.arLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel1.ForeColor = System.Drawing.Color.Black; this.arLabel1.Location = new System.Drawing.Point(0, 0); this.arLabel1.Name = "arLabel1"; - this.arLabel1.Size = new System.Drawing.Size(584, 23); + this.arLabel1.Size = new System.Drawing.Size(582, 23); this.arLabel1.TabIndex = 86; this.arLabel1.Text = "품목정보"; this.arLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -565,32 +515,41 @@ namespace FEQ0000.Purchase // tbPumname // this.tbPumname.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPumname.Location = new System.Drawing.Point(104, 30); + this.tbPumname.Location = new System.Drawing.Point(104, 29); this.tbPumname.Name = "tbPumname"; this.tbPumname.ReadOnly = true; - this.tbPumname.Size = new System.Drawing.Size(303, 21); + this.tbPumname.Size = new System.Drawing.Size(325, 21); this.tbPumname.TabIndex = 1; // // textBox16 // - this.textBox16.Location = new System.Drawing.Point(413, 30); + this.textBox16.Location = new System.Drawing.Point(433, 29); this.textBox16.Name = "textBox16"; this.textBox16.ReadOnly = true; - this.textBox16.Size = new System.Drawing.Size(127, 21); + this.textBox16.Size = new System.Drawing.Size(137, 21); this.textBox16.TabIndex = 9; this.textBox16.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // tbPO + // + this.tbPO.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbPO.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbPO.Location = new System.Drawing.Point(110, 298); + this.tbPO.Name = "tbPO"; + this.tbPO.Size = new System.Drawing.Size(320, 38); + this.tbPO.TabIndex = 104; + // // panel3 // this.panel3.BackColor = System.Drawing.Color.Gainsboro; + this.panel3.Controls.Add(label14); + this.panel3.Controls.Add(label7); this.panel3.Controls.Add(this.tbInPrice); this.panel3.Controls.Add(label13); this.panel3.Controls.Add(receiveLabel); this.panel3.Controls.Add(this.tbPO); - this.panel3.Controls.Add(label14); this.panel3.Controls.Add(this.cmbReceive); this.panel3.Controls.Add(this.tbInRemark); - this.panel3.Controls.Add(label7); this.panel3.Controls.Add(this.tbInQty); this.panel3.Controls.Add(label8); this.panel3.Controls.Add(this.chkInDate); @@ -598,16 +557,16 @@ namespace FEQ0000.Purchase this.panel3.Controls.Add(this.btOK); this.panel3.Controls.Add(this.arLabel3); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 381); + this.panel3.Location = new System.Drawing.Point(0, 363); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(584, 348); + this.panel3.Padding = new System.Windows.Forms.Padding(0, 0, 10, 10); + this.panel3.Size = new System.Drawing.Size(582, 351); this.panel3.TabIndex = 89; // // tbInPrice // - this.tbInPrice.Enabled = false; this.tbInPrice.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbInPrice.Location = new System.Drawing.Point(120, 183); + this.tbInPrice.Location = new System.Drawing.Point(110, 183); this.tbInPrice.Margin = new System.Windows.Forms.Padding(4); this.tbInPrice.Name = "tbInPrice"; this.tbInPrice.Size = new System.Drawing.Size(319, 34); @@ -623,7 +582,7 @@ namespace FEQ0000.Purchase this.cmbReceive.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbReceive.FormattingEnabled = true; this.cmbReceive.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.cmbReceive.Location = new System.Drawing.Point(24, 59); + this.cmbReceive.Location = new System.Drawing.Point(14, 59); this.cmbReceive.Margin = new System.Windows.Forms.Padding(4); this.cmbReceive.Name = "cmbReceive"; this.cmbReceive.Size = new System.Drawing.Size(415, 45); @@ -632,7 +591,7 @@ namespace FEQ0000.Purchase // tbInRemark // this.tbInRemark.Enabled = false; - this.tbInRemark.Location = new System.Drawing.Point(120, 221); + this.tbInRemark.Location = new System.Drawing.Point(110, 221); this.tbInRemark.Margin = new System.Windows.Forms.Padding(4); this.tbInRemark.Multiline = true; this.tbInRemark.Name = "tbInRemark"; @@ -643,7 +602,7 @@ namespace FEQ0000.Purchase // this.tbInQty.Enabled = false; this.tbInQty.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbInQty.Location = new System.Drawing.Point(120, 145); + this.tbInQty.Location = new System.Drawing.Point(110, 145); this.tbInQty.Margin = new System.Windows.Forms.Padding(4); this.tbInQty.Name = "tbInQty"; this.tbInQty.Size = new System.Drawing.Size(319, 34); @@ -653,7 +612,7 @@ namespace FEQ0000.Purchase // this.chkInDate.AutoSize = true; this.chkInDate.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.chkInDate.Location = new System.Drawing.Point(24, 112); + this.chkInDate.Location = new System.Drawing.Point(14, 111); this.chkInDate.Margin = new System.Windows.Forms.Padding(4); this.chkInDate.Name = "chkInDate"; this.chkInDate.Size = new System.Drawing.Size(91, 32); @@ -667,7 +626,7 @@ namespace FEQ0000.Purchase // this.dtInDate.Enabled = false; this.dtInDate.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.dtInDate.Location = new System.Drawing.Point(120, 110); + this.dtInDate.Location = new System.Drawing.Point(110, 110); this.dtInDate.Margin = new System.Windows.Forms.Padding(4); this.dtInDate.Name = "dtInDate"; this.dtInDate.Size = new System.Drawing.Size(319, 34); @@ -678,9 +637,9 @@ namespace FEQ0000.Purchase // this.btOK.Dock = System.Windows.Forms.DockStyle.Right; this.btOK.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btOK.Location = new System.Drawing.Point(445, 23); + this.btOK.Location = new System.Drawing.Point(433, 23); this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(139, 325); + this.btOK.Size = new System.Drawing.Size(139, 318); this.btOK.TabIndex = 102; this.btOK.Text = "등록"; this.btOK.UseVisualStyleBackColor = true; @@ -692,19 +651,89 @@ namespace FEQ0000.Purchase this.arLabel3.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel3.Dock = System.Windows.Forms.DockStyle.Top; this.arLabel3.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.arLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel3.ForeColor = System.Drawing.Color.Black; this.arLabel3.Location = new System.Drawing.Point(0, 0); this.arLabel3.Name = "arLabel3"; - this.arLabel3.Size = new System.Drawing.Size(584, 23); + this.arLabel3.Size = new System.Drawing.Size(572, 23); this.arLabel3.TabIndex = 86; this.arLabel3.Text = "입고정보"; this.arLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // tbSID + // + this.tbSID.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbSID.Location = new System.Drawing.Point(433, 53); + this.tbSID.Name = "tbSID"; + this.tbSID.ReadOnly = true; + this.tbSID.Size = new System.Drawing.Size(137, 30); + this.tbSID.TabIndex = 108; + this.tbSID.Text = "000000000"; + this.tbSID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tbSCRCF + // + this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbSCRCF.Location = new System.Drawing.Point(338, 147); + this.tbSCRCF.Name = "tbSCRCF"; + this.tbSCRCF.ReadOnly = true; + this.tbSCRCF.Size = new System.Drawing.Size(232, 38); + this.tbSCRCF.TabIndex = 112; + // + // tbSC + // + this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbSC.Location = new System.Drawing.Point(104, 147); + this.tbSC.Name = "tbSC"; + this.tbSC.ReadOnly = true; + this.tbSC.Size = new System.Drawing.Size(232, 38); + this.tbSC.TabIndex = 111; + // + // label10 + // + label10.AutoSize = true; + label10.Location = new System.Drawing.Point(40, 171); + label10.Name = "label10"; + label10.Size = new System.Drawing.Size(58, 12); + label10.TabIndex = 109; + label10.Text = "SCR/CF#"; + // + // label15 + // + label15.AutoSize = true; + label15.Location = new System.Drawing.Point(76, 152); + label15.Name = "label15"; + label15.Size = new System.Drawing.Size(22, 12); + label15.TabIndex = 110; + label15.Text = "SC"; + // + // label14 + // + label14.AutoSize = true; + label14.Font = new System.Drawing.Font("맑은 고딕", 15F); + label14.Location = new System.Drawing.Point(67, 303); + label14.Name = "label14"; + label14.Size = new System.Drawing.Size(38, 28); + label14.TabIndex = 115; + label14.Text = "PO"; + // + // label7 + // + label7.AutoSize = true; + label7.Font = new System.Drawing.Font("맑은 고딕", 15F); + label7.Location = new System.Drawing.Point(53, 221); + label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label7.Name = "label7"; + label7.Size = new System.Drawing.Size(52, 28); + label7.TabIndex = 116; + label7.Text = "비고"; + // // fPurchaseNR_Ipgo // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(584, 729); + this.ClientSize = new System.Drawing.Size(582, 714); this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); @@ -753,12 +782,13 @@ namespace FEQ0000.Purchase private System.Windows.Forms.TextBox tbPrjStatus; private System.Windows.Forms.ComboBox cmbReceive; private System.Windows.Forms.TextBox tbInPrice; - private System.Windows.Forms.TextBox tbSCRCF; - private System.Windows.Forms.TextBox tbSC; private System.Windows.Forms.TextBox tbPO; private System.Windows.Forms.TextBox tbRemarkO; private System.Windows.Forms.TextBox tbAmt; private System.Windows.Forms.TextBox tbPriceO; private System.Windows.Forms.TextBox tbQty; + private System.Windows.Forms.TextBox tbSID; + private System.Windows.Forms.TextBox tbSCRCF; + private System.Windows.Forms.TextBox tbSC; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.cs b/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.cs index ca1217f..d20cc49 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.cs +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.cs @@ -53,6 +53,7 @@ namespace FEQ0000.Purchase if (string.IsNullOrEmpty(tbPO.Text)) tbPO.Text = this.po; tbSC.Text = dr.sc; tbSCRCF.Text = dr.orderno; + tbSID.Text = dr.sid; //프로젝트정보 찾는다 var tap = new DSPrjTableAdapters.ProjectsTableAdapter(); @@ -96,7 +97,8 @@ namespace FEQ0000.Purchase } else dtInDate.Value = DateTime.Now; chkInDate.Checked = true; - tbInQty.Text = dr.inqty.ToString(); + if (dr.IsinqtyNull()) tbInQty.Text = string.Empty; + else tbInQty.Text = dr.inqty.ToString(); tbInRemark.Text = dr.inremark; } else @@ -140,6 +142,7 @@ namespace FEQ0000.Purchase if (int.TryParse(tbInQty.Text, out int qty) == false) { FCOMMON.Util.MsgE("수량을 확인하세요"); + tbInQty.Text = tbQty.Text.Trim(); tbInQty.Focus(); tbInQty.SelectAll(); return; diff --git a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx b/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx index 6166a53..ae79cfe 100644 --- a/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx +++ b/SubProject/FEQ0000/Purchase/fPurchaseNR_Ipgo.resx @@ -153,9 +153,6 @@ False - - False - False @@ -165,16 +162,34 @@ False - - False - - - False - False False + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.Designer.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.Designer.cs index 451e240..cda69a0 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.Designer.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.Designer.cs @@ -49,6 +49,7 @@ namespace FEQ0000.Purchase System.Windows.Forms.Label label13; System.Windows.Forms.Label label14; System.Windows.Forms.Label label10; + System.Windows.Forms.Label label16; this.panel1 = new System.Windows.Forms.Panel(); this.tbPrjStatus = new System.Windows.Forms.TextBox(); this.tbPrjIdx = new System.Windows.Forms.TextBox(); @@ -61,10 +62,10 @@ namespace FEQ0000.Purchase this.arLabel2 = new System.Windows.Forms.Label(); this.tbPrjName = new System.Windows.Forms.TextBox(); this.tbIdx = new System.Windows.Forms.TextBox(); + this.tbPumIdx = new System.Windows.Forms.TextBox(); this.panel2 = new System.Windows.Forms.Panel(); this.tbSCRCF = new System.Windows.Forms.TextBox(); this.tbSC = new System.Windows.Forms.TextBox(); - this.tbPO = new System.Windows.Forms.TextBox(); this.tbRemarkO = new System.Windows.Forms.TextBox(); this.tbAmt = new System.Windows.Forms.TextBox(); this.tbPriceO = new System.Windows.Forms.TextBox(); @@ -73,7 +74,7 @@ namespace FEQ0000.Purchase this.tbModel = new System.Windows.Forms.TextBox(); this.arLabel1 = new System.Windows.Forms.Label(); this.tbPumname = new System.Windows.Forms.TextBox(); - this.textBox16 = new System.Windows.Forms.TextBox(); + this.tbPO = new System.Windows.Forms.TextBox(); this.panel3 = new System.Windows.Forms.Panel(); this.tbInPrice = new System.Windows.Forms.TextBox(); this.tbInRemark = new System.Windows.Forms.TextBox(); @@ -83,6 +84,7 @@ namespace FEQ0000.Purchase this.cmbReceive = new System.Windows.Forms.ComboBox(); this.btOK = new System.Windows.Forms.Button(); this.arLabel3 = new System.Windows.Forms.Label(); + this.tbSID = new System.Windows.Forms.TextBox(); label17 = new System.Windows.Forms.Label(); label12 = new System.Windows.Forms.Label(); label11 = new System.Windows.Forms.Label(); @@ -103,6 +105,7 @@ namespace FEQ0000.Purchase label13 = new System.Windows.Forms.Label(); label14 = new System.Windows.Forms.Label(); label10 = new System.Windows.Forms.Label(); + label16 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); this.panel3.SuspendLayout(); @@ -111,7 +114,7 @@ namespace FEQ0000.Purchase // label17 // label17.AutoSize = true; - label17.Location = new System.Drawing.Point(338, 170); + label17.Location = new System.Drawing.Point(298, 157); label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label17.Name = "label17"; label17.Size = new System.Drawing.Size(68, 12); @@ -121,7 +124,7 @@ namespace FEQ0000.Purchase // label12 // label12.AutoSize = true; - label12.Location = new System.Drawing.Point(56, 168); + label12.Location = new System.Drawing.Point(56, 155); label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label12.Name = "label12"; label12.Size = new System.Drawing.Size(29, 12); @@ -131,7 +134,7 @@ namespace FEQ0000.Purchase // label11 // label11.AutoSize = true; - label11.Location = new System.Drawing.Point(300, 145); + label11.Location = new System.Drawing.Point(323, 132); label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label11.Name = "label11"; label11.Size = new System.Drawing.Size(43, 12); @@ -141,7 +144,7 @@ namespace FEQ0000.Purchase // label5 // label5.AutoSize = true; - label5.Location = new System.Drawing.Point(39, 144); + label5.Location = new System.Drawing.Point(39, 131); label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label5.Name = "label5"; label5.Size = new System.Drawing.Size(46, 12); @@ -151,7 +154,7 @@ namespace FEQ0000.Purchase // label9 // label9.AutoSize = true; - label9.Location = new System.Drawing.Point(27, 99); + label9.Location = new System.Drawing.Point(27, 107); label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label9.Name = "label9"; label9.Size = new System.Drawing.Size(58, 12); @@ -161,7 +164,7 @@ namespace FEQ0000.Purchase // label4 // label4.AutoSize = true; - label4.Location = new System.Drawing.Point(56, 78); + label4.Location = new System.Drawing.Point(56, 83); label4.Name = "label4"; label4.Size = new System.Drawing.Size(29, 12); label4.TabIndex = 6; @@ -170,7 +173,7 @@ namespace FEQ0000.Purchase // assetLabel // assetLabel.AutoSize = true; - assetLabel.Location = new System.Drawing.Point(24, 56); + assetLabel.Location = new System.Drawing.Point(24, 59); assetLabel.Name = "assetLabel"; assetLabel.Size = new System.Drawing.Size(61, 12); assetLabel.TabIndex = 2; @@ -179,7 +182,7 @@ namespace FEQ0000.Purchase // label3 // label3.AutoSize = true; - label3.Location = new System.Drawing.Point(382, 78); + label3.Location = new System.Drawing.Point(382, 83); label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label3.Name = "label3"; label3.Size = new System.Drawing.Size(24, 12); @@ -189,7 +192,7 @@ namespace FEQ0000.Purchase // label2 // label2.AutoSize = true; - label2.Location = new System.Drawing.Point(377, 56); + label2.Location = new System.Drawing.Point(377, 59); label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label2.Name = "label2"; label2.Size = new System.Drawing.Size(29, 12); @@ -199,7 +202,7 @@ namespace FEQ0000.Purchase // nameLabel // nameLabel.AutoSize = true; - nameLabel.Location = new System.Drawing.Point(32, 34); + nameLabel.Location = new System.Drawing.Point(32, 35); nameLabel.Name = "nameLabel"; nameLabel.Size = new System.Drawing.Size(53, 12); nameLabel.TabIndex = 0; @@ -208,16 +211,16 @@ namespace FEQ0000.Purchase // label15 // label15.AutoSize = true; - label15.Location = new System.Drawing.Point(39, 56); + label15.Location = new System.Drawing.Point(14, 62); label15.Name = "label15"; - label15.Size = new System.Drawing.Size(59, 12); + label15.Size = new System.Drawing.Size(84, 12); label15.TabIndex = 6; - label15.Text = "모델/단위"; + label15.Text = "모델/단위/SID"; // // label20 // label20.AutoSize = true; - label20.Location = new System.Drawing.Point(69, 34); + label20.Location = new System.Drawing.Point(69, 33); label20.Name = "label20"; label20.Size = new System.Drawing.Size(29, 12); label20.TabIndex = 0; @@ -226,7 +229,7 @@ namespace FEQ0000.Purchase // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(9, 91); + label1.Location = new System.Drawing.Point(9, 98); label1.Name = "label1"; label1.Size = new System.Drawing.Size(89, 12); label1.TabIndex = 87; @@ -235,7 +238,7 @@ namespace FEQ0000.Purchase // label6 // label6.AutoSize = true; - label6.Location = new System.Drawing.Point(69, 121); + label6.Location = new System.Drawing.Point(69, 128); label6.Name = "label6"; label6.Size = new System.Drawing.Size(29, 12); label6.TabIndex = 87; @@ -244,18 +247,19 @@ namespace FEQ0000.Purchase // label7 // label7.AutoSize = true; - label7.Location = new System.Drawing.Point(45, 238); + label7.Font = new System.Drawing.Font("맑은 고딕", 15F); + label7.Location = new System.Drawing.Point(49, 223); label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label7.Name = "label7"; - label7.Size = new System.Drawing.Size(63, 12); + label7.Size = new System.Drawing.Size(52, 28); label7.TabIndex = 109; - label7.Text = "비고(입고)"; + label7.Text = "비고"; // // label8 // label8.AutoSize = true; label8.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - label8.Location = new System.Drawing.Point(16, 153); + label8.Location = new System.Drawing.Point(9, 145); label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label8.Name = "label8"; label8.Size = new System.Drawing.Size(92, 28); @@ -265,7 +269,7 @@ namespace FEQ0000.Purchase // receiveLabel // receiveLabel.AutoSize = true; - receiveLabel.Location = new System.Drawing.Point(18, 35); + receiveLabel.Location = new System.Drawing.Point(10, 35); receiveLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); receiveLabel.Name = "receiveLabel"; receiveLabel.Size = new System.Drawing.Size(41, 12); @@ -276,7 +280,7 @@ namespace FEQ0000.Purchase // label13.AutoSize = true; label13.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - label13.Location = new System.Drawing.Point(56, 195); + label13.Location = new System.Drawing.Point(49, 183); label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label13.Name = "label13"; label13.Size = new System.Drawing.Size(52, 28); @@ -286,20 +290,21 @@ namespace FEQ0000.Purchase // label14 // label14.AutoSize = true; - label14.Location = new System.Drawing.Point(85, 314); + label14.Font = new System.Drawing.Font("맑은 고딕", 15F); + label14.Location = new System.Drawing.Point(63, 293); label14.Name = "label14"; - label14.Size = new System.Drawing.Size(22, 12); + label14.Size = new System.Drawing.Size(38, 28); label14.TabIndex = 92; label14.Text = "PO"; // // label10 // label10.AutoSize = true; - label10.Location = new System.Drawing.Point(9, 158); + label10.Location = new System.Drawing.Point(76, 155); label10.Name = "label10"; - label10.Size = new System.Drawing.Size(89, 12); + label10.Size = new System.Drawing.Size(22, 12); label10.TabIndex = 94; - label10.Text = "SC / SCR/CF#"; + label10.Text = "SC"; // // panel1 // @@ -328,40 +333,40 @@ namespace FEQ0000.Purchase this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(584, 193); + this.panel1.Size = new System.Drawing.Size(582, 183); this.panel1.TabIndex = 87; // // tbPrjStatus // - this.tbPrjStatus.Location = new System.Drawing.Point(413, 52); + this.tbPrjStatus.Location = new System.Drawing.Point(413, 55); this.tbPrjStatus.Name = "tbPrjStatus"; this.tbPrjStatus.ReadOnly = true; - this.tbPrjStatus.Size = new System.Drawing.Size(127, 21); + this.tbPrjStatus.Size = new System.Drawing.Size(158, 21); this.tbPrjStatus.TabIndex = 99; this.tbPrjStatus.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // tbPrjIdx // this.tbPrjIdx.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); - this.tbPrjIdx.Location = new System.Drawing.Point(413, 165); + this.tbPrjIdx.Location = new System.Drawing.Point(373, 152); this.tbPrjIdx.Name = "tbPrjIdx"; this.tbPrjIdx.ReadOnly = true; - this.tbPrjIdx.Size = new System.Drawing.Size(127, 21); + this.tbPrjIdx.Size = new System.Drawing.Size(198, 21); this.tbPrjIdx.TabIndex = 98; this.tbPrjIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // tbPrjSerial // - this.tbPrjSerial.Location = new System.Drawing.Point(350, 141); + this.tbPrjSerial.Location = new System.Drawing.Point(373, 128); this.tbPrjSerial.Name = "tbPrjSerial"; this.tbPrjSerial.ReadOnly = true; - this.tbPrjSerial.Size = new System.Drawing.Size(190, 21); + this.tbPrjSerial.Size = new System.Drawing.Size(198, 21); this.tbPrjSerial.TabIndex = 95; this.tbPrjSerial.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // tbPrjModel // - this.tbPrjModel.Location = new System.Drawing.Point(93, 139); + this.tbPrjModel.Location = new System.Drawing.Point(93, 126); this.tbPrjModel.Name = "tbPrjModel"; this.tbPrjModel.ReadOnly = true; this.tbPrjModel.Size = new System.Drawing.Size(190, 21); @@ -372,7 +377,7 @@ namespace FEQ0000.Purchase // this.tbPrjProcess.Font = new System.Drawing.Font("굴림", 9F); this.tbPrjProcess.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPrjProcess.Location = new System.Drawing.Point(93, 165); + this.tbPrjProcess.Location = new System.Drawing.Point(93, 152); this.tbPrjProcess.Name = "tbPrjProcess"; this.tbPrjProcess.ReadOnly = true; this.tbPrjProcess.Size = new System.Drawing.Size(190, 21); @@ -380,17 +385,17 @@ namespace FEQ0000.Purchase // // tbProjOrderNo // - this.tbProjOrderNo.Location = new System.Drawing.Point(93, 96); + this.tbProjOrderNo.Location = new System.Drawing.Point(93, 104); this.tbProjOrderNo.Name = "tbProjOrderNo"; this.tbProjOrderNo.ReadOnly = true; - this.tbProjOrderNo.Size = new System.Drawing.Size(447, 21); + this.tbProjOrderNo.Size = new System.Drawing.Size(478, 21); this.tbProjOrderNo.TabIndex = 13; this.tbProjOrderNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // tbPrjMemo // this.tbPrjMemo.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPrjMemo.Location = new System.Drawing.Point(93, 74); + this.tbPrjMemo.Location = new System.Drawing.Point(93, 79); this.tbPrjMemo.Name = "tbPrjMemo"; this.tbPrjMemo.ReadOnly = true; this.tbPrjMemo.Size = new System.Drawing.Size(252, 21); @@ -398,7 +403,7 @@ namespace FEQ0000.Purchase // // tbPrjAsset // - this.tbPrjAsset.Location = new System.Drawing.Point(93, 52); + this.tbPrjAsset.Location = new System.Drawing.Point(93, 55); this.tbPrjAsset.Name = "tbPrjAsset"; this.tbPrjAsset.ReadOnly = true; this.tbPrjAsset.Size = new System.Drawing.Size(252, 21); @@ -410,10 +415,10 @@ namespace FEQ0000.Purchase this.arLabel2.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel2.Dock = System.Windows.Forms.DockStyle.Top; this.arLabel2.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.arLabel2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel2.ForeColor = System.Drawing.Color.Black; this.arLabel2.Location = new System.Drawing.Point(0, 0); this.arLabel2.Name = "arLabel2"; - this.arLabel2.Size = new System.Drawing.Size(584, 23); + this.arLabel2.Size = new System.Drawing.Size(582, 23); this.arLabel2.TabIndex = 86; this.arLabel2.Text = "프로젝트"; this.arLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -421,26 +426,37 @@ namespace FEQ0000.Purchase // tbPrjName // this.tbPrjName.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPrjName.Location = new System.Drawing.Point(93, 30); + this.tbPrjName.Location = new System.Drawing.Point(93, 31); this.tbPrjName.Name = "tbPrjName"; this.tbPrjName.ReadOnly = true; - this.tbPrjName.Size = new System.Drawing.Size(447, 21); + this.tbPrjName.Size = new System.Drawing.Size(478, 21); this.tbPrjName.TabIndex = 1; // // tbIdx // - this.tbIdx.Location = new System.Drawing.Point(413, 74); + this.tbIdx.Location = new System.Drawing.Point(413, 79); this.tbIdx.Name = "tbIdx"; this.tbIdx.ReadOnly = true; - this.tbIdx.Size = new System.Drawing.Size(127, 21); + this.tbIdx.Size = new System.Drawing.Size(158, 21); this.tbIdx.TabIndex = 9; this.tbIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // + // tbPumIdx + // + this.tbPumIdx.Location = new System.Drawing.Point(435, 29); + this.tbPumIdx.Name = "tbPumIdx"; + this.tbPumIdx.ReadOnly = true; + this.tbPumIdx.Size = new System.Drawing.Size(137, 21); + this.tbPumIdx.TabIndex = 9; + this.tbPumIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // panel2 // this.panel2.BackColor = System.Drawing.Color.Gainsboro; + this.panel2.Controls.Add(this.tbSID); this.panel2.Controls.Add(this.tbSCRCF); this.panel2.Controls.Add(this.tbSC); + this.panel2.Controls.Add(label16); this.panel2.Controls.Add(label10); this.panel2.Controls.Add(this.tbRemarkO); this.panel2.Controls.Add(this.tbAmt); @@ -454,18 +470,18 @@ namespace FEQ0000.Purchase this.panel2.Controls.Add(this.arLabel1); this.panel2.Controls.Add(this.tbPumname); this.panel2.Controls.Add(label20); - this.panel2.Controls.Add(this.textBox16); + this.panel2.Controls.Add(this.tbPumIdx); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; - this.panel2.Location = new System.Drawing.Point(0, 193); + this.panel2.Location = new System.Drawing.Point(0, 183); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(584, 194); + this.panel2.Size = new System.Drawing.Size(582, 196); this.panel2.TabIndex = 88; // // tbSCRCF // this.tbSCRCF.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbSCRCF.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbSCRCF.Location = new System.Drawing.Point(340, 145); + this.tbSCRCF.Location = new System.Drawing.Point(340, 150); this.tbSCRCF.Name = "tbSCRCF"; this.tbSCRCF.ReadOnly = true; this.tbSCRCF.Size = new System.Drawing.Size(232, 38); @@ -475,35 +491,26 @@ namespace FEQ0000.Purchase // this.tbSC.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbSC.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbSC.Location = new System.Drawing.Point(104, 144); + this.tbSC.Location = new System.Drawing.Point(104, 150); this.tbSC.Name = "tbSC"; this.tbSC.ReadOnly = true; this.tbSC.Size = new System.Drawing.Size(232, 38); this.tbSC.TabIndex = 95; // - // tbPO - // - this.tbPO.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbPO.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPO.Location = new System.Drawing.Point(113, 311); - this.tbPO.Name = "tbPO"; - this.tbPO.Size = new System.Drawing.Size(321, 38); - this.tbPO.TabIndex = 93; - // // tbRemarkO // this.tbRemarkO.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbRemarkO.Location = new System.Drawing.Point(104, 118); + this.tbRemarkO.Location = new System.Drawing.Point(104, 125); this.tbRemarkO.Name = "tbRemarkO"; this.tbRemarkO.ReadOnly = true; - this.tbRemarkO.Size = new System.Drawing.Size(437, 21); + this.tbRemarkO.Size = new System.Drawing.Size(468, 21); this.tbRemarkO.TabIndex = 91; // // tbAmt // this.tbAmt.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbAmt.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbAmt.Location = new System.Drawing.Point(372, 80); + this.tbAmt.Location = new System.Drawing.Point(372, 87); this.tbAmt.Name = "tbAmt"; this.tbAmt.ReadOnly = true; this.tbAmt.Size = new System.Drawing.Size(200, 34); @@ -514,7 +521,7 @@ namespace FEQ0000.Purchase // this.tbPriceO.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbPriceO.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPriceO.Location = new System.Drawing.Point(237, 80); + this.tbPriceO.Location = new System.Drawing.Point(237, 87); this.tbPriceO.Name = "tbPriceO"; this.tbPriceO.ReadOnly = true; this.tbPriceO.Size = new System.Drawing.Size(129, 34); @@ -525,7 +532,7 @@ namespace FEQ0000.Purchase // this.tbQty.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbQty.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbQty.Location = new System.Drawing.Point(104, 80); + this.tbQty.Location = new System.Drawing.Point(104, 87); this.tbQty.Name = "tbQty"; this.tbQty.ReadOnly = true; this.tbQty.Size = new System.Drawing.Size(127, 34); @@ -533,19 +540,21 @@ namespace FEQ0000.Purchase // // tbUnit // - this.tbUnit.Location = new System.Drawing.Point(413, 53); + this.tbUnit.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbUnit.Location = new System.Drawing.Point(302, 53); this.tbUnit.Name = "tbUnit"; this.tbUnit.ReadOnly = true; - this.tbUnit.Size = new System.Drawing.Size(127, 21); + this.tbUnit.Size = new System.Drawing.Size(127, 30); this.tbUnit.TabIndex = 13; this.tbUnit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // tbModel // + this.tbModel.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tbModel.Location = new System.Drawing.Point(104, 53); this.tbModel.Name = "tbModel"; this.tbModel.ReadOnly = true; - this.tbModel.Size = new System.Drawing.Size(302, 21); + this.tbModel.Size = new System.Drawing.Size(195, 30); this.tbModel.TabIndex = 3; // // arLabel1 @@ -554,10 +563,10 @@ namespace FEQ0000.Purchase this.arLabel1.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel1.Dock = System.Windows.Forms.DockStyle.Top; this.arLabel1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.arLabel1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel1.ForeColor = System.Drawing.Color.Black; this.arLabel1.Location = new System.Drawing.Point(0, 0); this.arLabel1.Name = "arLabel1"; - this.arLabel1.Size = new System.Drawing.Size(584, 23); + this.arLabel1.Size = new System.Drawing.Size(582, 23); this.arLabel1.TabIndex = 86; this.arLabel1.Text = "품목정보"; this.arLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -565,20 +574,20 @@ namespace FEQ0000.Purchase // tbPumname // this.tbPumname.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.tbPumname.Location = new System.Drawing.Point(104, 30); + this.tbPumname.Location = new System.Drawing.Point(104, 29); this.tbPumname.Name = "tbPumname"; this.tbPumname.ReadOnly = true; - this.tbPumname.Size = new System.Drawing.Size(303, 21); + this.tbPumname.Size = new System.Drawing.Size(325, 21); this.tbPumname.TabIndex = 1; // - // textBox16 + // tbPO // - this.textBox16.Location = new System.Drawing.Point(413, 30); - this.textBox16.Name = "textBox16"; - this.textBox16.ReadOnly = true; - this.textBox16.Size = new System.Drawing.Size(127, 21); - this.textBox16.TabIndex = 9; - this.textBox16.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbPO.Font = new System.Drawing.Font("굴림", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbPO.ImeMode = System.Windows.Forms.ImeMode.Hangul; + this.tbPO.Location = new System.Drawing.Point(106, 290); + this.tbPO.Name = "tbPO"; + this.tbPO.Size = new System.Drawing.Size(321, 38); + this.tbPO.TabIndex = 93; // // panel3 // @@ -598,16 +607,17 @@ namespace FEQ0000.Purchase this.panel3.Controls.Add(this.btOK); this.panel3.Controls.Add(this.arLabel3); this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel3.Location = new System.Drawing.Point(0, 387); + this.panel3.Location = new System.Drawing.Point(0, 379); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(584, 353); + this.panel3.Padding = new System.Windows.Forms.Padding(0, 0, 10, 10); + this.panel3.Size = new System.Drawing.Size(582, 339); this.panel3.TabIndex = 89; // // tbInPrice // this.tbInPrice.Enabled = false; this.tbInPrice.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbInPrice.Location = new System.Drawing.Point(113, 191); + this.tbInPrice.Location = new System.Drawing.Point(106, 179); this.tbInPrice.Margin = new System.Windows.Forms.Padding(4); this.tbInPrice.Name = "tbInPrice"; this.tbInPrice.Size = new System.Drawing.Size(321, 34); @@ -617,7 +627,7 @@ namespace FEQ0000.Purchase // tbInRemark // this.tbInRemark.Enabled = false; - this.tbInRemark.Location = new System.Drawing.Point(113, 234); + this.tbInRemark.Location = new System.Drawing.Point(106, 216); this.tbInRemark.Margin = new System.Windows.Forms.Padding(4); this.tbInRemark.Multiline = true; this.tbInRemark.Name = "tbInRemark"; @@ -628,7 +638,7 @@ namespace FEQ0000.Purchase // this.tbInQty.Enabled = false; this.tbInQty.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.tbInQty.Location = new System.Drawing.Point(113, 149); + this.tbInQty.Location = new System.Drawing.Point(106, 142); this.tbInQty.Margin = new System.Windows.Forms.Padding(4); this.tbInQty.Name = "tbInQty"; this.tbInQty.Size = new System.Drawing.Size(321, 34); @@ -638,7 +648,7 @@ namespace FEQ0000.Purchase // this.chkInDate.AutoSize = true; this.chkInDate.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.chkInDate.Location = new System.Drawing.Point(17, 110); + this.chkInDate.Location = new System.Drawing.Point(10, 106); this.chkInDate.Margin = new System.Windows.Forms.Padding(4); this.chkInDate.Name = "chkInDate"; this.chkInDate.Size = new System.Drawing.Size(91, 32); @@ -652,7 +662,7 @@ namespace FEQ0000.Purchase // this.dtInDate.Enabled = false; this.dtInDate.Font = new System.Drawing.Font("맑은 고딕", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.dtInDate.Location = new System.Drawing.Point(113, 108); + this.dtInDate.Location = new System.Drawing.Point(106, 104); this.dtInDate.Margin = new System.Windows.Forms.Padding(4); this.dtInDate.Name = "dtInDate"; this.dtInDate.Size = new System.Drawing.Size(321, 34); @@ -668,7 +678,7 @@ namespace FEQ0000.Purchase this.cmbReceive.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.cmbReceive.FormattingEnabled = true; this.cmbReceive.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.cmbReceive.Location = new System.Drawing.Point(17, 56); + this.cmbReceive.Location = new System.Drawing.Point(10, 56); this.cmbReceive.Margin = new System.Windows.Forms.Padding(4); this.cmbReceive.Name = "cmbReceive"; this.cmbReceive.Size = new System.Drawing.Size(417, 45); @@ -678,9 +688,9 @@ namespace FEQ0000.Purchase // this.btOK.Dock = System.Windows.Forms.DockStyle.Right; this.btOK.Font = new System.Drawing.Font("맑은 고딕", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.btOK.Location = new System.Drawing.Point(445, 23); + this.btOK.Location = new System.Drawing.Point(433, 23); this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(139, 330); + this.btOK.Size = new System.Drawing.Size(139, 306); this.btOK.TabIndex = 102; this.btOK.Text = "등록"; this.btOK.UseVisualStyleBackColor = true; @@ -692,20 +702,40 @@ namespace FEQ0000.Purchase this.arLabel3.Cursor = System.Windows.Forms.Cursors.Arrow; this.arLabel3.Dock = System.Windows.Forms.DockStyle.Top; this.arLabel3.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.arLabel3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(85)))), ((int)(((byte)(85)))), ((int)(((byte)(85))))); + this.arLabel3.ForeColor = System.Drawing.Color.Black; this.arLabel3.Location = new System.Drawing.Point(0, 0); this.arLabel3.Name = "arLabel3"; - this.arLabel3.Size = new System.Drawing.Size(584, 23); + this.arLabel3.Size = new System.Drawing.Size(572, 23); this.arLabel3.TabIndex = 86; this.arLabel3.Text = "입고정보"; this.arLabel3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // + // label16 + // + label16.AutoSize = true; + label16.Location = new System.Drawing.Point(40, 174); + label16.Name = "label16"; + label16.Size = new System.Drawing.Size(58, 12); + label16.TabIndex = 94; + label16.Text = "SCR/CF#"; + // + // tbSID + // + this.tbSID.Font = new System.Drawing.Font("Microsoft Sans Serif", 15F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); + this.tbSID.Location = new System.Drawing.Point(435, 53); + this.tbSID.Name = "tbSID"; + this.tbSID.ReadOnly = true; + this.tbSID.Size = new System.Drawing.Size(137, 30); + this.tbSID.TabIndex = 97; + this.tbSID.Text = "000000000"; + this.tbSID.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // // fPurchaseCR_Ipgo // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.ClientSize = new System.Drawing.Size(584, 740); + this.ClientSize = new System.Drawing.Size(582, 718); this.Controls.Add(this.panel3); this.Controls.Add(this.panel2); this.Controls.Add(this.panel1); @@ -743,7 +773,7 @@ namespace FEQ0000.Purchase private System.Windows.Forms.TextBox tbModel; private System.Windows.Forms.Label arLabel1; private System.Windows.Forms.TextBox tbPumname; - private System.Windows.Forms.TextBox textBox16; + private System.Windows.Forms.TextBox tbPumIdx; private System.Windows.Forms.Panel panel3; private System.Windows.Forms.Label arLabel3; private System.Windows.Forms.TextBox tbQty; @@ -761,5 +791,6 @@ namespace FEQ0000.Purchase private System.Windows.Forms.TextBox tbPO; private System.Windows.Forms.TextBox tbSC; private System.Windows.Forms.TextBox tbSCRCF; + private System.Windows.Forms.TextBox tbSID; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs index dfc74ea..06044af 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.cs @@ -42,7 +42,7 @@ namespace FEQ0000.Purchase prestatus = dr.state; tbPumname.Text = dr.pumname; - textBox16.Text = dr.pumidx.ToString(); + tbPumIdx.Text = dr.pumidx.ToString(); tbModel.Text = dr.pumscale; tbUnit.Text = dr.pumunit; tbQty.Text = dr.pumqty.ToString(); @@ -54,6 +54,7 @@ namespace FEQ0000.Purchase if (string.IsNullOrEmpty(tbPO.Text)) tbPO.Text = this.po; tbSC.Text = dr.sc; tbSCRCF.Text = dr.orderno; + tbSID.Text = dr.sid; //프로젝트정보 찾는다 var tap = new DSPrjTableAdapters.ProjectsTableAdapter(); diff --git a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.resx b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.resx index 21a6fc4..942fd7d 100644 --- a/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.resx +++ b/SubProject/FEQ0000/PurchaseCR/fPurchaseCR_Ipgo.resx @@ -177,4 +177,10 @@ False + + False + + + False + \ No newline at end of file diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index 848ee1b..1fc97d7 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -2404,6 +2404,8 @@ namespace FEQ0000 { private global::System.Data.DataColumn columnorderno; + private global::System.Data.DataColumn columnsortkey; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public IpkolistDataTable() { @@ -2605,6 +2607,14 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn sortkeyColumn { + get { + return this.columnsortkey; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2663,7 +2673,8 @@ namespace FEQ0000 { string receive, string sc, string po, - string orderno) { + string orderno, + int sortkey) { IpkolistRow rowIpkolistRow = ((IpkolistRow)(this.NewRow())); object[] columnValuesArray = new object[] { source, @@ -2686,7 +2697,8 @@ namespace FEQ0000 { receive, sc, po, - orderno}; + orderno, + sortkey}; rowIpkolistRow.ItemArray = columnValuesArray; this.Rows.Add(rowIpkolistRow); return rowIpkolistRow; @@ -2738,6 +2750,7 @@ namespace FEQ0000 { this.columnsc = base.Columns["sc"]; this.columnpo = base.Columns["po"]; this.columnorderno = base.Columns["orderno"]; + this.columnsortkey = base.Columns["sortkey"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2785,6 +2798,8 @@ namespace FEQ0000 { base.Columns.Add(this.columnpo); this.columnorderno = new global::System.Data.DataColumn("orderno", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnorderno); + this.columnsortkey = new global::System.Data.DataColumn("sortkey", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnsortkey); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnsource, this.columnidx}, true)); @@ -2823,6 +2838,7 @@ namespace FEQ0000 { this.columnpo.MaxLength = 50; this.columnorderno.ReadOnly = true; this.columnorderno.MaxLength = 50; + this.columnsortkey.ReadOnly = true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3507,11 +3523,11 @@ namespace FEQ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int inqty { get { - try { - return ((int)(this[this.tablePurchase.inqtyColumn])); + if (this.IsinqtyNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'Purchase\' 테이블의 \'inqty\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tablePurchase.inqtyColumn])); } } set { @@ -5403,11 +5419,11 @@ namespace FEQ0000 { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public int inqty { get { - try { - return ((int)(this[this.tableIpkolist.inqtyColumn])); + if (this.IsinqtyNull()) { + return 0; } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("\'Ipkolist\' 테이블의 \'inqty\' 열의 값이 DBNull입니다.", e); + else { + return ((int)(this[this.tableIpkolist.inqtyColumn])); } } set { @@ -5479,6 +5495,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public int sortkey { + get { + try { + return ((int)(this[this.tableIpkolist.sortkeyColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'Ipkolist\' 테이블의 \'sortkey\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableIpkolist.sortkeyColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IspdateNull() { @@ -5706,6 +5738,18 @@ namespace FEQ0000 { public void SetordernoNull() { this[this.tableIpkolist.ordernoColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IssortkeyNull() { + return this.IsNull(this.tableIpkolist.sortkeyColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetsortkeyNull() { + this[this.tableIpkolist.sortkeyColumn] = global::System.Convert.DBNull; + } } ///

@@ -10158,6 +10202,7 @@ ORDER BY pdate DESC, idx DESC"; tableMapping.ColumnMappings.Add("sc", "sc"); tableMapping.ColumnMappings.Add("po", "po"); tableMapping.ColumnMappings.Add("orderno", "orderno"); + tableMapping.ColumnMappings.Add("sortkey", "sortkey"); this._adapter.TableMappings.Add(tableMapping); } @@ -10175,33 +10220,33 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = @"SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey FROM Purchase -WHERE (state IN ('PO', 'PR')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) UNION SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey FROM EETGW_PurchaseCR -WHERE (state IN ('PO', 'PR')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) -ORDER BY state, wdate DESC"; +WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +ORDER BY sortkey, wdate DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].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._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; this._commandCollection[1].CommandText = @"SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey FROM Purchase WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) UNION SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey FROM EETGW_PurchaseCR WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY source DESC, request, wdate DESC"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "indate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -10259,7 +10304,7 @@ ORDER BY source DESC, request, wdate DESC"; public virtual int FillByTodayIn(dsPurchase.IpkolistDataTable dataTable, string pdate, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((pdate == null)) { - this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("pdate"); } else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); @@ -10284,7 +10329,7 @@ ORDER BY source DESC, request, wdate DESC"; public virtual dsPurchase.IpkolistDataTable GetByTodayIn(string pdate, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((pdate == null)) { - this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + throw new global::System.ArgumentNullException("pdate"); } else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(pdate)); diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index 25d3d49..394aaf3 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -745,15 +745,15 @@ ORDER BY pdate DESC, idx DESC SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey FROM Purchase -WHERE (state IN ('PO', 'PR')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) UNION SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey FROM EETGW_PurchaseCR -WHERE (state IN ('PO', 'PR')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) -ORDER BY state, wdate DESC +WHERE (state IN ('PO', 'PR', 'Approving')) AND (pdate >= @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) +ORDER BY sortkey, wdate DESC @@ -784,24 +784,25 @@ ORDER BY state, wdate DESC + SELECT 'NR' AS source, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey FROM Purchase WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) UNION SELECT 'CR' AS Expr1, idx, pdate, state, sid, pumname, pumscale, pumqty, pumprice, pumamt, supply, project, bigo, wdate, dbo.getUserName(request) AS request, indate, inqty, - dbo.getUserName(receive) AS receive, sc, po, orderno + dbo.getUserName(receive) AS receive, sc, po, orderno, (CASE [state] WHEN 'PO' THEN 1 WHEN 'PR' THEN 2 ELSE 3 END) AS sortkey FROM EETGW_PurchaseCR WHERE (state = 'Received') AND (indate = @pdate) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY source DESC, request, wdate DESC - - + + @@ -1004,7 +1005,7 @@ ORDER BY source DESC, request, wdate DESC - + @@ -1237,14 +1238,14 @@ ORDER BY source DESC, request, wdate DESC - + - + @@ -1301,7 +1302,7 @@ ORDER BY source DESC, request, wdate DESC - + @@ -1330,6 +1331,7 @@ ORDER BY source DESC, request, wdate DESC + diff --git a/SubProject/FEQ0000/dsPurchase.xss b/SubProject/FEQ0000/dsPurchase.xss index 62b1248..40f8e0c 100644 --- a/SubProject/FEQ0000/dsPurchase.xss +++ b/SubProject/FEQ0000/dsPurchase.xss @@ -4,11 +4,11 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + \ No newline at end of file diff --git a/SubProject/FEQ0000/fItemin.cs b/SubProject/FEQ0000/fItemin.cs index 35a778f..243f464 100644 --- a/SubProject/FEQ0000/fItemin.cs +++ b/SubProject/FEQ0000/fItemin.cs @@ -175,7 +175,16 @@ namespace FEQ0000 var buf = tbSearch.Text.Split('#'); if (buf.Length > 5) { - lbSID.Text = buf[2].Trim(); + var sid = buf[2].Trim(); + if(decimal.TryParse(sid,out decimal sidnum)) + { + lbSID.Text = sidnum.ToString(); + } + else + { + lbSID.Text = sid; + } + var qty = buf[3].Trim(); lbCOST.Text = buf[5].Trim(); tbFind.Text = lbSID.Text;