From 340a6fd3ef48f403814f85159142a803fd655834 Mon Sep 17 00:00:00 2001 From: "chikyun.kim" Date: Tue, 2 Oct 2018 17:33:28 +0900 Subject: [PATCH] .. --- EETGW.v12.suo | Bin 446464 -> 0 bytes Project/Dialog/fLogin.cs | 4 +- Project/Properties/AssemblyInfo.cs | 12 +- Project/dsMSSQL.Designer.cs | 34 +- Project/dsMSSQL.xsd | 17 +- Project/fMain.Designer.cs | 58 ++-- Project/fMain.cs | 10 + Project/fMain.resx | 15 + SubProject/FCM0000/FCM0000.csproj | 9 + SubProject/FCM0000/dsMSSQL.Designer.cs | 316 ++++++++++++++---- SubProject/FCM0000/dsMSSQL.xsd | 79 +++-- SubProject/FCM0000/fItems.Designer.cs | 295 +++++++++++----- SubProject/FCM0000/fItems.cs | 90 ++++- SubProject/FCM0000/fItems.resx | 23 +- SubProject/FCM0000/fLovItem.Designer.cs | 301 +++++++++-------- SubProject/FCM0000/fLovItem.resx | 32 +- SubProject/FCOMMON/DataBaseManager.cs | 17 + SubProject/FEQ0000/FEQ0000.csproj | 5 +- .../FEQ0000/Properties/Resources.Designer.cs | 56 ++-- SubProject/FEQ0000/Properties/Resources.resx | 17 +- .../FEQ0000/Purchase/fPurchase.Designer.cs | 275 ++++++++++----- SubProject/FEQ0000/Purchase/fPurchase.cs | 98 +++++- SubProject/FEQ0000/Purchase/fPurchase.resx | 6 + SubProject/FEQ0000/Purchase/rPurchase.cs | 2 +- SubProject/FEQ0000/dsPurchase.Designer.cs | 19 +- SubProject/FEQ0000/dsPurchase.xsd | 5 +- 26 files changed, 1275 insertions(+), 520 deletions(-) delete mode 100644 EETGW.v12.suo diff --git a/EETGW.v12.suo b/EETGW.v12.suo deleted file mode 100644 index aa34d1da5a36999b6dbd14c51e2121fbec5d5f27..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 446464 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 z -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 CsP}mQ diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 211aa48..58de5f8 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -50,10 +50,12 @@ namespace Project.Dialog var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim()); var ta = new dsMSSQLTableAdapters.UsersTableAdapter(); - var users = ta.GetIDPW(tbID.Text.Trim(), encpass); + var users = ta.GetIDPW(encpass, tbID.Text.Trim()); if(users.Rows.Count < 1) { Util.MsgE("No user"); + tbPW.SelectAll(); + tbPW.Focus(); return; } else diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index 9367069..49e24aa 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ using System.Runtime.InteropServices; // 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 // 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 // 이러한 특성 값을 변경하세요. -[assembly: AssemblyTitle("Frame Project")] +[assembly: AssemblyTitle("Amkor K4-EET GroupWare")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Frame Project")] -[assembly: AssemblyProduct("Frame Project")] -[assembly: AssemblyCopyright("Copyright ©SIMP 2018")] +[assembly: AssemblyCompany("Amkor K4-EET")] +[assembly: AssemblyProduct("Amkor K4-EET GroupWare")] +[assembly: AssemblyCopyright("Copyright ©ATK4 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("18.09.28.0000")] -[assembly: AssemblyFileVersion("18.09.28.0000")] +[assembly: AssemblyVersion("18.10.02.0000")] +[assembly: AssemblyFileVersion("18.10.02.0000")] diff --git a/Project/dsMSSQL.Designer.cs b/Project/dsMSSQL.Designer.cs index 9200eeb..feb38e1 100644 --- a/Project/dsMSSQL.Designer.cs +++ b/Project/dsMSSQL.Designer.cs @@ -4469,12 +4469,14 @@ SELECT id, password, name, nameE, dept, grade, email, level, indate, outdate, te this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT dept, email, grade, hp, id, indate, level, memo, name, nameE, outdate, pa" + - "ssword, tel, wdate, wuid\r\nFROM Users\r\nWHERE (id = @id) AND (password = @enc" + - "pw) OR\r\n (password = @encpw) AND (email = @id)"; + this._commandCollection[1].CommandText = @"SELECT dept, email, grade, hp, id, indate, level, memo, name, nameE, outdate, password, tel, wdate, wuid +FROM Users +WHERE (password = @encpw) AND (level > 0) AND (email = @idkey) OR + (password = @encpw) AND (level > 0) AND (id = @idkey) OR + (password = @encpw) AND (level > 0) AND (email = { fn CONCAT(@idkey, '@amkor.co.kr') })"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@id", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "id", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@encpw", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "password", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idkey", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4505,19 +4507,19 @@ SELECT id, password, name, nameE, dept, grade, email, level, indate, outdate, te [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] - public virtual int FillIDPW(dsMSSQL.UsersDataTable dataTable, string id, string encpw) { + public virtual int FillIDPW(dsMSSQL.UsersDataTable dataTable, string encpw, string idkey) { this.Adapter.SelectCommand = this.CommandCollection[1]; - if ((id == null)) { - throw new global::System.ArgumentNullException("id"); + if ((encpw == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[0].Value = ((string)(id)); + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(encpw)); } - if ((encpw == null)) { + if ((idkey == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[1].Value = ((string)(encpw)); + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(idkey)); } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); @@ -4530,19 +4532,19 @@ SELECT id, password, name, nameE, dept, grade, email, level, indate, outdate, te [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual dsMSSQL.UsersDataTable GetIDPW(string id, string encpw) { + public virtual dsMSSQL.UsersDataTable GetIDPW(string encpw, string idkey) { this.Adapter.SelectCommand = this.CommandCollection[1]; - if ((id == null)) { - throw new global::System.ArgumentNullException("id"); + if ((encpw == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[0].Value = ((string)(id)); + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(encpw)); } - if ((encpw == null)) { + if ((idkey == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[1].Value = ((string)(encpw)); + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(idkey)); } dsMSSQL.UsersDataTable dataTable = new dsMSSQL.UsersDataTable(); this.Adapter.Fill(dataTable); diff --git a/Project/dsMSSQL.xsd b/Project/dsMSSQL.xsd index db7760f..0bbc620 100644 --- a/Project/dsMSSQL.xsd +++ b/Project/dsMSSQL.xsd @@ -149,11 +149,12 @@ SELECT id, password, name, nameE, dept, grade, email, level, indate, outdate, te SELECT dept, email, grade, hp, id, indate, level, memo, name, nameE, outdate, password, tel, wdate, wuid FROM Users -WHERE (id = @id) AND (password = @encpw) OR - (password = @encpw) AND (email = @id) +WHERE (password = @encpw) AND (level > 0) AND (email = @idkey) OR + (password = @encpw) AND (level > 0) AND (id = @idkey) OR + (password = @encpw) AND (level > 0) AND (email = { fn CONCAT(@idkey, '@amkor.co.kr') }) - + @@ -653,7 +654,7 @@ WHERE (idx = @idx) - + @@ -752,7 +753,7 @@ WHERE (idx = @idx) - + @@ -823,7 +824,7 @@ WHERE (idx = @idx) - + @@ -881,7 +882,7 @@ WHERE (idx = @idx) - + @@ -951,7 +952,7 @@ WHERE (idx = @idx) - + diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 280b00c..47ae20a 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -55,6 +55,7 @@ this.staffGridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.userInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mailFormToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.boardsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.minutesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.holidayToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -81,8 +82,8 @@ this.purchaseImportToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.purchaseDataConvertToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip = new System.Windows.Forms.ToolStrip(); - this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.cmVision.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); @@ -238,45 +239,52 @@ // itemsToolStripMenuItem // this.itemsToolStripMenuItem.Name = "itemsToolStripMenuItem"; - this.itemsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.itemsToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.itemsToolStripMenuItem.Text = "Items"; this.itemsToolStripMenuItem.Click += new System.EventHandler(this.itemsToolStripMenuItem_Click); // // codesToolStripMenuItem // this.codesToolStripMenuItem.Name = "codesToolStripMenuItem"; - this.codesToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.codesToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.codesToolStripMenuItem.Text = "Codes"; this.codesToolStripMenuItem.Click += new System.EventHandler(this.codesToolStripMenuItem_Click); // // lineCodeToolStripMenuItem // this.lineCodeToolStripMenuItem.Name = "lineCodeToolStripMenuItem"; - this.lineCodeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.lineCodeToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.lineCodeToolStripMenuItem.Text = "Line Code"; this.lineCodeToolStripMenuItem.Click += new System.EventHandler(this.lineCodeToolStripMenuItem_Click); // // staffGridToolStripMenuItem // this.staffGridToolStripMenuItem.Name = "staffGridToolStripMenuItem"; - this.staffGridToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.staffGridToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.staffGridToolStripMenuItem.Text = "Staff Grid"; this.staffGridToolStripMenuItem.Click += new System.EventHandler(this.staffGridToolStripMenuItem_Click); // // userInfoToolStripMenuItem // this.userInfoToolStripMenuItem.Name = "userInfoToolStripMenuItem"; - this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.userInfoToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.userInfoToolStripMenuItem.Text = "User Info"; this.userInfoToolStripMenuItem.Click += new System.EventHandler(this.userInfoToolStripMenuItem_Click); // // mailFormToolStripMenuItem // this.mailFormToolStripMenuItem.Name = "mailFormToolStripMenuItem"; - this.mailFormToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.mailFormToolStripMenuItem.Size = new System.Drawing.Size(129, 22); this.mailFormToolStripMenuItem.Text = "Mail Form"; this.mailFormToolStripMenuItem.Click += new System.EventHandler(this.mailFormToolStripMenuItem_Click); // + // customerToolStripMenuItem + // + this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; + this.customerToolStripMenuItem.Size = new System.Drawing.Size(129, 22); + this.customerToolStripMenuItem.Text = "Customer"; + this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click); + // // boardsToolStripMenuItem // this.boardsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -293,21 +301,21 @@ // minutesToolStripMenuItem // this.minutesToolStripMenuItem.Name = "minutesToolStripMenuItem"; - this.minutesToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.minutesToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.minutesToolStripMenuItem.Text = "Minutes"; this.minutesToolStripMenuItem.Click += new System.EventHandler(this.minutesToolStripMenuItem_Click); // // holidayToolStripMenuItem // this.holidayToolStripMenuItem.Name = "holidayToolStripMenuItem"; - this.holidayToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.holidayToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.holidayToolStripMenuItem.Text = "holiday"; this.holidayToolStripMenuItem.Click += new System.EventHandler(this.holidayToolStripMenuItem_Click); // // requestITemToolStripMenuItem // this.requestITemToolStripMenuItem.Name = "requestITemToolStripMenuItem"; - this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.requestITemToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.requestITemToolStripMenuItem.Text = "Request Item"; this.requestITemToolStripMenuItem.Click += new System.EventHandler(this.requestITemToolStripMenuItem_Click); // @@ -315,21 +323,21 @@ // this.freeBoardToolStripMenuItem.Enabled = false; this.freeBoardToolStripMenuItem.Name = "freeBoardToolStripMenuItem"; - this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.freeBoardToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.freeBoardToolStripMenuItem.Text = "Free Board"; // // bugReportToolStripMenuItem // this.bugReportToolStripMenuItem.Enabled = false; this.bugReportToolStripMenuItem.Name = "bugReportToolStripMenuItem"; - this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.bugReportToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.bugReportToolStripMenuItem.Text = "Bug Report"; // // todoListToolStripMenuItem // this.todoListToolStripMenuItem.Enabled = false; this.todoListToolStripMenuItem.Name = "todoListToolStripMenuItem"; - this.todoListToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.todoListToolStripMenuItem.Size = new System.Drawing.Size(144, 22); this.todoListToolStripMenuItem.Text = "Todo List"; // // managementToolStripMenuItem @@ -477,20 +485,14 @@ // toolStrip // this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripButton1}); + this.toolStripButton1, + this.toolStripButton2}); this.toolStrip.Location = new System.Drawing.Point(1, 25); this.toolStrip.Name = "toolStrip"; this.toolStrip.Size = new System.Drawing.Size(1035, 25); this.toolStrip.TabIndex = 32; this.toolStrip.Text = "ToolStrip"; // - // customerToolStripMenuItem - // - this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; - this.customerToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.customerToolStripMenuItem.Text = "Customer"; - this.customerToolStripMenuItem.Click += new System.EventHandler(this.customerToolStripMenuItem_Click); - // // toolStripButton1 // this.toolStripButton1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -498,9 +500,20 @@ this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; this.toolStripButton1.Size = new System.Drawing.Size(23, 22); - this.toolStripButton1.Text = "toolStripButton1"; + this.toolStripButton1.Text = "메일전송"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click); // + // toolStripButton2 + // + this.toolStripButton2.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image"))); + this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolStripButton2.Name = "toolStripButton2"; + this.toolStripButton2.Size = new System.Drawing.Size(23, 22); + this.toolStripButton2.Text = "구매신청"; + this.toolStripButton2.ToolTipText = "파트구매신청서 작성"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -586,6 +599,7 @@ private System.Windows.Forms.ToolStripMenuItem purchaseImportToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem purchaseDataConvertToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem customerToolStripMenuItem; + private System.Windows.Forms.ToolStripButton toolStripButton2; } } diff --git a/Project/fMain.cs b/Project/fMain.cs index f1f8c65..7b9f9eb 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -341,6 +341,11 @@ namespace Project private void toolStripButton1_Click(object sender, EventArgs e) { + if(FCOMMON.info.Login.level < 10) + { + FCOMMON.Util.MsgE("테스트 기능이므로 개발자만 사용가능 합니다."); + return; + } FCM0000.fSendMail f = new FCM0000.fSendMail(); f.MdiParent = this; f.Show(); @@ -373,5 +378,10 @@ namespace Project f.MdiParent = this; f.Show(); } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + nRPurchaseToolStripMenuItem.PerformClick(); + } } } diff --git a/Project/fMain.resx b/Project/fMain.resx index 2224691..6a0d496 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -148,6 +148,21 @@ nL1jEAaAAgpkACGng/CcsxAvoBgACuHHb76ANcNsR3YBsmaYAXauoQgD8vvWgw1AthlmO7pmEAapRTEA FK+gqAFJgDDIBlwYJA9Sq2nojDAA5OzQ7C44BsUxCINCGoRB/gVhkK0gDNKMkg4oAdAcMWCAgQEAUU2N V3HhzrYAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIWSURBVDhPY0iaV3E9aWbN/7SKvovplX3WDFAwrd5VbGad + +65pVS4WcH6N664pFW4qYAUwkDS/6lLSvKqLqZW9UakVfXcYGP4zTq10sZ9Z4/5254zoX7PrPN5PrnRz + nVXn9mrnjJg/cxrcH88pteKFakcFqdW9fzJmlL8pmZr9Z+bKkv+7dtf/37Qi79+UZr9/VzcV/vt6rvX/ + 0cWpP4GGHl0VGsoM1YYAqY1dn1vWzvo/6+TS/337Z/1v3jrhf/ma1v/pCyv/x88p/5+3uPp/w6ra/7Vz + C34VT0w9Fje7PAaqFQLSWjqv1M6f/n/Xg70YePvd3f9XXdn4f+7pZf8nHJz7v2Zjz9+EeRVvoVohIKm5 + ZXFeb/9vmKaefTOx0iA859Sy/8kLqi5AtUJAUmtranpDzx+Yorg5ZVhpEAa5AuiC1VCtEJDS0SGTVtX3 + f/u93QQNaNo++UfcnNIWqFYEAMbE34XH14EV4fNC8Zr2j7FzylKh2hAgtaH7Xde6+XCF2PCmW9v/J86r + /JEws8IUqg0BUpo7TiV1tfwFptDvMJw4v+JH4vxKBJ5X/jN5QU0/VAsqACbpjNTKvq1QLukgtaxXF2jI + +5SqfgOoEOkgo3bi4YzqCf8yayb9T6vsR8EZNRP/p1dN/J1TNwW7F0AgvWrCjznrDgEVTvgOFYIDfHJw + kAU0Pa1ywu/s2sk9UCE4QJVjYAAAy1mkyv1iYtYAAAAASUVORK5CYII= diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index bd10437..ab8acea 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -120,6 +120,12 @@ fItems.cs + + Form + + + fLovOneItem.cs + Form @@ -168,6 +174,9 @@ fItems.cs + + fLovOneItem.cs + fLovSupply.cs diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index 2036f3c..e515440 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -583,6 +583,10 @@ namespace FCM0000 { private global::System.Data.DataColumn columnsupplyidx; + private global::System.Data.DataColumn columnscale; + + private global::System.Data.DataColumn columnunit; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ItemsDataTable() { @@ -712,6 +716,22 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn scaleColumn { + get { + return this.columnscale; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn unitColumn { + get { + return this.columnunit; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -749,7 +769,7 @@ namespace FCM0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ItemsRow AddItemsRow(string name, string sid, string model, string manu, string supply, string memo, string wuid, System.DateTime wdate, decimal price, string cate, int supplyidx) { + public ItemsRow AddItemsRow(string name, string sid, string model, string manu, string supply, string memo, string wuid, System.DateTime wdate, decimal price, string cate, int supplyidx, double scale, string unit) { ItemsRow rowItemsRow = ((ItemsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -763,7 +783,9 @@ namespace FCM0000 { wdate, price, cate, - supplyidx}; + supplyidx, + scale, + unit}; rowItemsRow.ItemArray = columnValuesArray; this.Rows.Add(rowItemsRow); return rowItemsRow; @@ -805,6 +827,8 @@ namespace FCM0000 { this.columnprice = base.Columns["price"]; this.columncate = base.Columns["cate"]; this.columnsupplyidx = base.Columns["supplyidx"]; + this.columnscale = base.Columns["scale"]; + this.columnunit = base.Columns["unit"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -834,6 +858,10 @@ namespace FCM0000 { base.Columns.Add(this.columncate); this.columnsupplyidx = new global::System.Data.DataColumn("supplyidx", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnsupplyidx); + this.columnscale = new global::System.Data.DataColumn("scale", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnscale); + this.columnunit = new global::System.Data.DataColumn("unit", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnunit); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -852,6 +880,9 @@ namespace FCM0000 { this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; this.columncate.MaxLength = 20; + this.columnscale.DefaultValue = ((double)(1D)); + this.columnunit.DefaultValue = ((string)("EA")); + this.columnunit.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4593,6 +4624,38 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public double scale { + get { + if (this.IsscaleNull()) { + return 1D; + } + else { + return ((double)(this[this.tableItems.scaleColumn])); + } + } + set { + this[this.tableItems.scaleColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string unit { + get { + if (this.IsunitNull()) { + return "EA"; + } + else { + return ((string)(this[this.tableItems.unitColumn])); + } + } + set { + this[this.tableItems.unitColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsnameNull() { @@ -4700,6 +4763,30 @@ namespace FCM0000 { public void SetsupplyidxNull() { this[this.tableItems.supplyidxColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsscaleNull() { + return this.IsNull(this.tableItems.scaleColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetscaleNull() { + this[this.tableItems.scaleColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsunitNull() { + return this.IsNull(this.tableItems.unitColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetunitNull() { + this[this.tableItems.unitColumn] = global::System.Convert.DBNull; + } } /// @@ -7545,10 +7632,12 @@ namespace FCM0000.dsMSSQLTableAdapters { tableMapping.ColumnMappings.Add("price", "price"); tableMapping.ColumnMappings.Add("cate", "cate"); tableMapping.ColumnMappings.Add("supplyidx", "supplyidx"); + tableMapping.ColumnMappings.Add("scale", "scale"); + tableMapping.ColumnMappings.Add("unit", "unit"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; - this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Items] WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Items] WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_scale = 1 AND [scale] IS NULL) OR ([scale] = @Original_scale)) AND ((@IsNull_unit = 1 AND [unit] IS NULL) OR ([unit] = @Original_unit)))"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -7571,10 +7660,14 @@ namespace FCM0000.dsMSSQLTableAdapters { this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_scale", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_scale", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_unit", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_unit", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "unit", 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 [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx], [scale], [unit]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx, @scale, @unit); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name, idx"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; 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("@sid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7587,10 +7680,12 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 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("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scale", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "unit", 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 [Items] SET [name] = @name, [sid] = @sid, [model] = @model, [manu] = @manu, [supply] = @supply, [price] = @price, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [cate] = @cate, [supplyidx] = @supplyidx WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx))); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx FROM Items WHERE (idx = @idx) ORDER BY cate, name"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [Items] SET [name] = @name, [sid] = @sid, [model] = @model, [manu] = @manu, [supply] = @supply, [price] = @price, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [cate] = @cate, [supplyidx] = @supplyidx, [scale] = @scale, [unit] = @unit WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_scale = 1 AND [scale] IS NULL) OR ([scale] = @Original_scale)) AND ((@IsNull_unit = 1 AND [unit] IS NULL) OR ([unit] = @Original_unit))); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit FROM Items WHERE (idx = @idx) ORDER BY cate, name, idx"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.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.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -7603,6 +7698,8 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@scale", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@unit", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -7624,6 +7721,10 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supplyidx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supplyidx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_scale", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_scale", global::System.Data.SqlDbType.Float, 0, global::System.Data.ParameterDirection.Input, 0, 0, "scale", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_unit", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_unit", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "unit", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -7641,27 +7742,30 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp" + - "lyidx\r\nFROM Items\r\nORDER BY cate, name, idx"; + "lyidx, scale, unit\r\nFROM Items\r\nORDER BY cate, name, idx"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = @"SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx + this._commandCollection[1].CommandText = @"SELECT cate, idx, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (sid IN (SELECT sid FROM Items AS Items_1 GROUP BY sid - HAVING (COUNT(*) > 1))) AND (ISNULL(sid, '') <> '') -ORDER BY sid, cate, name, idx"; + HAVING (COUNT(*) > 1))) AND (ISNULL(sid, '') <> '') AND (cate LIKE @cate) +ORDER BY sid, name, idx"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = "SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate," + - " wuid\r\nFROM Items\r\nORDER BY cate, name, idx"; + this._commandCollection[2].CommandText = "SELECT cate, idx, manu, memo, model, name, price, scale, sid, supply, supplyidx," + + " unit, wdate, wuid\r\nFROM Items\r\nWHERE (cate LIKE @cate)\r\nORDER BY name, idx" + + ""; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate, wuid + this._commandCollection[3].CommandText = @"SELECT cate, idx, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (ISNULL(name, N'') LIKE @search) OR (ISNULL(sid, N'') LIKE @search) OR @@ -7669,13 +7773,13 @@ WHERE (ISNULL(name, N'') LIKE @search) OR (ISNULL(supply, N'') LIKE @search) OR (ISNULL(model, N'') LIKE @search) OR (ISNULL(memo, N'') LIKE @search) -ORDER BY cate, name, idx"; +ORDER BY name, idx"; 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[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = "SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate, " + - "wuid FROM Items WHERE (idx = @idx)"; + this._commandCollection[4].CommandText = "SELECT cate, idx, manu, memo, model, name, price, scale, sid, supply, supplyidx, " + + "unit, wdate, wuid FROM Items WHERE (idx = @idx)"; this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } @@ -7708,8 +7812,14 @@ ORDER BY cate, name, idx"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] - public virtual int FillDupCheck(dsMSSQL.ItemsDataTable dataTable) { + public virtual int FillDupCheck(dsMSSQL.ItemsDataTable dataTable, string cate) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((cate == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(cate)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -7721,8 +7831,14 @@ ORDER BY cate, name, idx"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual dsMSSQL.ItemsDataTable GetDupCheck() { + public virtual dsMSSQL.ItemsDataTable GetDupCheck(string cate) { this.Adapter.SelectCommand = this.CommandCollection[1]; + if ((cate == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(cate)); + } dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -7732,8 +7848,14 @@ ORDER BY cate, name, idx"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] - public virtual int FillNoImage(dsMSSQL.ItemsDataTable dataTable) { + public virtual int FillNoImage(dsMSSQL.ItemsDataTable dataTable, string cate) { this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((cate == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(cate)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -7745,8 +7867,14 @@ ORDER BY cate, name, idx"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual dsMSSQL.ItemsDataTable GetNoImage() { + public virtual dsMSSQL.ItemsDataTable GetNoImage(string cate) { this.Adapter.SelectCommand = this.CommandCollection[2]; + if ((cate == null)) { + this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(cate)); + } dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -7833,7 +7961,7 @@ ORDER BY cate, name, idx"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Delete, true)] - public virtual int Delete(int Original_idx, string Original_name, string Original_sid, string Original_model, string Original_manu, string Original_supply, global::System.Nullable Original_price, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_cate, global::System.Nullable Original_supplyidx) { + public virtual int Delete(int Original_idx, string Original_name, string Original_sid, string Original_model, string Original_manu, string Original_supply, global::System.Nullable Original_price, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_cate, global::System.Nullable Original_supplyidx, global::System.Nullable Original_scale, string Original_unit) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_name == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -7914,6 +8042,22 @@ ORDER BY cate, name, idx"; this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[20].Value = global::System.DBNull.Value; } + if ((Original_scale.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[22].Value = ((double)(Original_scale.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[22].Value = global::System.DBNull.Value; + } + if ((Original_unit == null)) { + this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[24].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[23].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[24].Value = ((string)(Original_unit)); + } global::System.Data.ConnectionState previousConnectionState = this.Adapter.DeleteCommand.Connection.State; if (((this.Adapter.DeleteCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -7934,7 +8078,7 @@ ORDER BY cate, name, idx"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Insert, true)] - public virtual int Insert(string name, string sid, string model, string manu, string supply, global::System.Nullable price, string memo, string wuid, System.DateTime wdate, string cate, global::System.Nullable supplyidx) { + public virtual int Insert(string name, string sid, string model, string manu, string supply, global::System.Nullable price, string memo, string wuid, System.DateTime wdate, string cate, global::System.Nullable supplyidx, global::System.Nullable scale, string unit) { if ((name == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -7996,6 +8140,18 @@ ORDER BY cate, name, idx"; else { this.Adapter.InsertCommand.Parameters[10].Value = global::System.DBNull.Value; } + if ((scale.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[11].Value = ((double)(scale.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[11].Value = global::System.DBNull.Value; + } + if ((unit == null)) { + this.Adapter.InsertCommand.Parameters[12].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[12].Value = ((string)(unit)); + } 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)) { @@ -8028,6 +8184,8 @@ ORDER BY cate, name, idx"; System.DateTime wdate, string cate, global::System.Nullable supplyidx, + global::System.Nullable scale, + string unit, int Original_idx, string Original_name, string Original_sid, @@ -8040,6 +8198,8 @@ ORDER BY cate, name, idx"; System.DateTime Original_wdate, string Original_cate, global::System.Nullable Original_supplyidx, + global::System.Nullable Original_scale, + string Original_unit, int idx) { if ((name == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -8102,87 +8262,115 @@ ORDER BY cate, name, idx"; else { this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_idx)); - if ((Original_name == null)) { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + if ((scale.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[11].Value = ((double)(scale.Value)); } else { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; } - if ((Original_sid == null)) { + if ((unit == null)) { + this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(unit)); + } + this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_idx)); + if ((Original_name == null)) { this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_sid)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(Original_name)); } - if ((Original_model == null)) { + if ((Original_sid == null)) { this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_model)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_sid)); } - if ((Original_manu == null)) { + if ((Original_model == null)) { this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_manu)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_model)); } - if ((Original_supply == null)) { + if ((Original_manu == null)) { this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[21].Value = global::System.DBNull.Value; } else { this.Adapter.UpdateCommand.Parameters[20].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_supply)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((string)(Original_manu)); } - if ((Original_price.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((decimal)(Original_price.Value)); - } - else { + if ((Original_supply == null)) { this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; } - if ((Original_memo == null)) { + else { + this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_supply)); + } + if ((Original_price.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[25].Value = ((decimal)(Original_price.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; } + if ((Original_memo == null)) { + this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; + } else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[27].Value = ((System.DateTime)(Original_wdate)); + this.Adapter.UpdateCommand.Parameters[29].Value = ((System.DateTime)(Original_wdate)); if ((Original_cate == null)) { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(Original_cate)); - } - if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_supplyidx.Value)); - } - else { this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; } - this.Adapter.UpdateCommand.Parameters[32].Value = ((int)(idx)); + else { + this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_cate)); + } + if ((Original_supplyidx.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[33].Value = ((int)(Original_supplyidx.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; + } + if ((Original_scale.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[35].Value = ((double)(Original_scale.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; + } + if ((Original_unit == null)) { + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_unit)); + } + this.Adapter.UpdateCommand.Parameters[38].Value = ((int)(idx)); global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -8215,6 +8403,8 @@ ORDER BY cate, name, idx"; System.DateTime wdate, string cate, global::System.Nullable supplyidx, + global::System.Nullable scale, + string unit, int Original_idx, string Original_name, string Original_sid, @@ -8226,8 +8416,10 @@ ORDER BY cate, name, idx"; string Original_wuid, System.DateTime Original_wdate, string Original_cate, - global::System.Nullable Original_supplyidx) { - return this.Update(name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, Original_idx, Original_name, Original_sid, Original_model, Original_manu, Original_supply, Original_price, Original_memo, Original_wuid, Original_wdate, Original_cate, Original_supplyidx, Original_idx); + global::System.Nullable Original_supplyidx, + global::System.Nullable Original_scale, + string Original_unit) { + return this.Update(name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, Original_idx, Original_name, Original_sid, Original_model, Original_manu, Original_supply, Original_price, Original_memo, Original_wuid, Original_wdate, Original_cate, Original_supplyidx, Original_scale, Original_unit, Original_idx); } } diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index 4877e33..4ed1597 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -12,7 +12,7 @@ - DELETE FROM [Items] WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx))) + DELETE FROM [Items] WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_scale = 1 AND [scale] IS NULL) OR ([scale] = @Original_scale)) AND ((@IsNull_unit = 1 AND [unit] IS NULL) OR ([unit] = @Original_unit))) @@ -35,13 +35,17 @@ + + + + - INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name + INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx], [scale], [unit]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx, @scale, @unit); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name, idx @@ -54,12 +58,14 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp + + - SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx + SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit FROM Items ORDER BY cate, name, idx @@ -67,8 +73,8 @@ ORDER BY cate, name, idx - UPDATE [Items] SET [name] = @name, [sid] = @sid, [model] = @model, [manu] = @manu, [supply] = @supply, [price] = @price, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [cate] = @cate, [supplyidx] = @supplyidx WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx))); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx FROM Items WHERE (idx = @idx) ORDER BY cate, name + UPDATE [Items] SET [name] = @name, [sid] = @sid, [model] = @model, [manu] = @manu, [supply] = @supply, [price] = @price, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [cate] = @cate, [supplyidx] = @supplyidx, [scale] = @scale, [unit] = @unit WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_sid = 1 AND [sid] IS NULL) OR ([sid] = @Original_sid)) AND ((@IsNull_model = 1 AND [model] IS NULL) OR ([model] = @Original_model)) AND ((@IsNull_manu = 1 AND [manu] IS NULL) OR ([manu] = @Original_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Original_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Original_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supplyidx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@IsNull_scale = 1 AND [scale] IS NULL) OR ([scale] = @Original_scale)) AND ((@IsNull_unit = 1 AND [unit] IS NULL) OR ([unit] = @Original_unit))); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit FROM Items WHERE (idx = @idx) ORDER BY cate, name, idx @@ -81,6 +87,8 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp + + @@ -102,7 +110,11 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp - + + + + + @@ -121,37 +133,44 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp + + - SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx + SELECT cate, idx, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (sid IN (SELECT sid FROM Items AS Items_1 GROUP BY sid - HAVING (COUNT(*) > 1))) AND (ISNULL(sid, '') <> '') -ORDER BY sid, cate, name, idx - + HAVING (COUNT(*) > 1))) AND (ISNULL(sid, '') <> '') AND (cate LIKE @cate) +ORDER BY sid, name, idx + + + - SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate, wuid + SELECT cate, idx, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items -ORDER BY cate, name, idx - +WHERE (cate LIKE @cate) +ORDER BY name, idx + + + - SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate, wuid + SELECT cate, idx, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (ISNULL(name, N'') LIKE @search) OR (ISNULL(sid, N'') LIKE @search) OR @@ -159,7 +178,7 @@ WHERE (ISNULL(name, N'') LIKE @search) OR (ISNULL(supply, N'') LIKE @search) OR (ISNULL(model, N'') LIKE @search) OR (ISNULL(memo, N'') LIKE @search) -ORDER BY cate, name, idx +ORDER BY name, idx @@ -169,7 +188,7 @@ ORDER BY cate, name, idx - SELECT cate, idx, manu, memo, model, name, price, sid, supply, supplyidx, wdate, wuid FROM Items WHERE (idx = @idx) + SELECT cate, idx, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (idx = @idx) @@ -1129,7 +1148,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1192,10 +1211,18 @@ where name like @search or tel like @search or email like @search or memo like @ + + + + + + + + - + @@ -1265,7 +1292,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1336,7 +1363,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1381,7 +1408,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1448,7 +1475,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1507,7 +1534,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1571,7 +1598,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + @@ -1660,7 +1687,7 @@ where name like @search or tel like @search or email like @search or memo like @ - + diff --git a/SubProject/FCM0000/fItems.Designer.cs b/SubProject/FCM0000/fItems.Designer.cs index 252d40e..d446d35 100644 --- a/SubProject/FCM0000/fItems.Designer.cs +++ b/SubProject/FCM0000/fItems.Designer.cs @@ -30,9 +30,13 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fItems)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -48,7 +52,23 @@ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.itemsBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); + this.tbFind = new System.Windows.Forms.ToolStripTextBox(); + this.btFind = new System.Windows.Forms.ToolStripButton(); this.dv1 = new System.Windows.Forms.DataGridView(); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.autoColumnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.cm1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter(); + this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.cmbCate = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.cmbMode = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.cate = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -56,17 +76,11 @@ this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.supplyidx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.price = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.scale = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.unit = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.autoColumnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.cm1ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter(); - this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.cmbMode = new System.Windows.Forms.ToolStripComboBox(); - this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); - this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -95,7 +109,11 @@ this.bindingNavigatorSeparator2, this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, - this.itemsBindingNavigatorSaveItem}); + this.itemsBindingNavigatorSaveItem, + this.toolStripSeparator2, + this.toolStripLabel3, + this.tbFind, + this.btFind}); this.bn.Location = new System.Drawing.Point(0, 441); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; @@ -208,6 +226,35 @@ this.itemsBindingNavigatorSaveItem.Text = "Save(&S)"; this.itemsBindingNavigatorSaveItem.Click += new System.EventHandler(this.itemsBindingNavigatorSaveItem_Click); // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // toolStripLabel3 + // + this.toolStripLabel3.Name = "toolStripLabel3"; + this.toolStripLabel3.Size = new System.Drawing.Size(41, 22); + this.toolStripLabel3.Text = "search"; + // + // tbFind + // + this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.tbFind.Name = "tbFind"; + this.tbFind.Size = new System.Drawing.Size(100, 25); + this.tbFind.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.btFind_KeyDown); + // + // btFind + // + this.btFind.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btFind.Image = ((System.Drawing.Image)(resources.GetObject("btFind.Image"))); + this.btFind.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btFind.Name = "btFind"; + this.btFind.Size = new System.Drawing.Size(23, 22); + this.btFind.Text = "toolStripButton1"; + this.btFind.Click += new System.EventHandler(this.toolStripButton1_Click_1); + // // dv1 // this.dv1.AllowUserToAddRows = false; @@ -222,7 +269,10 @@ this.dataGridViewTextBoxColumn4, this.dataGridViewTextBoxColumn5, this.dataGridViewTextBoxColumn6, + this.supplyidx, this.price, + this.scale, + this.unit, this.dataGridViewTextBoxColumn7}); this.dv1.ContextMenuStrip = this.cm1; this.dv1.DataSource = this.bs; @@ -232,77 +282,9 @@ this.dv1.RowTemplate.Height = 23; this.dv1.Size = new System.Drawing.Size(758, 416); this.dv1.TabIndex = 1; + this.dv1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dv1_CellEndEdit); this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.dv1_DataError); - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.DataPropertyName = "idx"; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle10; - this.dataGridViewTextBoxColumn1.HeaderText = "idx"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; - this.dataGridViewTextBoxColumn1.Width = 47; - // - // cate - // - this.cate.DataPropertyName = "cate"; - this.cate.HeaderText = "Category"; - this.cate.Name = "cate"; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.DataPropertyName = "name"; - this.dataGridViewTextBoxColumn2.HeaderText = "name"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.Width = 62; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.DataPropertyName = "sid"; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle11; - this.dataGridViewTextBoxColumn3.HeaderText = "sid"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.Width = 47; - // - // dataGridViewTextBoxColumn4 - // - this.dataGridViewTextBoxColumn4.DataPropertyName = "model"; - this.dataGridViewTextBoxColumn4.HeaderText = "model"; - this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; - this.dataGridViewTextBoxColumn4.Width = 65; - // - // dataGridViewTextBoxColumn5 - // - this.dataGridViewTextBoxColumn5.DataPropertyName = "manu"; - this.dataGridViewTextBoxColumn5.HeaderText = "manu"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.Width = 62; - // - // dataGridViewTextBoxColumn6 - // - this.dataGridViewTextBoxColumn6.DataPropertyName = "supply"; - this.dataGridViewTextBoxColumn6.HeaderText = "supply"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.Width = 68; - // - // price - // - this.price.DataPropertyName = "price"; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - dataGridViewCellStyle12.Format = "N0"; - this.price.DefaultCellStyle = dataGridViewCellStyle12; - this.price.HeaderText = "price"; - this.price.Name = "price"; - // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.DataPropertyName = "memo"; - this.dataGridViewTextBoxColumn7.HeaderText = "memo"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.Width = 66; + this.dv1.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dv1_KeyDown); // // cm1 // @@ -346,6 +328,9 @@ // toolStrip1 // this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripLabel2, + this.cmbCate, + this.toolStripSeparator1, this.toolStripLabel1, this.cmbMode, this.toolStripButton2}); @@ -355,6 +340,32 @@ this.toolStrip1.TabIndex = 2; this.toolStrip1.Text = "toolStrip1"; // + // toolStripLabel2 + // + this.toolStripLabel2.Name = "toolStripLabel2"; + this.toolStripLabel2.Size = new System.Drawing.Size(55, 22); + this.toolStripLabel2.Text = "Category"; + // + // cmbCate + // + this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbCate.Items.AddRange(new object[] { + "Normal", + "Duplication"}); + this.cmbCate.Name = "cmbCate"; + this.cmbCate.Size = new System.Drawing.Size(100, 25); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(68, 22); + this.toolStripLabel1.Text = "Query Type"; + // // cmbMode // this.cmbMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; @@ -373,11 +384,103 @@ this.toolStripButton2.Text = "Refresh"; this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); // - // toolStripLabel1 + // dataGridViewTextBoxColumn1 // - this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(68, 22); - this.toolStripLabel1.Text = "Query Type"; + this.dataGridViewTextBoxColumn1.DataPropertyName = "idx"; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewTextBoxColumn1.HeaderText = "idx"; + this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; + this.dataGridViewTextBoxColumn1.ReadOnly = true; + this.dataGridViewTextBoxColumn1.Width = 47; + // + // cate + // + this.cate.DataPropertyName = "cate"; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); + this.cate.DefaultCellStyle = dataGridViewCellStyle2; + this.cate.HeaderText = "Category"; + this.cate.Name = "cate"; + // + // dataGridViewTextBoxColumn2 + // + this.dataGridViewTextBoxColumn2.DataPropertyName = "name"; + this.dataGridViewTextBoxColumn2.HeaderText = "name"; + this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; + this.dataGridViewTextBoxColumn2.Width = 62; + // + // dataGridViewTextBoxColumn3 + // + this.dataGridViewTextBoxColumn3.DataPropertyName = "sid"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewTextBoxColumn3.HeaderText = "sid"; + this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; + this.dataGridViewTextBoxColumn3.Width = 47; + // + // dataGridViewTextBoxColumn4 + // + this.dataGridViewTextBoxColumn4.DataPropertyName = "model"; + this.dataGridViewTextBoxColumn4.HeaderText = "model"; + this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; + this.dataGridViewTextBoxColumn4.Width = 65; + // + // dataGridViewTextBoxColumn5 + // + this.dataGridViewTextBoxColumn5.DataPropertyName = "manu"; + this.dataGridViewTextBoxColumn5.HeaderText = "manu"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.Width = 62; + // + // dataGridViewTextBoxColumn6 + // + this.dataGridViewTextBoxColumn6.DataPropertyName = "supply"; + this.dataGridViewTextBoxColumn6.HeaderText = "supply"; + this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.Width = 68; + // + // supplyidx + // + this.supplyidx.DataPropertyName = "supplyidx"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.supplyidx.DefaultCellStyle = dataGridViewCellStyle4; + this.supplyidx.HeaderText = "idx"; + this.supplyidx.Name = "supplyidx"; + // + // price + // + this.price.DataPropertyName = "price"; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + dataGridViewCellStyle5.Format = "N0"; + this.price.DefaultCellStyle = dataGridViewCellStyle5; + this.price.HeaderText = "price"; + this.price.Name = "price"; + // + // scale + // + this.scale.DataPropertyName = "scale"; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.scale.DefaultCellStyle = dataGridViewCellStyle6; + this.scale.HeaderText = "scale"; + this.scale.Name = "scale"; + // + // unit + // + this.unit.DataPropertyName = "unit"; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.unit.DefaultCellStyle = dataGridViewCellStyle7; + this.unit.HeaderText = "unit"; + this.unit.Name = "unit"; + // + // dataGridViewTextBoxColumn7 + // + this.dataGridViewTextBoxColumn7.DataPropertyName = "memo"; + this.dataGridViewTextBoxColumn7.HeaderText = "memo"; + this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; + this.dataGridViewTextBoxColumn7.Width = 66; // // fItems // @@ -427,6 +530,17 @@ private System.Windows.Forms.ContextMenuStrip cm1; private System.Windows.Forms.ToolStripMenuItem autoColumnSizeToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem cm1ToolStripMenuItem; + private System.Windows.Forms.ToolStrip toolStrip1; + private System.Windows.Forms.ToolStripComboBox cmbMode; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.ToolStripLabel toolStripLabel2; + private System.Windows.Forms.ToolStripComboBox cmbCate; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripLabel toolStripLabel3; + private System.Windows.Forms.ToolStripTextBox tbFind; + private System.Windows.Forms.ToolStripButton btFind; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn cate; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; @@ -434,11 +548,10 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; + private System.Windows.Forms.DataGridViewTextBoxColumn supplyidx; private System.Windows.Forms.DataGridViewTextBoxColumn price; + private System.Windows.Forms.DataGridViewTextBoxColumn scale; + private System.Windows.Forms.DataGridViewTextBoxColumn unit; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; - private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripComboBox cmbMode; - private System.Windows.Forms.ToolStripButton toolStripButton2; - private System.Windows.Forms.ToolStripLabel toolStripLabel1; } } \ No newline at end of file diff --git a/SubProject/FCM0000/fItems.cs b/SubProject/FCM0000/fItems.cs index db404fa..dd39a0c 100644 --- a/SubProject/FCM0000/fItems.cs +++ b/SubProject/FCM0000/fItems.cs @@ -23,16 +23,26 @@ namespace FCM0000 } private void fItems_Load(object sender, EventArgs e) { + //get catelist + var cateList = FCOMMON.DBM.getGroupTable("cate", "Items", "isnull(cate,'') <> ''"); + this.cmbCate.Items.Clear(); + this.cmbCate.Items.Add("-- All --"); + foreach (var item in cateList) + cmbCate.Items.Add(item.Key); + this.cmbCate.SelectedIndex = 0; + this.cmbMode.SelectedIndex = 0; refreshData(); } void refreshData() { //refresh data + string cateSearch = "%"; + if (cmbCate.SelectedIndex > 0) cateSearch = cmbCate.Text; if (cmbMode.SelectedIndex == 0) - this.ta.FillNoImage(this.dsMSSQL.Items); + this.ta.FillNoImage(this.dsMSSQL.Items, cateSearch); else - this.ta.FillDupCheck(this.dsMSSQL.Items); + this.ta.FillDupCheck(this.dsMSSQL.Items, cateSearch); this.dv1.AutoResizeColumns(); } @@ -54,11 +64,12 @@ namespace FCM0000 try { this.tam.UpdateAll(this.dsMSSQL); - }catch (Exception ex) + } + catch (Exception ex) { FCOMMON.Util.MsgE(ex.Message); } - + } @@ -69,7 +80,7 @@ namespace FCM0000 private void toolStripButton1_Click(object sender, EventArgs e) { - + } private void dv1_DataError(object sender, DataGridViewDataErrorEventArgs e) @@ -82,6 +93,73 @@ namespace FCM0000 refreshData(); } - + private void dv1_KeyDown(object sender, KeyEventArgs e) + { + + } + + private void dv1_CellEndEdit(object sender, DataGridViewCellEventArgs e) + { + var col = this.dv1.Columns[e.ColumnIndex]; + var value = this.dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value; + + switch (col.DataPropertyName.ToLower()) + { + case "supply": //공급처는 검색하게 한다. + if (value == null) return; + var search = value.ToString(); + if (search.isEmpty()) return; + + FCM0000.fLovSupply f = new fLovSupply(search); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + var name = f.Title; + var idx = f.Index; + dv1.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = name; + dv1.Rows[e.RowIndex].Cells[e.ColumnIndex + 1].Value = idx; + } + break; + } + } + + private void toolStripButton1_Click_1(object sender, EventArgs e) + { + Find(); + } + + void Find() + { + var search = tbFind.Text.Trim(); + if (search.isEmpty()) + { + bs.Filter = ""; + tbFind.BackColor = Color.White; + } + else + { + string filter = "name like '' or sid like '' or model like '' or supply like ''"; + filter = filter.Replace("''", "'%" + search.Replace("'","''") + "%'"); + try + { + bs.Filter = filter; + tbFind.BackColor = Color.Lime; + } + catch (Exception ex) + { + tbFind.BackColor = Color.Pink; + } + } + tbFind.SelectAll(); + tbFind.Focus(); + + } + + private void btFind_KeyDown(object sender, KeyEventArgs e) + { + if (e.KeyCode == Keys.Enter) Find(); + + } + + } } diff --git a/SubProject/FCM0000/fItems.resx b/SubProject/FCM0000/fItems.resx index 5747455..c5941b1 100644 --- a/SubProject/FCM0000/fItems.resx +++ b/SubProject/FCM0000/fItems.resx @@ -198,15 +198,32 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - 17, 17 - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1 + qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO + b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY + hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 + 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon + GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== + + True + + True + True + + True + + + True + 387, 17 diff --git a/SubProject/FCM0000/fLovItem.Designer.cs b/SubProject/FCM0000/fLovItem.Designer.cs index e2fbfa1..d0d8621 100644 --- a/SubProject/FCM0000/fLovItem.Designer.cs +++ b/SubProject/FCM0000/fLovItem.Designer.cs @@ -29,19 +29,15 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.Label modelLabel; System.Windows.Forms.Label manuLabel; System.Windows.Forms.Label supplyLabel; System.Windows.Forms.Label memoLabel; System.Windows.Forms.Label priceLabel; System.Windows.Forms.Label label1; System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLovItem)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.dsMSSQL = new FCM0000.dsMSSQL(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter(); - this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.Label label2; this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); @@ -54,107 +50,81 @@ this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.btOK = new System.Windows.Forms.ToolStripButton(); this.dv = new System.Windows.Forms.DataGridView(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panel1 = new System.Windows.Forms.Panel(); this.textBox1 = new System.Windows.Forms.TextBox(); - this.modelTextBox = new System.Windows.Forms.TextBox(); this.manuTextBox = new System.Windows.Forms.TextBox(); this.supplyTextBox = new System.Windows.Forms.TextBox(); this.memoTextBox = new System.Windows.Forms.TextBox(); this.priceTextBox = new System.Windows.Forms.TextBox(); - modelLabel = new System.Windows.Forms.Label(); + this.model = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsMSSQL = new FCM0000.dsMSSQL(); + this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter(); + this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager(); + this.textBox2 = new System.Windows.Forms.TextBox(); + this.textBox3 = new System.Windows.Forms.TextBox(); manuLabel = new System.Windows.Forms.Label(); supplyLabel = new System.Windows.Forms.Label(); memoLabel = new System.Windows.Forms.Label(); priceLabel = new System.Windows.Forms.Label(); label1 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit(); this.panel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.SuspendLayout(); // - // modelLabel - // - modelLabel.AutoSize = true; - modelLabel.Location = new System.Drawing.Point(22, 15); - modelLabel.Name = "modelLabel"; - modelLabel.Size = new System.Drawing.Size(64, 22); - modelLabel.TabIndex = 6; - modelLabel.Text = "model:"; - // // manuLabel // manuLabel.AutoSize = true; - manuLabel.Location = new System.Drawing.Point(22, 54); + manuLabel.Location = new System.Drawing.Point(16, 15); manuLabel.Name = "manuLabel"; - manuLabel.Size = new System.Drawing.Size(60, 22); + manuLabel.Size = new System.Drawing.Size(50, 18); manuLabel.TabIndex = 8; manuLabel.Text = "manu:"; // // supplyLabel // supplyLabel.AutoSize = true; - supplyLabel.Location = new System.Drawing.Point(22, 93); + supplyLabel.Location = new System.Drawing.Point(12, 54); supplyLabel.Name = "supplyLabel"; - supplyLabel.Size = new System.Drawing.Size(67, 22); + supplyLabel.Size = new System.Drawing.Size(54, 18); supplyLabel.TabIndex = 10; supplyLabel.Text = "supply:"; // // memoLabel // memoLabel.AutoSize = true; - memoLabel.Location = new System.Drawing.Point(22, 132); + memoLabel.Location = new System.Drawing.Point(11, 88); memoLabel.Name = "memoLabel"; - memoLabel.Size = new System.Drawing.Size(65, 22); + memoLabel.Size = new System.Drawing.Size(55, 18); memoLabel.TabIndex = 12; memoLabel.Text = "memo:"; // // priceLabel // priceLabel.AutoSize = true; - priceLabel.Location = new System.Drawing.Point(22, 249); + priceLabel.Location = new System.Drawing.Point(23, 249); priceLabel.Name = "priceLabel"; - priceLabel.Size = new System.Drawing.Size(53, 22); + priceLabel.Size = new System.Drawing.Size(43, 18); priceLabel.TabIndex = 18; priceLabel.Text = "price:"; // // label1 // label1.AutoSize = true; - label1.Location = new System.Drawing.Point(22, 288); + label1.Location = new System.Drawing.Point(30, 288); label1.Name = "label1"; - label1.Size = new System.Drawing.Size(42, 22); + label1.Size = new System.Drawing.Size(36, 18); label1.TabIndex = 20; label1.Text = "cate"; // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bs - // - this.bs.DataMember = "Items"; - this.bs.DataSource = this.dsMSSQL; - this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // tam - // - this.tam.BackupDataSetBeforeUpdate = false; - this.tam.InventoryTableAdapter = null; - this.tam.ItemsTableAdapter = this.ta; - this.tam.ProjectsTableAdapter = null; - this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - // // bn // this.bn.AddNewItem = null; @@ -271,17 +241,18 @@ this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn2, + this.model, this.dataGridViewTextBoxColumn3}); this.dv.DataSource = this.bs; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle2.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle2.Padding = new System.Windows.Forms.Padding(1, 3, 1, 3); - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle4.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle4.Padding = new System.Windows.Forms.Padding(1, 3, 1, 3); + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dv.DefaultCellStyle = dataGridViewCellStyle4; this.dv.Dock = System.Windows.Forms.DockStyle.Fill; this.dv.Location = new System.Drawing.Point(0, 0); this.dv.Name = "dv"; @@ -289,20 +260,95 @@ this.dv.RowHeadersVisible = false; this.dv.RowTemplate.Height = 23; this.dv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dv.Size = new System.Drawing.Size(513, 327); + this.dv.Size = new System.Drawing.Size(544, 327); this.dv.TabIndex = 1; this.dv.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dv_KeyDown); // + // panel1 + // + this.panel1.Controls.Add(this.textBox3); + this.panel1.Controls.Add(label2); + this.panel1.Controls.Add(this.textBox2); + this.panel1.Controls.Add(label1); + this.panel1.Controls.Add(this.textBox1); + this.panel1.Controls.Add(manuLabel); + this.panel1.Controls.Add(this.manuTextBox); + this.panel1.Controls.Add(supplyLabel); + this.panel1.Controls.Add(this.supplyTextBox); + this.panel1.Controls.Add(memoLabel); + this.panel1.Controls.Add(this.memoTextBox); + this.panel1.Controls.Add(priceLabel); + this.panel1.Controls.Add(this.priceTextBox); + this.panel1.Dock = System.Windows.Forms.DockStyle.Right; + this.panel1.Location = new System.Drawing.Point(544, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(290, 327); + this.panel1.TabIndex = 2; + // + // textBox1 + // + this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true)); + this.textBox1.Location = new System.Drawing.Point(75, 286); + this.textBox1.Name = "textBox1"; + this.textBox1.ReadOnly = true; + this.textBox1.Size = new System.Drawing.Size(200, 25); + this.textBox1.TabIndex = 21; + // + // manuTextBox + // + this.manuTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "manu", true)); + this.manuTextBox.Location = new System.Drawing.Point(75, 13); + this.manuTextBox.Name = "manuTextBox"; + this.manuTextBox.ReadOnly = true; + this.manuTextBox.Size = new System.Drawing.Size(200, 25); + this.manuTextBox.TabIndex = 9; + // + // supplyTextBox + // + this.supplyTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "supply", true)); + this.supplyTextBox.Location = new System.Drawing.Point(75, 52); + this.supplyTextBox.Name = "supplyTextBox"; + this.supplyTextBox.ReadOnly = true; + this.supplyTextBox.Size = new System.Drawing.Size(200, 25); + this.supplyTextBox.TabIndex = 11; + // + // memoTextBox + // + this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); + this.memoTextBox.Location = new System.Drawing.Point(75, 86); + this.memoTextBox.Multiline = true; + this.memoTextBox.Name = "memoTextBox"; + this.memoTextBox.ReadOnly = true; + this.memoTextBox.Size = new System.Drawing.Size(200, 120); + this.memoTextBox.TabIndex = 13; + // + // priceTextBox + // + this.priceTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "price", true)); + this.priceTextBox.Location = new System.Drawing.Point(75, 247); + this.priceTextBox.Name = "priceTextBox"; + this.priceTextBox.ReadOnly = true; + this.priceTextBox.Size = new System.Drawing.Size(200, 25); + this.priceTextBox.TabIndex = 19; + // + // model + // + this.model.DataPropertyName = "model"; + this.model.HeaderText = "model"; + this.model.Name = "model"; + this.model.ReadOnly = true; + this.model.Width = 74; + // // dataGridViewTextBoxColumn1 // this.dataGridViewTextBoxColumn1.DataPropertyName = "idx"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle3; this.dataGridViewTextBoxColumn1.HeaderText = "IDX"; this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; this.dataGridViewTextBoxColumn1.ReadOnly = true; - this.dataGridViewTextBoxColumn1.Width = 66; + this.dataGridViewTextBoxColumn1.Width = 60; // // dataGridViewTextBoxColumn2 // @@ -318,82 +364,63 @@ this.dataGridViewTextBoxColumn3.HeaderText = "SID"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; this.dataGridViewTextBoxColumn3.ReadOnly = true; - this.dataGridViewTextBoxColumn3.Width = 66; + this.dataGridViewTextBoxColumn3.Width = 59; // - // panel1 + // bs // - this.panel1.Controls.Add(label1); - this.panel1.Controls.Add(this.textBox1); - this.panel1.Controls.Add(modelLabel); - this.panel1.Controls.Add(this.modelTextBox); - this.panel1.Controls.Add(manuLabel); - this.panel1.Controls.Add(this.manuTextBox); - this.panel1.Controls.Add(supplyLabel); - this.panel1.Controls.Add(this.supplyTextBox); - this.panel1.Controls.Add(memoLabel); - this.panel1.Controls.Add(this.memoTextBox); - this.panel1.Controls.Add(priceLabel); - this.panel1.Controls.Add(this.priceTextBox); - this.panel1.Dock = System.Windows.Forms.DockStyle.Right; - this.panel1.Location = new System.Drawing.Point(513, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(321, 327); - this.panel1.TabIndex = 2; + this.bs.DataMember = "Items"; + this.bs.DataSource = this.dsMSSQL; + this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); // - // textBox1 + // dsMSSQL // - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true)); - this.textBox1.Location = new System.Drawing.Point(107, 285); - this.textBox1.Name = "textBox1"; - this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(200, 28); - this.textBox1.TabIndex = 21; + this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; // - // modelTextBox + // ta // - this.modelTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "model", true)); - this.modelTextBox.Location = new System.Drawing.Point(107, 12); - this.modelTextBox.Name = "modelTextBox"; - this.modelTextBox.ReadOnly = true; - this.modelTextBox.Size = new System.Drawing.Size(200, 28); - this.modelTextBox.TabIndex = 7; + this.ta.ClearBeforeFill = true; // - // manuTextBox + // tam // - this.manuTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "manu", true)); - this.manuTextBox.Location = new System.Drawing.Point(107, 51); - this.manuTextBox.Name = "manuTextBox"; - this.manuTextBox.ReadOnly = true; - this.manuTextBox.Size = new System.Drawing.Size(200, 28); - this.manuTextBox.TabIndex = 9; + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.BoardTableAdapter = null; + this.tam.CommonTableAdapter = null; + this.tam.CustomsTableAdapter = null; + this.tam.InventoryTableAdapter = null; + this.tam.ItemsTableAdapter = this.ta; + this.tam.MailDataTableAdapter = null; + this.tam.MailFormTableAdapter = null; + this.tam.ProjectsTableAdapter = null; + this.tam.RequestItemTableAdapter = null; + this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // - // supplyTextBox + // label2 // - this.supplyTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "supply", true)); - this.supplyTextBox.Location = new System.Drawing.Point(107, 90); - this.supplyTextBox.Name = "supplyTextBox"; - this.supplyTextBox.ReadOnly = true; - this.supplyTextBox.Size = new System.Drawing.Size(200, 28); - this.supplyTextBox.TabIndex = 11; + label2.AutoSize = true; + label2.Location = new System.Drawing.Point(23, 218); + label2.Name = "label2"; + label2.Size = new System.Drawing.Size(41, 18); + label2.TabIndex = 22; + label2.Text = "Scale"; // - // memoTextBox + // textBox2 // - this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); - this.memoTextBox.Location = new System.Drawing.Point(107, 129); - this.memoTextBox.Multiline = true; - this.memoTextBox.Name = "memoTextBox"; - this.memoTextBox.ReadOnly = true; - this.memoTextBox.Size = new System.Drawing.Size(200, 111); - this.memoTextBox.TabIndex = 13; + this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "scale", true)); + this.textBox2.Location = new System.Drawing.Point(75, 215); + this.textBox2.Name = "textBox2"; + this.textBox2.ReadOnly = true; + this.textBox2.Size = new System.Drawing.Size(156, 25); + this.textBox2.TabIndex = 23; // - // priceTextBox + // textBox3 // - this.priceTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "price", true)); - this.priceTextBox.Location = new System.Drawing.Point(107, 246); - this.priceTextBox.Name = "priceTextBox"; - this.priceTextBox.ReadOnly = true; - this.priceTextBox.Size = new System.Drawing.Size(200, 28); - this.priceTextBox.TabIndex = 19; + this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "unit", true)); + this.textBox3.Location = new System.Drawing.Point(237, 215); + this.textBox3.Name = "textBox3"; + this.textBox3.ReadOnly = true; + this.textBox3.Size = new System.Drawing.Size(38, 25); + this.textBox3.TabIndex = 24; // // fLovItem // @@ -402,18 +429,18 @@ this.Controls.Add(this.dv); this.Controls.Add(this.panel1); this.Controls.Add(this.bn); - this.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Name = "fLovItem"; this.Text = "Select Item"; this.Load += new System.EventHandler(this.fLovItem_Load); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); this.bn.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -438,7 +465,6 @@ private System.Windows.Forms.ToolStripButton btOK; private System.Windows.Forms.DataGridView dv; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.TextBox modelTextBox; private System.Windows.Forms.TextBox manuTextBox; private System.Windows.Forms.TextBox supplyTextBox; private System.Windows.Forms.TextBox memoTextBox; @@ -446,7 +472,10 @@ private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; + private System.Windows.Forms.DataGridViewTextBoxColumn model; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; + private System.Windows.Forms.TextBox textBox3; + private System.Windows.Forms.TextBox textBox2; } } \ No newline at end of file diff --git a/SubProject/FCM0000/fLovItem.resx b/SubProject/FCM0000/fLovItem.resx index fe872c7..04beeea 100644 --- a/SubProject/FCM0000/fLovItem.resx +++ b/SubProject/FCM0000/fLovItem.resx @@ -117,9 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - False - False @@ -135,20 +132,14 @@ False - - 216, 17 + + 321, 17 17, 17 - - 81, 17 - - - 143, 17 - - - 321, 17 + + 216, 17 @@ -198,4 +189,19 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + True + + + False + + + 216, 17 + + + 81, 17 + + + 143, 17 + \ No newline at end of file diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 10508b9..2317172 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -99,6 +99,23 @@ namespace FCOMMON where = string.Format(where, GroupCode); return getTwoColumnList("Common", "code", "memo", where, "code"); } + public static string getCodeSavlue(string GroupCode, string code) + { + var cn = getCn(); + cn.Open(); + var sql = "select isnull(SValue,'')" + + " from Common" + + " where Grp = '{0}' and code = '{1}'"; + + sql = string.Format(sql, GroupCode, code); + var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); + var data = cmd.ExecuteScalar(); + cmd.Dispose(); + cn.Close(); + cn.Dispose(); + return data.ToString(); + + } public static System.Data.DataTable getCodeTable(string GroupCode = "99") { var list = getCodeList(GroupCode); diff --git a/SubProject/FEQ0000/FEQ0000.csproj b/SubProject/FEQ0000/FEQ0000.csproj index 2c3d853..d8e4aab 100644 --- a/SubProject/FEQ0000/FEQ0000.csproj +++ b/SubProject/FEQ0000/FEQ0000.csproj @@ -151,6 +151,7 @@ True Resources.resx + True @@ -219,7 +220,9 @@ FCOMMON - + + + + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\Resources\action_save.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index 230c918..6fb03f0 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -40,6 +40,7 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -57,33 +58,42 @@ this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); + this.btSave = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel(); + this.lbSum = new System.Windows.Forms.ToolStripLabel(); this.dv1 = new System.Windows.Forms.DataGridView(); this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.autoResizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.viewThisUserDataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.lbStt = new System.Windows.Forms.ToolStripLabel(); this.dtSD = new System.Windows.Forms.ToolStripTextBox(); - this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); - this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.lbEnd = new System.Windows.Forms.ToolStripLabel(); this.dtED = new System.Windows.Forms.ToolStripTextBox(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.cmbState = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.tbRequest = new System.Windows.Forms.ToolStripTextBox(); this.btSearch = new System.Windows.Forms.ToolStripButton(); - this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pumidx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn12 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.supplyidx = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn20 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -138,22 +148,26 @@ this.bindingNavigatorSeparator2, this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, - this.toolStripButton1}); - this.bn.Location = new System.Drawing.Point(0, 515); + this.toolStripButton1, + this.btSave, + this.toolStripSeparator1, + this.toolStripLabel5, + this.lbSum}); + this.bn.Location = new System.Drawing.Point(0, 514); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(811, 25); + this.bn.Size = new System.Drawing.Size(811, 26); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); + this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 23); this.bindingNavigatorCountItem.Text = "/{0}"; this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; // @@ -162,7 +176,7 @@ this.bindingNavigatorDeleteItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorDeleteItem.Image"))); this.bindingNavigatorDeleteItem.Name = "bindingNavigatorDeleteItem"; this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 22); + this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 23); this.bindingNavigatorDeleteItem.Text = "Delete(&D)"; // // bindingNavigatorMoveFirstItem @@ -171,7 +185,7 @@ this.bindingNavigatorMoveFirstItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveFirstItem.Image"))); this.bindingNavigatorMoveFirstItem.Name = "bindingNavigatorMoveFirstItem"; this.bindingNavigatorMoveFirstItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveFirstItem.Size = new System.Drawing.Size(23, 23); this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; // // bindingNavigatorMovePreviousItem @@ -180,13 +194,13 @@ this.bindingNavigatorMovePreviousItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMovePreviousItem.Image"))); this.bindingNavigatorMovePreviousItem.Name = "bindingNavigatorMovePreviousItem"; this.bindingNavigatorMovePreviousItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMovePreviousItem.Size = new System.Drawing.Size(23, 23); this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; // // bindingNavigatorSeparator // this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 26); // // bindingNavigatorPositionItem // @@ -200,7 +214,7 @@ // bindingNavigatorSeparator1 // this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 26); // // bindingNavigatorMoveNextItem // @@ -208,7 +222,7 @@ this.bindingNavigatorMoveNextItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveNextItem.Image"))); this.bindingNavigatorMoveNextItem.Name = "bindingNavigatorMoveNextItem"; this.bindingNavigatorMoveNextItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveNextItem.Size = new System.Drawing.Size(23, 23); this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; // // bindingNavigatorMoveLastItem @@ -217,20 +231,20 @@ this.bindingNavigatorMoveLastItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorMoveLastItem.Image"))); this.bindingNavigatorMoveLastItem.Name = "bindingNavigatorMoveLastItem"; this.bindingNavigatorMoveLastItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 22); + this.bindingNavigatorMoveLastItem.Size = new System.Drawing.Size(23, 23); this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; // // bindingNavigatorSeparator2 // this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); + this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 26); // // bindingNavigatorAddNewItem // this.bindingNavigatorAddNewItem.Image = ((System.Drawing.Image)(resources.GetObject("bindingNavigatorAddNewItem.Image"))); this.bindingNavigatorAddNewItem.Name = "bindingNavigatorAddNewItem"; this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; - this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22); + this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 23); this.bindingNavigatorAddNewItem.Text = "Add(&A)"; this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // @@ -240,10 +254,37 @@ this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image"))); this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripButton1.Name = "toolStripButton1"; - this.toolStripButton1.Size = new System.Drawing.Size(122, 22); + this.toolStripButton1.Size = new System.Drawing.Size(122, 23); this.toolStripButton1.Text = "Report(Summary)"; this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1); // + // btSave + // + this.btSave.Image = global::FEQ0000.Properties.Resources.action_save; + this.btSave.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btSave.Name = "btSave"; + this.btSave.Size = new System.Drawing.Size(67, 23); + this.btSave.Text = "Save(&S)"; + this.btSave.Click += new System.EventHandler(this.btSave_Click); + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 26); + // + // toolStripLabel5 + // + this.toolStripLabel5.Name = "toolStripLabel5"; + this.toolStripLabel5.Size = new System.Drawing.Size(58, 23); + this.toolStripLabel5.Text = "Sub Total"; + // + // lbSum + // + this.lbSum.Font = new System.Drawing.Font("Tahoma", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.lbSum.Name = "lbSum"; + this.lbSum.Size = new System.Drawing.Size(22, 23); + this.lbSum.Text = "0"; + // // dv1 // this.dv1.AllowUserToAddRows = false; @@ -252,21 +293,22 @@ this.dv1.ColumnHeadersHeight = 30; this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn2, this.dataGridViewTextBoxColumn3, this.dataGridViewTextBoxColumn4, - this.dataGridViewTextBoxColumn5, - this.dataGridViewTextBoxColumn6, this.dataGridViewTextBoxColumn7, + this.dataGridViewTextBoxColumn6, + this.dataGridViewTextBoxColumn5, this.dataGridViewTextBoxColumn8, this.dataGridViewTextBoxColumn9, + this.pumidx, this.dataGridViewTextBoxColumn10, this.dataGridViewTextBoxColumn11, this.dataGridViewTextBoxColumn12, this.dataGridViewTextBoxColumn13, this.dataGridViewTextBoxColumn14, this.dataGridViewTextBoxColumn15, + this.supplyidx, this.dataGridViewTextBoxColumn17, this.dataGridViewTextBoxColumn19, this.dataGridViewTextBoxColumn20, @@ -277,19 +319,22 @@ this.dv1.DataSource = this.bs; this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; this.dv1.Location = new System.Drawing.Point(0, 25); + this.dv1.MultiSelect = false; this.dv1.Name = "dv1"; this.dv1.ReadOnly = true; this.dv1.RowTemplate.Height = 23; this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dv1.Size = new System.Drawing.Size(811, 490); + this.dv1.Size = new System.Drawing.Size(811, 489); this.dv1.TabIndex = 2; + this.dv1.DoubleClick += new System.EventHandler(this.dv1_DoubleClick); // // cm1 // this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.autoResizeColumnsToolStripMenuItem}); + this.autoResizeColumnsToolStripMenuItem, + this.viewThisUserDataToolStripMenuItem}); this.cm1.Name = "contextMenuStrip1"; - this.cm1.Size = new System.Drawing.Size(186, 26); + this.cm1.Size = new System.Drawing.Size(186, 48); // // autoResizeColumnsToolStripMenuItem // @@ -298,14 +343,24 @@ this.autoResizeColumnsToolStripMenuItem.Text = "AutoResize Columns"; this.autoResizeColumnsToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnsToolStripMenuItem_Click); // + // viewThisUserDataToolStripMenuItem + // + this.viewThisUserDataToolStripMenuItem.Name = "viewThisUserDataToolStripMenuItem"; + this.viewThisUserDataToolStripMenuItem.Size = new System.Drawing.Size(185, 22); + this.viewThisUserDataToolStripMenuItem.Text = "View This User data"; + this.viewThisUserDataToolStripMenuItem.Click += new System.EventHandler(this.viewThisUserDataToolStripMenuItem_Click); + // // toolStrip1 // this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripLabel1, + this.lbStt, this.dtSD, - this.toolStripLabel4, - this.toolStripLabel2, + this.lbEnd, this.dtED, + this.toolStripSeparator2, + this.toolStripLabel1, + this.cmbState, + this.toolStripSeparator3, this.toolStripLabel3, this.tbRequest, this.btSearch}); @@ -315,47 +370,69 @@ this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // - // toolStripLabel1 + // lbStt // - this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(32, 22); - this.toolStripLabel1.Text = "Start"; + this.lbStt.Name = "lbStt"; + this.lbStt.Size = new System.Drawing.Size(41, 22); + this.lbStt.Text = "Period"; + this.lbStt.Click += new System.EventHandler(this.lbStt_Click); // // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.dtSD.Name = "dtSD"; this.dtSD.Size = new System.Drawing.Size(100, 25); + this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; // - // toolStripLabel4 + // lbEnd // - this.toolStripLabel4.Name = "toolStripLabel4"; - this.toolStripLabel4.Size = new System.Drawing.Size(15, 22); - this.toolStripLabel4.Text = "~"; - // - // toolStripLabel2 - // - this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(27, 22); - this.toolStripLabel2.Text = "End"; + this.lbEnd.Name = "lbEnd"; + this.lbEnd.Size = new System.Drawing.Size(15, 22); + this.lbEnd.Text = "~"; + this.lbEnd.Click += new System.EventHandler(this.lbEnd_Click); // // dtED // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.dtED.Name = "dtED"; this.dtED.Size = new System.Drawing.Size(100, 25); + this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // toolStripLabel1 + // + this.toolStripLabel1.Name = "toolStripLabel1"; + this.toolStripLabel1.Size = new System.Drawing.Size(34, 22); + this.toolStripLabel1.Text = "State"; + // + // cmbState + // + this.cmbState.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbState.Name = "cmbState"; + this.cmbState.Size = new System.Drawing.Size(100, 25); + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 25); // // toolStripLabel3 // this.toolStripLabel3.Name = "toolStripLabel3"; this.toolStripLabel3.Size = new System.Drawing.Size(66, 22); this.toolStripLabel3.Text = "User Name"; + this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); // // tbRequest // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbRequest.Name = "tbRequest"; - this.tbRequest.Size = new System.Drawing.Size(100, 25); + this.tbRequest.Size = new System.Drawing.Size(70, 25); + this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown); // // btSearch @@ -367,17 +444,6 @@ this.btSearch.Text = "Refresh(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.DataPropertyName = "idx"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewTextBoxColumn1.HeaderText = "IDX"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; - this.dataGridViewTextBoxColumn1.Width = 50; - // // dataGridViewTextBoxColumn2 // this.dataGridViewTextBoxColumn2.DataPropertyName = "pdate"; @@ -388,9 +454,9 @@ // dataGridViewTextBoxColumn3 // this.dataGridViewTextBoxColumn3.DataPropertyName = "stateName"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dataGridViewTextBoxColumn3.DefaultCellStyle = dataGridViewCellStyle1; this.dataGridViewTextBoxColumn3.HeaderText = "State"; this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; this.dataGridViewTextBoxColumn3.ReadOnly = true; @@ -402,38 +468,38 @@ this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4"; this.dataGridViewTextBoxColumn4.ReadOnly = true; // - // dataGridViewTextBoxColumn5 - // - this.dataGridViewTextBoxColumn5.DataPropertyName = "receive"; - dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle3; - this.dataGridViewTextBoxColumn5.HeaderText = "receive"; - this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; - this.dataGridViewTextBoxColumn5.ReadOnly = true; - // - // dataGridViewTextBoxColumn6 - // - this.dataGridViewTextBoxColumn6.DataPropertyName = "sc"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle4; - this.dataGridViewTextBoxColumn6.HeaderText = "sc#"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.ReadOnly = true; - // // dataGridViewTextBoxColumn7 // this.dataGridViewTextBoxColumn7.DataPropertyName = "request"; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewTextBoxColumn7.HeaderText = "request"; this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; this.dataGridViewTextBoxColumn7.ReadOnly = true; // + // dataGridViewTextBoxColumn6 + // + this.dataGridViewTextBoxColumn6.DataPropertyName = "sc"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle3; + this.dataGridViewTextBoxColumn6.HeaderText = "sc#"; + this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; + this.dataGridViewTextBoxColumn6.ReadOnly = true; + // + // dataGridViewTextBoxColumn5 + // + this.dataGridViewTextBoxColumn5.DataPropertyName = "receive"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn5.DefaultCellStyle = dataGridViewCellStyle4; + this.dataGridViewTextBoxColumn5.HeaderText = "receive"; + this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; + this.dataGridViewTextBoxColumn5.ReadOnly = true; + // // dataGridViewTextBoxColumn8 // this.dataGridViewTextBoxColumn8.DataPropertyName = "sid"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn8.DefaultCellStyle = dataGridViewCellStyle5; this.dataGridViewTextBoxColumn8.HeaderText = "sid#"; this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8"; this.dataGridViewTextBoxColumn8.ReadOnly = true; @@ -445,6 +511,18 @@ this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; this.dataGridViewTextBoxColumn9.ReadOnly = true; // + // pumidx + // + this.pumidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.pumidx.DataPropertyName = "pumidx"; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.pumidx.DefaultCellStyle = dataGridViewCellStyle6; + this.pumidx.HeaderText = "*"; + this.pumidx.Name = "pumidx"; + this.pumidx.ReadOnly = true; + this.pumidx.Width = 50; + // // dataGridViewTextBoxColumn10 // this.dataGridViewTextBoxColumn10.DataPropertyName = "pumscale"; @@ -496,6 +574,18 @@ this.dataGridViewTextBoxColumn15.Name = "dataGridViewTextBoxColumn15"; this.dataGridViewTextBoxColumn15.ReadOnly = true; // + // supplyidx + // + this.supplyidx.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.supplyidx.DataPropertyName = "supplyidx"; + dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.supplyidx.DefaultCellStyle = dataGridViewCellStyle10; + this.supplyidx.HeaderText = "*"; + this.supplyidx.Name = "supplyidx"; + this.supplyidx.ReadOnly = true; + this.supplyidx.Width = 50; + // // dataGridViewTextBoxColumn17 // this.dataGridViewTextBoxColumn17.DataPropertyName = "project"; @@ -527,8 +617,8 @@ // dataGridViewTextBoxColumn22 // this.dataGridViewTextBoxColumn22.DataPropertyName = "po"; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn22.DefaultCellStyle = dataGridViewCellStyle11; this.dataGridViewTextBoxColumn22.HeaderText = "PO"; this.dataGridViewTextBoxColumn22.Name = "dataGridViewTextBoxColumn22"; this.dataGridViewTextBoxColumn22.ReadOnly = true; @@ -585,10 +675,9 @@ private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; private System.Windows.Forms.DataGridView dv1; private System.Windows.Forms.ToolStrip toolStrip1; - private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.ToolStripLabel lbStt; private System.Windows.Forms.ToolStripTextBox dtSD; - private System.Windows.Forms.ToolStripLabel toolStripLabel4; - private System.Windows.Forms.ToolStripLabel toolStripLabel2; + private System.Windows.Forms.ToolStripLabel lbEnd; private System.Windows.Forms.ToolStripTextBox dtED; private System.Windows.Forms.ToolStripButton btSearch; private System.Windows.Forms.ContextMenuStrip cm1; @@ -596,21 +685,31 @@ private System.Windows.Forms.ToolStripLabel toolStripLabel3; private System.Windows.Forms.ToolStripTextBox tbRequest; private System.Windows.Forms.ToolStripButton toolStripButton1; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator1; + private System.Windows.Forms.ToolStripLabel toolStripLabel5; + private System.Windows.Forms.ToolStripLabel lbSum; + private System.Windows.Forms.ToolStripButton btSave; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripLabel toolStripLabel1; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.ToolStripComboBox cmbState; + private System.Windows.Forms.ToolStripMenuItem viewThisUserDataToolStripMenuItem; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; + private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; + private System.Windows.Forms.DataGridViewTextBoxColumn pumidx; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn12; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn13; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn14; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn15; + private System.Windows.Forms.DataGridViewTextBoxColumn supplyidx; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn17; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn19; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn20; diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index 5cd3b28..c036f32 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -15,6 +15,18 @@ namespace FEQ0000 { InitializeComponent(); this.dsPurchase.Purchase.TableNewRow += Purchase_TableNewRow; + if (FCOMMON.info.Login.level > 9) + { + dv1.SelectionMode = DataGridViewSelectionMode.CellSelect; + dv1.EditMode = DataGridViewEditMode.EditOnKeystrokeOrF2; + btSave.Visible = true; + } + else + { + dv1.SelectionMode = DataGridViewSelectionMode.FullRowSelect; + dv1.EditMode = DataGridViewEditMode.EditProgrammatically; + btSave.Visible = false; + } } void Purchase_TableNewRow(object sender, DataTableNewRowEventArgs e) @@ -36,10 +48,19 @@ namespace FEQ0000 this.tbRequest.Text = FCOMMON.info.Login.nameK; this.dtSD.Text = DateTime.Now.AddDays(-30).ToShortDateString(); this.dtED.Text = DateTime.Now.AddDays(10).ToShortDateString(); + + //state list + var stList = FCOMMON.DBM.getCodeList("04"); + this.cmbState.Items.Clear(); + cmbState.Items.Add("-- All --"); + foreach (var item in stList) + cmbState.Items.Add(item); + this.cmbState.SelectedIndex = 0; + refreshData(); } - private void purchaseBindingNavigatorSaveItem_Click(object sender, EventArgs e) + private void saveData() { this.Validate(); this.bs.EndEdit(); @@ -51,16 +72,27 @@ namespace FEQ0000 { try { + string state = "%"; + if (cmbState.SelectedIndex > 0) { + state = cmbState.Text.Split(',')[0].Substring(1); + } string request = "%"; if (tbRequest.Text.Trim() != "") request = "%" + this.tbRequest.Text.Trim() + "%"; - this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text,dtED.Text,request); + this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text, dtED.Text, request, state); if (!tbRequest.Text.isEmpty()) this.dv1.AutoResizeColumns(); + showSummary(); } catch (System.Exception ex) { System.Windows.Forms.MessageBox.Show(ex.Message); } - + } + void showSummary() + { + decimal sum = 0; + foreach (dsPurchase.PurchaseRow dr in this.dsPurchase.Purchase.Rows) + if(!dr.IspumamtNull()) sum += dr.pumamt; + lbSum.Text = sum.ToString("N0"); } private void btSearch_Click(object sender, EventArgs e) @@ -103,5 +135,65 @@ namespace FEQ0000 if(e.KeyCode == Keys.Enter) btSearch.PerformClick(); } + + private void btSave_Click(object sender, EventArgs e) + { + saveData(); + } + + private void dv1_DoubleClick(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + var dr = drv.Row as dsPurchase.PurchaseRow; + + fPurchase_Add f = new fPurchase_Add(dr); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + this.ta.Update(dr); + dr.AcceptChanges(); + } + else dr.RejectChanges(); + } + + private void lbStt_Click(object sender, EventArgs e) + { + //start date + var list = FCOMMON.DBM.getGroupList("pdate", "purchase","", true); + FCM0000.fLovOneItem f = new FCM0000.fLovOneItem(list); + if(f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + dtSD.Text = f.Title; + dtED.Focus(); + } + } + + private void lbEnd_Click(object sender, EventArgs e) + { + //end date + var list = FCOMMON.DBM.getGroupList("pdate", "purchase", "pdate >= '" + dtSD.Text + "'", true); + FCM0000.fLovOneItem f = new FCM0000.fLovOneItem(list); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + dtED.Text = f.Title; + btSearch.PerformClick(); + } + } + + private void toolStripLabel3_Click(object sender, EventArgs e) + { + //사용자목록처리 + tbRequest.Text = string.Empty; + btSearch.PerformClick(); + } + + private void viewThisUserDataToolStripMenuItem_Click(object sender, EventArgs e) + { + var drv = this.bs.Current as DataRowView; + if (drv == null) return; + if(drv["request"] == null) return; + this.tbRequest.Text = drv["request"].ToString(); + btSearch.PerformClick(); + } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index 2901dde..f269f0c 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -212,6 +212,12 @@ TgDQASA1MVpwzwAAAABJRU5ErkJggg== + + True + + + True + 502, 17 diff --git a/SubProject/FEQ0000/Purchase/rPurchase.cs b/SubProject/FEQ0000/Purchase/rPurchase.cs index dc79b7e..f498db0 100644 --- a/SubProject/FEQ0000/Purchase/rPurchase.cs +++ b/SubProject/FEQ0000/Purchase/rPurchase.cs @@ -35,7 +35,7 @@ namespace FEQ0000.Purchase } void refreshData() { - this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text, dtED.Text, "%"); + this.ta.Fill(this.dsPurchase.Purchase, dtSD.Text, dtED.Text, "%","%"); //Set DataSource Microsoft.Reporting.WinForms.ReportDataSource DsEQ = new Microsoft.Reporting.WinForms.ReportDataSource(); diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index ce87013..079a365 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -2132,12 +2132,13 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(request, '') LIKE @request OR - ISNULL(receive, '') LIKE @request) + ISNULL(receive, '') LIKE @request) AND (ISNULL(state, '') LIKE @state) ORDER BY pdate DESC, idx DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sd", 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("@ed", 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("@request", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@state", global::System.Data.SqlDbType.VarChar, 1024, 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 = "DELETE FROM [Purchase] WHERE import = 1"; @@ -2148,7 +2149,7 @@ ORDER BY pdate DESC, idx DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] - public virtual int Fill(dsPurchase.PurchaseDataTable dataTable, string sd, string ed, string request) { + public virtual int Fill(dsPurchase.PurchaseDataTable dataTable, string sd, string ed, string request, string state) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((sd == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -2168,6 +2169,12 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(request)); } + if ((state == null)) { + throw new global::System.ArgumentNullException("state"); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(state)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -2179,7 +2186,7 @@ ORDER BY pdate DESC, idx DESC"; [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] - public virtual dsPurchase.PurchaseDataTable GetData(string sd, string ed, string request) { + public virtual dsPurchase.PurchaseDataTable GetData(string sd, string ed, string request, string state) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((sd == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -2199,6 +2206,12 @@ ORDER BY pdate DESC, idx DESC"; else { this.Adapter.SelectCommand.Parameters[2].Value = ((string)(request)); } + if ((state == null)) { + throw new global::System.ArgumentNullException("state"); + } + else { + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(state)); + } dsPurchase.PurchaseDataTable dataTable = new dsPurchase.PurchaseDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index 9bf6639..421611f 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -104,12 +104,13 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, wdate, import, pumidx, dbo.getCodeName('04', state) AS stateName FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(request, '') LIKE @request OR - ISNULL(receive, '') LIKE @request) + ISNULL(receive, '') LIKE @request) AND (ISNULL(state, '') LIKE @state) ORDER BY pdate DESC, idx DESC + @@ -246,7 +247,7 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, - +