From 11d7c7f704292c92664828514949e8e7b6d16430 Mon Sep 17 00:00:00 2001 From: "chikyun.kim" Date: Fri, 26 Jul 2019 17:28:19 +0900 Subject: [PATCH] .. --- Project/Dialog/fLogin.Designer.cs | 100 +- Project/Dialog/fLogin.cs | 56 +- Project/EETGW.csproj | 13 + Project/Properties/AssemblyInfo.cs | 4 +- Project/Properties/licenses.licx | 1 + Project/Setting.cs | 4 + Project/dsMSSQL.Designer.cs | 1040 ++++++++ Project/dsMSSQL.xsd | 116 +- Project/dsMSSQL.xss | 2 +- Project/fMain.Designer.cs | 65 +- Project/fMain.cs | 46 +- Project/fMain.resx | 56 +- SubProject/FBS0000/Holiday/fHolyday.cs | 2 +- SubProject/FCM0000/Customer_Import.cs | 2 +- SubProject/FCM0000/DSInventory.Designer.cs | 19 +- SubProject/FCM0000/DSInventory.xsd | 7 +- SubProject/FCM0000/DSInventory.xss | 2 +- SubProject/FCM0000/FCM0000.csproj | 51 +- SubProject/FCM0000/User/fUserAuth.cs | 1 - .../User/fUserGroupPermission.Designer.cs | 16 +- SubProject/FCM0000/dsMSSQL.Designer.cs | 2277 ++++++----------- SubProject/FCM0000/dsMSSQL.xsd | 663 ++--- SubProject/FCM0000/dsMSSQL.xss | 24 +- SubProject/FCM0000/fCode.Designer.cs | 16 +- SubProject/FCM0000/fCode.cs | 7 +- SubProject/FCM0000/fCustoms.cs | 13 +- SubProject/FCM0000/fItems.Designer.cs | 840 ------ SubProject/FCM0000/fItems.cs | 323 --- SubProject/FCM0000/fItems.resx | 272 -- SubProject/FCM0000/fLovItem.Designer.cs | 528 ---- SubProject/FCM0000/fLovItem.cs | 143 -- SubProject/FCM0000/fLovItem.resx | 207 -- SubProject/FCM0000/fLovOneItem.Designer.cs | 234 -- SubProject/FCM0000/fLovOneItem.cs | 100 - SubProject/FCM0000/fLovOneItem.resx | 180 -- SubProject/FCM0000/fLovProject.cs | 6 +- SubProject/FCM0000/fLovSupply.cs | 2 +- SubProject/FCM0000/fLovUser.Designer.cs | 430 ---- SubProject/FCM0000/fLovUser.cs | 117 - SubProject/FCM0000/fLovUser.resx | 219 -- SubProject/FCOMMON/Auth.cs | 7 +- SubProject/FCOMMON/DataBaseManager.cs | 36 +- SubProject/FCOMMON/Info.cs | 1 + SubProject/FCOMMON/fBase.cs | 1 + SubProject/FCOMMON/fFTPExplorer.cs | 13 +- .../FEQ0000/Purchase/fPurchase.Designer.cs | 275 +- SubProject/FEQ0000/Purchase/fPurchase.cs | 42 +- SubProject/FEQ0000/Purchase/fPurchase.resx | 10 + .../Purchase/fPurchase_Add.Designer.cs | 265 +- SubProject/FEQ0000/Purchase/fPurchase_Add.cs | 449 ++-- .../FEQ0000/Purchase/fPurchase_Add.resx | 17 +- SubProject/FEQ0000/dsPurchase.Designer.cs | 102 +- SubProject/FEQ0000/dsPurchase.xsd | 88 +- .../FPJ0000/JobReport/fJobReport.Designer.cs | 104 +- SubProject/FPJ0000/JobReport/fJobReport.cs | 11 +- SubProject/FPJ0000/JobReport/fJobReport.resx | 10 + SubProject/FPJ0000/Project/fProjectData.cs | 2 +- SubProject/FPJ0000/Project/fProjectList.cs | 8 +- 58 files changed, 3360 insertions(+), 6285 deletions(-) delete mode 100644 SubProject/FCM0000/fItems.Designer.cs delete mode 100644 SubProject/FCM0000/fItems.cs delete mode 100644 SubProject/FCM0000/fItems.resx delete mode 100644 SubProject/FCM0000/fLovItem.Designer.cs delete mode 100644 SubProject/FCM0000/fLovItem.cs delete mode 100644 SubProject/FCM0000/fLovItem.resx delete mode 100644 SubProject/FCM0000/fLovOneItem.Designer.cs delete mode 100644 SubProject/FCM0000/fLovOneItem.cs delete mode 100644 SubProject/FCM0000/fLovOneItem.resx delete mode 100644 SubProject/FCM0000/fLovUser.Designer.cs delete mode 100644 SubProject/FCM0000/fLovUser.cs delete mode 100644 SubProject/FCM0000/fLovUser.resx diff --git a/Project/Dialog/fLogin.Designer.cs b/Project/Dialog/fLogin.Designer.cs index a964067..a71b5e4 100644 --- a/Project/Dialog/fLogin.Designer.cs +++ b/Project/Dialog/fLogin.Designer.cs @@ -31,12 +31,15 @@ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLogin)); this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); + this.tbID = new System.Windows.Forms.ComboBox(); this.label2 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label(); this.tbPW = new System.Windows.Forms.TextBox(); this.panel2 = new System.Windows.Forms.Panel(); this.btLogin = new System.Windows.Forms.Button(); - this.tbID = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + this.cmbDept = new System.Windows.Forms.ComboBox(); + this.linkLabel1 = new System.Windows.Forms.LinkLabel(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panel1.SuspendLayout(); this.panel2.SuspendLayout(); @@ -45,7 +48,7 @@ // pictureBox1 // this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(136, 34); + this.pictureBox1.Location = new System.Drawing.Point(205, 26); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(80, 80); this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; @@ -55,6 +58,9 @@ // panel1 // this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244))))); + this.panel1.Controls.Add(this.linkLabel1); + this.panel1.Controls.Add(this.cmbDept); + this.panel1.Controls.Add(this.label3); this.panel1.Controls.Add(this.tbID); this.panel1.Controls.Add(this.label2); this.panel1.Controls.Add(this.label1); @@ -63,39 +69,48 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(358, 272); + this.panel1.Size = new System.Drawing.Size(488, 366); this.panel1.TabIndex = 0; // + // tbID + // + this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F); + this.tbID.FormattingEnabled = true; + this.tbID.Location = new System.Drawing.Point(15, 217); + this.tbID.Name = "tbID"; + this.tbID.Size = new System.Drawing.Size(460, 41); + this.tbID.TabIndex = 3; + // // label2 // this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F); this.label2.ForeColor = System.Drawing.Color.Gray; - this.label2.Location = new System.Drawing.Point(12, 200); + this.label2.Location = new System.Drawing.Point(12, 272); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(59, 14); - this.label2.TabIndex = 2; - this.label2.Text = "Password"; + this.label2.Size = new System.Drawing.Size(31, 15); + this.label2.TabIndex = 4; + this.label2.Text = "암호"; // // label1 // this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("Calibri", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label1.ForeColor = System.Drawing.Color.Gray; - this.label1.Location = new System.Drawing.Point(12, 131); + this.label1.Location = new System.Drawing.Point(12, 200); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(70, 14); - this.label1.TabIndex = 0; - this.label1.Text = "No or Email"; + this.label1.Size = new System.Drawing.Size(55, 15); + this.label1.TabIndex = 2; + this.label1.Text = "사원번호"; // // tbPW // this.tbPW.Font = new System.Drawing.Font("Calibri", 20.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.tbPW.Location = new System.Drawing.Point(15, 219); + this.tbPW.Location = new System.Drawing.Point(15, 291); this.tbPW.Name = "tbPW"; this.tbPW.PasswordChar = '●'; - this.tbPW.Size = new System.Drawing.Size(329, 40); - this.tbPW.TabIndex = 3; + this.tbPW.Size = new System.Drawing.Size(460, 40); + this.tbPW.TabIndex = 5; this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // panel2 @@ -103,9 +118,9 @@ this.panel2.BackColor = System.Drawing.SystemColors.Control; this.panel2.Controls.Add(this.btLogin); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 272); + this.panel2.Location = new System.Drawing.Point(0, 366); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(358, 34); + this.panel2.Size = new System.Drawing.Size(488, 34); this.panel2.TabIndex = 6; // // btLogin @@ -113,26 +128,50 @@ this.btLogin.Dock = System.Windows.Forms.DockStyle.Fill; this.btLogin.Location = new System.Drawing.Point(0, 0); this.btLogin.Name = "btLogin"; - this.btLogin.Size = new System.Drawing.Size(358, 34); + this.btLogin.Size = new System.Drawing.Size(488, 34); this.btLogin.TabIndex = 0; - this.btLogin.Text = "LOGIN"; + this.btLogin.Text = "접속"; this.btLogin.UseVisualStyleBackColor = true; this.btLogin.Click += new System.EventHandler(this.button1_Click); // - // tbID + // label3 // - this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F); - this.tbID.FormattingEnabled = true; - this.tbID.Location = new System.Drawing.Point(15, 148); - this.tbID.Name = "tbID"; - this.tbID.Size = new System.Drawing.Size(329, 41); - this.tbID.TabIndex = 1; + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.label3.ForeColor = System.Drawing.Color.DodgerBlue; + this.label3.Location = new System.Drawing.Point(15, 340); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(243, 15); + this.label3.TabIndex = 6; + this.label3.Text = "문의 ) Chickyun.kim@amkor.co.kr, T.8567"; + this.label3.Click += new System.EventHandler(this.label3_Click); + // + // cmbDept + // + this.cmbDept.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cmbDept.Font = new System.Drawing.Font("Calibri", 20.25F); + this.cmbDept.FormattingEnabled = true; + this.cmbDept.Location = new System.Drawing.Point(15, 144); + this.cmbDept.Name = "cmbDept"; + this.cmbDept.Size = new System.Drawing.Size(460, 41); + this.cmbDept.TabIndex = 1; + // + // linkLabel1 + // + this.linkLabel1.AutoSize = true; + this.linkLabel1.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.linkLabel1.Location = new System.Drawing.Point(12, 126); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(31, 15); + this.linkLabel1.TabIndex = 0; + this.linkLabel1.Text = "부서"; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); // // fLogin // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.BackColor = System.Drawing.Color.OrangeRed; - this.ClientSize = new System.Drawing.Size(358, 306); + this.ClientSize = new System.Drawing.Size(488, 400); this.Controls.Add(this.panel1); this.Controls.Add(this.panel2); this.Font = new System.Drawing.Font("Calibri", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -140,7 +179,7 @@ this.MinimizeBox = false; this.Name = "fLogin"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Login"; + this.Text = "사용자확인"; this.Load += new System.EventHandler(this.fLogin_Load); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panel1.ResumeLayout(false); @@ -160,5 +199,8 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private System.Windows.Forms.ComboBox tbID; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.ComboBox cmbDept; + private System.Windows.Forms.LinkLabel linkLabel1; } } \ No newline at end of file diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 1cd989c..39f599a 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -28,6 +28,11 @@ namespace Project.Dialog if (item != "") tbID.Items.Add(item); if (tbID.Items.Count > 0) tbID.SelectedIndex = 0; + var dlist = Pub.setting.lastdept.Split(';'); + foreach (var item in dlist) + if (item != "") this.cmbDept.Items.Add(item); + if (cmbDept.Items.Count > 0) cmbDept.SelectedIndex = 0; + this.Show(); Application.DoEvents(); @@ -53,12 +58,22 @@ namespace Project.Dialog foreach (var item in this.tbID.Items) if (idlist.Contains(item) == false) idlist.Add(item.ToString()); - //180605 - var userlist = ""; - foreach (var item in idlist) - userlist += ";" + item; + List deptlist = new List(); + deptlist.Add(cmbDept.Text.Trim()); + foreach (var item in this.cmbDept.Items) + if (deptlist.Contains(item) == false) deptlist.Add(item.ToString()); - Pub.setting.lastid = userlist;// tbID.Text.Trim(); + //180605 + var vuserlist = ""; + foreach (var item in idlist) + vuserlist += ";" + item; + + var vdeptlist = ""; + foreach(var item in deptlist) + vdeptlist += ";" + item; + + Pub.setting.lastid = vuserlist;// tbID.Text.Trim(); + Pub.setting.lastdept = vdeptlist; Pub.setting.Save(); var encpass = Pub.MakePasswordEnc(tbPW.Text.Trim()); @@ -68,27 +83,32 @@ namespace Project.Dialog var users = ta.GetIDPW(encpass, tbID.Text.Trim()); if (users.Rows.Count < 1) { - Util.MsgE("No user"); + Util.MsgE("입력한 사용자 계정이 존재하지 않습니다"); tbPW.SelectAll(); tbPW.Focus(); return; } else { - //이사용자의 부서 코드확인 var userdr = users.Rows[0] as dsMSSQL.UsersRow; + if(userdr.level < 9 && userdr.dept != cmbDept.Text) + { + Util.MsgE("입력한 사용자는 지정한 부서에 접속할 권한이 없습니다"); + return; + } + FCOMMON.info.Login.no = userdr.id; FCOMMON.info.Login.nameK = userdr.name; - FCOMMON.info.Login.dept = userdr.dept; + FCOMMON.info.Login.dept = cmbDept.Text; FCOMMON.info.Login.level = userdr.level; FCOMMON.info.Login.email = userdr.email; FCOMMON.info.Login.nameE = userdr.nameE; FCOMMON.info.Login.hp = userdr.hp; FCOMMON.info.Login.tel = userdr.tel; FCOMMON.info.Login.title = userdr.ads_title; - var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + userdr.dept + "'"); - var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + userdr.dept + "'"); + var gcode = FCOMMON.DBM.ExecuteScalar("select isnull(gcode,'NOGCODE') from UserGroup where dept ='" + cmbDept.Text + "'"); + var gperm = FCOMMON.DBM.ExecuteScalar("select isnull(permission,0) from UserGroup where dept ='" + cmbDept.Text + "'"); FCOMMON.info.Login.gcode = gcode; FCOMMON.info.Login.permission = 0; FCOMMON.info.Login.gpermission = int.Parse( gperm); @@ -102,6 +122,20 @@ namespace Project.Dialog } - + private void label3_Click(object sender, EventArgs e) + { + FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr"); + } + + private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + var f = new Dialog.fSelectDept(); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + if (cmbDept.Items.Contains(f.deptName) == false) + cmbDept.Items.Add(f.deptName); + cmbDept.Text = f.deptName; + } + } } } diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index 4ae751a..7483c43 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -124,6 +124,10 @@ False ..\DLL\ArSetting.Net4.dll + + + + ..\DLL\libxl.net.dll @@ -200,6 +204,12 @@ fErrorException.cs + + Form + + + fSelectDept.cs + Form @@ -303,6 +313,9 @@ fErrorException.cs + + fSelectDept.cs + fTouchKeyFull.cs diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index b60d6cd..42e6379 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("19.07.24.0830")] -[assembly: AssemblyFileVersion("19.07.24.0830")] +[assembly: AssemblyVersion("19.07.26.1730")] +[assembly: AssemblyFileVersion("19.07.26.1730")] diff --git a/Project/Properties/licenses.licx b/Project/Properties/licenses.licx index e69de29..43d4733 100644 --- a/Project/Properties/licenses.licx +++ b/Project/Properties/licenses.licx @@ -0,0 +1 @@ +FarPoint.Win.Spread.FpSpread, FarPoint.Win.Spread, Version=11.40.20177.0, Culture=neutral, PublicKeyToken=327c3516b1b18457 diff --git a/Project/Setting.cs b/Project/Setting.cs index b2ad7b9..2d6fb8c 100644 --- a/Project/Setting.cs +++ b/Project/Setting.cs @@ -46,7 +46,10 @@ namespace Project [Category("Barcode"), DisplayName("Port Name")] public string Barcode { get; set; } + [Browsable(false)] public string lastid { get; set; } + [Browsable(false)] + public string lastdept { get; set; } public int CamIndex { get; set; } public Setting() : this(Util.CurrentPath + "setting.xml") {} @@ -68,6 +71,7 @@ namespace Project if (Language.isEmpty()) Language = "Kor"; if (Password_Setup.isEmpty()) Password_Setup = "0000"; if (Password_User.isEmpty()) Password_User = "9999"; + if (lastdept == "") lastdept = "제조본부 장비기술팀 K4장비기술1파트"; //시작폼가져오기 var 시작품 = Xml.get_Data("startForm"); diff --git a/Project/dsMSSQL.Designer.cs b/Project/dsMSSQL.Designer.cs index 0d35809..a195317 100644 --- a/Project/dsMSSQL.Designer.cs +++ b/Project/dsMSSQL.Designer.cs @@ -34,6 +34,8 @@ namespace Project { private LineCodeDataTable tableLineCode; + private UserGroupDataTable tableUserGroup; + private global::System.Data.SchemaSerializationMode _schemaSerializationMode = global::System.Data.SchemaSerializationMode.IncludeSchema; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -77,6 +79,9 @@ namespace Project { if ((ds.Tables["LineCode"] != null)) { base.Tables.Add(new LineCodeDataTable(ds.Tables["LineCode"])); } + if ((ds.Tables["UserGroup"] != null)) { + base.Tables.Add(new UserGroupDataTable(ds.Tables["UserGroup"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -145,6 +150,16 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public UserGroupDataTable UserGroup { + get { + return this.tableUserGroup; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -227,6 +242,9 @@ namespace Project { if ((ds.Tables["LineCode"] != null)) { base.Tables.Add(new LineCodeDataTable(ds.Tables["LineCode"])); } + if ((ds.Tables["UserGroup"] != null)) { + base.Tables.Add(new UserGroupDataTable(ds.Tables["UserGroup"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -290,6 +308,12 @@ namespace Project { this.tableLineCode.InitVars(); } } + this.tableUserGroup = ((UserGroupDataTable)(base.Tables["UserGroup"])); + if ((initTable == true)) { + if ((this.tableUserGroup != null)) { + this.tableUserGroup.InitVars(); + } + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -310,6 +334,8 @@ namespace Project { base.Tables.Add(this.tableInventory); this.tableLineCode = new LineCodeDataTable(); base.Tables.Add(this.tableLineCode); + this.tableUserGroup = new UserGroupDataTable(); + base.Tables.Add(this.tableUserGroup); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -342,6 +368,12 @@ namespace Project { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private bool ShouldSerializeUserGroup() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -412,6 +444,9 @@ namespace Project { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public delegate void LineCodeRowChangeEventHandler(object sender, LineCodeRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public delegate void UserGroupRowChangeEventHandler(object sender, UserGroupRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -2620,6 +2655,323 @@ namespace Project { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class UserGroupDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columndept; + + private global::System.Data.DataColumn columngcode; + + private global::System.Data.DataColumn columnpath_kj; + + private global::System.Data.DataColumn columnadvpurchase; + + private global::System.Data.DataColumn columnpermission; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UserGroupDataTable() { + this.TableName = "UserGroup"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal UserGroupDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected UserGroupDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn deptColumn { + get { + return this.columndept; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn path_kjColumn { + get { + return this.columnpath_kj; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn advpurchaseColumn { + get { + return this.columnadvpurchase; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn permissionColumn { + get { + return this.columnpermission; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UserGroupRow this[int index] { + get { + return ((UserGroupRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event UserGroupRowChangeEventHandler UserGroupRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event UserGroupRowChangeEventHandler UserGroupRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event UserGroupRowChangeEventHandler UserGroupRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public event UserGroupRowChangeEventHandler UserGroupRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void AddUserGroupRow(UserGroupRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UserGroupRow AddUserGroupRow(string dept, string gcode, string path_kj, bool advpurchase, int permission) { + UserGroupRow rowUserGroupRow = ((UserGroupRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + dept, + gcode, + path_kj, + advpurchase, + permission}; + rowUserGroupRow.ItemArray = columnValuesArray; + this.Rows.Add(rowUserGroupRow); + return rowUserGroupRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UserGroupRow FindBydept(string dept) { + return ((UserGroupRow)(this.Rows.Find(new object[] { + dept}))); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public override global::System.Data.DataTable Clone() { + UserGroupDataTable cln = ((UserGroupDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new UserGroupDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal void InitVars() { + this.columndept = base.Columns["dept"]; + this.columngcode = base.Columns["gcode"]; + this.columnpath_kj = base.Columns["path_kj"]; + this.columnadvpurchase = base.Columns["advpurchase"]; + this.columnpermission = base.Columns["permission"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitClass() { + this.columndept = new global::System.Data.DataColumn("dept", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columndept); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); + this.columnpath_kj = new global::System.Data.DataColumn("path_kj", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpath_kj); + this.columnadvpurchase = new global::System.Data.DataColumn("advpurchase", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnadvpurchase); + this.columnpermission = new global::System.Data.DataColumn("permission", typeof(int), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnpermission); + this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { + this.columndept}, true)); + this.columndept.AllowDBNull = false; + this.columndept.Unique = true; + this.columndept.MaxLength = 100; + this.columngcode.MaxLength = 10; + this.columnpath_kj.MaxLength = 100; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UserGroupRow NewUserGroupRow() { + return ((UserGroupRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new UserGroupRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(UserGroupRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.UserGroupRowChanged != null)) { + this.UserGroupRowChanged(this, new UserGroupRowChangeEvent(((UserGroupRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.UserGroupRowChanging != null)) { + this.UserGroupRowChanging(this, new UserGroupRowChangeEvent(((UserGroupRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.UserGroupRowDeleted != null)) { + this.UserGroupRowDeleted(this, new UserGroupRowChangeEvent(((UserGroupRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.UserGroupRowDeleting != null)) { + this.UserGroupRowDeleting(this, new UserGroupRowChangeEvent(((UserGroupRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void RemoveUserGroupRow(UserGroupRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + dsMSSQL ds = new dsMSSQL(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "UserGroupDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -4215,6 +4567,144 @@ namespace Project { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class UserGroupRow : global::System.Data.DataRow { + + private UserGroupDataTable tableUserGroup; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal UserGroupRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableUserGroup = ((UserGroupDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string dept { + get { + return ((string)(this[this.tableUserGroup.deptColumn])); + } + set { + this[this.tableUserGroup.deptColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string gcode { + get { + if (this.IsgcodeNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableUserGroup.gcodeColumn])); + } + } + set { + this[this.tableUserGroup.gcodeColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string path_kj { + get { + if (this.Ispath_kjNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableUserGroup.path_kjColumn])); + } + } + set { + this[this.tableUserGroup.path_kjColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool advpurchase { + get { + if (this.IsadvpurchaseNull()) { + return false; + } + else { + return ((bool)(this[this.tableUserGroup.advpurchaseColumn])); + } + } + set { + this[this.tableUserGroup.advpurchaseColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public int permission { + get { + if (this.IspermissionNull()) { + return 0; + } + else { + return ((int)(this[this.tableUserGroup.permissionColumn])); + } + } + set { + this[this.tableUserGroup.permissionColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsgcodeNull() { + return this.IsNull(this.tableUserGroup.gcodeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetgcodeNull() { + this[this.tableUserGroup.gcodeColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool Ispath_kjNull() { + return this.IsNull(this.tableUserGroup.path_kjColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void Setpath_kjNull() { + this[this.tableUserGroup.path_kjColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsadvpurchaseNull() { + return this.IsNull(this.tableUserGroup.advpurchaseColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetadvpurchaseNull() { + this[this.tableUserGroup.advpurchaseColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IspermissionNull() { + return this.IsNull(this.tableUserGroup.permissionColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetpermissionNull() { + this[this.tableUserGroup.permissionColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -4384,6 +4874,40 @@ namespace Project { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public class UserGroupRowChangeEvent : global::System.EventArgs { + + private UserGroupRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UserGroupRowChangeEvent(UserGroupRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UserGroupRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace Project.dsMSSQLTableAdapters { @@ -8376,6 +8900,457 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class UserGroupTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public UserGroupTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "UserGroup"; + tableMapping.ColumnMappings.Add("dept", "dept"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); + tableMapping.ColumnMappings.Add("path_kj", "path_kj"); + tableMapping.ColumnMappings.Add("advpurchase", "advpurchase"); + tableMapping.ColumnMappings.Add("permission", "permission"); + 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 [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission)))"; + this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_path_kj", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path_kj", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_path_kj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path_kj", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_advpurchase", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_advpurchase", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", 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 [UserGroup] ([dept], [gcode], [path_kj], [advpurchase], [permission])" + + " VALUES (@dept, @gcode, @path_kj, @advpurchase, @permission);\r\nSELECT dept, gcod" + + "e, path_kj, advpurchase, permission FROM UserGroup WHERE (dept = @dept)"; + this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path_kj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path_kj", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@advpurchase", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", 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 [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [advpurchase] = @advpurchase, [permission] = @permission WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission))); +SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept = @dept)"; + this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@path_kj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path_kj", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@advpurchase", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_gcode", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_path_kj", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path_kj", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_path_kj", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "path_kj", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_advpurchase", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_advpurchase", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advpurchase", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_permission", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "permission", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::Project.Properties.Settings.Default.gwcs; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "SELECT dept, gcode, path_kj, advpurchase, permission\r\nFROM UserGroup\r\nWHERE " + + " (ISNULL(gcode, \'\') <> \'\') AND (ISNULL(permission, 0) > 0)"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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(dsMSSQL.UserGroupDataTable dataTable) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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 dsMSSQL.UserGroupDataTable GetData() { + this.Adapter.SelectCommand = this.CommandCollection[0]; + dsMSSQL.UserGroupDataTable dataTable = new dsMSSQL.UserGroupDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(dsMSSQL.UserGroupDataTable dataTable) { + return this.Adapter.Update(dataTable); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(dsMSSQL dataSet) { + return this.Adapter.Update(dataSet, "UserGroup"); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow dataRow) { + return this.Adapter.Update(new global::System.Data.DataRow[] { + dataRow}); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual int Update(global::System.Data.DataRow[] dataRows) { + return this.Adapter.Update(dataRows); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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(string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable Original_advpurchase, global::System.Nullable Original_permission) { + if ((Original_dept == null)) { + throw new global::System.ArgumentNullException("Original_dept"); + } + else { + this.Adapter.DeleteCommand.Parameters[0].Value = ((string)(Original_dept)); + } + if ((Original_gcode == null)) { + this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_gcode)); + } + if ((Original_path_kj == null)) { + this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_path_kj)); + } + if ((Original_advpurchase.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[6].Value = ((bool)(Original_advpurchase.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; + } + if ((Original_permission.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[8].Value = ((int)(Original_permission.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; + } + 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)) { + this.Adapter.DeleteCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.DeleteCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.DeleteCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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 dept, string gcode, string path_kj, global::System.Nullable advpurchase, global::System.Nullable permission) { + if ((dept == null)) { + throw new global::System.ArgumentNullException("dept"); + } + else { + this.Adapter.InsertCommand.Parameters[0].Value = ((string)(dept)); + } + if ((gcode == null)) { + this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[1].Value = ((string)(gcode)); + } + if ((path_kj == null)) { + this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[2].Value = ((string)(path_kj)); + } + if ((advpurchase.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[3].Value = ((bool)(advpurchase.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value; + } + if ((permission.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[4].Value = ((int)(permission.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value; + } + global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State; + if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + this.Adapter.InsertCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.InsertCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.InsertCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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.Update, true)] + public virtual int Update(string dept, string gcode, string path_kj, global::System.Nullable advpurchase, global::System.Nullable permission, string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable Original_advpurchase, global::System.Nullable Original_permission) { + if ((dept == null)) { + throw new global::System.ArgumentNullException("dept"); + } + else { + this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(dept)); + } + if ((gcode == null)) { + this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(gcode)); + } + if ((path_kj == null)) { + this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(path_kj)); + } + if ((advpurchase.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[3].Value = ((bool)(advpurchase.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value; + } + if ((permission.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[4].Value = ((int)(permission.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value; + } + if ((Original_dept == null)) { + throw new global::System.ArgumentNullException("Original_dept"); + } + else { + this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_dept)); + } + if ((Original_gcode == null)) { + this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_gcode)); + } + if ((Original_path_kj == null)) { + this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[9].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_path_kj)); + } + if ((Original_advpurchase.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((bool)(Original_advpurchase.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; + } + if ((Original_permission.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((int)(Original_permission.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + } + 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)) { + this.Adapter.UpdateCommand.Connection.Open(); + } + try { + int returnValue = this.Adapter.UpdateCommand.ExecuteNonQuery(); + return returnValue; + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + this.Adapter.UpdateCommand.Connection.Close(); + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [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.Update, true)] + public virtual int Update(string gcode, string path_kj, global::System.Nullable advpurchase, global::System.Nullable permission, string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable Original_advpurchase, global::System.Nullable Original_permission) { + return this.Update(Original_dept, gcode, path_kj, advpurchase, permission, Original_dept, Original_gcode, Original_path_kj, Original_advpurchase, Original_permission); + } + } + /// ///Represents the connection and commands used to retrieve and save data. /// @@ -8497,6 +9472,8 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i private LineCodeTableAdapter _lineCodeTableAdapter; + private UserGroupTableAdapter _userGroupTableAdapter; + private bool _backupDataSetBeforeUpdate; private global::System.Data.IDbConnection _connection; @@ -8582,6 +9559,20 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.EditorAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterManagerPropertyEditor, Microso" + + "ft.VSDesigner, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3" + + "a", "System.Drawing.Design.UITypeEditor")] + public UserGroupTableAdapter UserGroupTableAdapter { + get { + return this._userGroupTableAdapter; + } + set { + this._userGroupTableAdapter = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool BackupDataSetBeforeUpdate { @@ -8621,6 +9612,10 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i && (this._lineCodeTableAdapter.Connection != null))) { return this._lineCodeTableAdapter.Connection; } + if (((this._userGroupTableAdapter != null) + && (this._userGroupTableAdapter.Connection != null))) { + return this._userGroupTableAdapter.Connection; + } return null; } set { @@ -8649,6 +9644,9 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i if ((this._lineCodeTableAdapter != null)) { count = (count + 1); } + if ((this._userGroupTableAdapter != null)) { + count = (count + 1); + } return count; } } @@ -8705,6 +9703,15 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i allChangedRows.AddRange(updatedRows); } } + if ((this._userGroupTableAdapter != null)) { + global::System.Data.DataRow[] updatedRows = dataSet.UserGroup.Select(null, null, global::System.Data.DataViewRowState.ModifiedCurrent); + updatedRows = this.GetRealUpdatedRows(updatedRows, allAddedRows); + if (((updatedRows != null) + && (0 < updatedRows.Length))) { + result = (result + this._userGroupTableAdapter.Update(updatedRows)); + allChangedRows.AddRange(updatedRows); + } + } return result; } @@ -8755,6 +9762,14 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i allAddedRows.AddRange(addedRows); } } + if ((this._userGroupTableAdapter != null)) { + global::System.Data.DataRow[] addedRows = dataSet.UserGroup.Select(null, null, global::System.Data.DataViewRowState.Added); + if (((addedRows != null) + && (0 < addedRows.Length))) { + result = (result + this._userGroupTableAdapter.Update(addedRows)); + allAddedRows.AddRange(addedRows); + } + } return result; } @@ -8765,6 +9780,14 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private int UpdateDeletedRows(dsMSSQL dataSet, global::System.Collections.Generic.List allChangedRows) { int result = 0; + if ((this._userGroupTableAdapter != null)) { + global::System.Data.DataRow[] deletedRows = dataSet.UserGroup.Select(null, null, global::System.Data.DataViewRowState.Deleted); + if (((deletedRows != null) + && (0 < deletedRows.Length))) { + result = (result + this._userGroupTableAdapter.Update(deletedRows)); + allChangedRows.AddRange(deletedRows); + } + } if ((this._lineCodeTableAdapter != null)) { global::System.Data.DataRow[] deletedRows = dataSet.LineCode.Select(null, null, global::System.Data.DataViewRowState.Deleted); if (((deletedRows != null) @@ -8864,6 +9887,10 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i && (this.MatchTableAdapterConnection(this._lineCodeTableAdapter.Connection) == false))) { throw new global::System.ArgumentException("TableAdapterManager에서 관리하는 모든 TableAdapter에는 동일한 연결 문자열을 사용해야 합니다."); } + if (((this._userGroupTableAdapter != null) + && (this.MatchTableAdapterConnection(this._userGroupTableAdapter.Connection) == false))) { + throw new global::System.ArgumentException("TableAdapterManager에서 관리하는 모든 TableAdapter에는 동일한 연결 문자열을 사용해야 합니다."); + } global::System.Data.IDbConnection workConnection = this.Connection; if ((workConnection == null)) { throw new global::System.ApplicationException("TableAdapterManager에 연결 정보가 없습니다. 각 TableAdapterManager TableAdapter 속성을 올바른 Tabl" + @@ -8940,6 +9967,15 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i adaptersWithAcceptChangesDuringUpdate.Add(this._lineCodeTableAdapter.Adapter); } } + if ((this._userGroupTableAdapter != null)) { + revertConnections.Add(this._userGroupTableAdapter, this._userGroupTableAdapter.Connection); + this._userGroupTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(workConnection)); + this._userGroupTableAdapter.Transaction = ((global::System.Data.SqlClient.SqlTransaction)(workTransaction)); + if (this._userGroupTableAdapter.Adapter.AcceptChangesDuringUpdate) { + this._userGroupTableAdapter.Adapter.AcceptChangesDuringUpdate = false; + adaptersWithAcceptChangesDuringUpdate.Add(this._userGroupTableAdapter.Adapter); + } + } // //---- Perform updates ----------- // @@ -9018,6 +10054,10 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i this._lineCodeTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._lineCodeTableAdapter])); this._lineCodeTableAdapter.Transaction = null; } + if ((this._userGroupTableAdapter != null)) { + this._userGroupTableAdapter.Connection = ((global::System.Data.SqlClient.SqlConnection)(revertConnections[this._userGroupTableAdapter])); + this._userGroupTableAdapter.Transaction = null; + } if ((0 < adaptersWithAcceptChangesDuringUpdate.Count)) { global::System.Data.Common.DataAdapter[] adapters = new System.Data.Common.DataAdapter[adaptersWithAcceptChangesDuringUpdate.Count]; adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters); diff --git a/Project/dsMSSQL.xsd b/Project/dsMSSQL.xsd index 4958d42..c6a98d3 100644 --- a/Project/dsMSSQL.xsd +++ b/Project/dsMSSQL.xsd @@ -686,6 +686,79 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate FROM LineCode WHERE (i + + + + + + DELETE FROM [UserGroup] WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission))) + + + + + + + + + + + + + + + + INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [advpurchase], [permission]) VALUES (@dept, @gcode, @path_kj, @advpurchase, @permission); +SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept = @dept) + + + + + + + + + + + + SELECT dept, gcode, path_kj, advpurchase, permission +FROM UserGroup +WHERE (ISNULL(gcode, '') <> '') AND (ISNULL(permission, 0) > 0) + + + + + + UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [advpurchase] = @advpurchase, [permission] = @permission WHERE (([dept] = @Original_dept) AND ((@IsNull_gcode = 1 AND [gcode] IS NULL) OR ([gcode] = @Original_gcode)) AND ((@IsNull_path_kj = 1 AND [path_kj] IS NULL) OR ([path_kj] = @Original_path_kj)) AND ((@IsNull_advpurchase = 1 AND [advpurchase] IS NULL) OR ([advpurchase] = @Original_advpurchase)) AND ((@IsNull_permission = 1 AND [permission] IS NULL) OR ([permission] = @Original_permission))); +SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept = @dept) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -719,7 +792,7 @@ WHERE (idx = @idx) - + @@ -846,7 +919,7 @@ WHERE (idx = @idx) - + @@ -917,7 +990,7 @@ WHERE (idx = @idx) - + @@ -975,7 +1048,7 @@ WHERE (idx = @idx) - + @@ -1045,7 +1118,7 @@ WHERE (idx = @idx) - + @@ -1089,6 +1162,35 @@ WHERE (idx = @idx) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1111,5 +1213,9 @@ WHERE (idx = @idx) + + + + \ No newline at end of file diff --git a/Project/dsMSSQL.xss b/Project/dsMSSQL.xss index 92ed96b..aab6c55 100644 --- a/Project/dsMSSQL.xss +++ b/Project/dsMSSQL.xss @@ -6,7 +6,7 @@ --> - + diff --git a/Project/fMain.Designer.cs b/Project/fMain.Designer.cs index 24ae49a..9cadbce 100644 --- a/Project/fMain.Designer.cs +++ b/Project/fMain.Designer.cs @@ -40,7 +40,6 @@ this.statusStrip1 = new System.Windows.Forms.StatusStrip(); this.sbRedis = new System.Windows.Forms.ToolStripStatusLabel(); this.sbLogin = new System.Windows.Forms.ToolStripStatusLabel(); - this.btLog = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.btSetting = new System.Windows.Forms.ToolStripMenuItem(); this.로그인ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -50,6 +49,7 @@ this.userInfoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.userAccountToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.myAccouserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.권한설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.customerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menu_kuntae = new System.Windows.Forms.ToolStripMenuItem(); this.staffGridToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -59,13 +59,13 @@ this.menu_project = new System.Windows.Forms.ToolStripMenuItem(); this.menu_dailyhistory = new System.Windows.Forms.ToolStripMenuItem(); this.menu_jago = new System.Windows.Forms.ToolStripMenuItem(); - this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menu_eq = new System.Windows.Forms.ToolStripMenuItem(); this.dataFOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataMoldEOLToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dataToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.라인코드관리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.personalInventoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.boardsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.패치내역ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.minutesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -89,12 +89,9 @@ this.계정목록ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.그룹정보ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.tabControl1 = new System.Windows.Forms.TabControl(); - this.tabPage1 = new System.Windows.Forms.TabPage(); - this.권한설정ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.cmTab.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout(); - this.tabControl1.SuspendLayout(); this.SuspendLayout(); // // tmDisplay @@ -158,21 +155,11 @@ this.sbLogin.Size = new System.Drawing.Size(50, 17); this.sbLogin.Text = "{LOGIN}"; // - // btLog - // - this.btLog.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btLog.ForeColor = System.Drawing.Color.DimGray; - this.btLog.Name = "btLog"; - this.btLog.Size = new System.Drawing.Size(105, 23); - this.btLog.Text = "프로그램기록"; - this.btLog.Click += new System.EventHandler(this.logToolStripMenuItem_Click); - // // menuStrip1 // this.menuStrip1.Font = new System.Drawing.Font("맑은 고딕", 10F); this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.btSetting, - this.btLog, this.로그인ToolStripMenuItem, this.commonToolStripMenuItem, this.managementToolStripMenuItem, @@ -255,6 +242,13 @@ this.myAccouserToolStripMenuItem.Text = "계정목록"; this.myAccouserToolStripMenuItem.Click += new System.EventHandler(this.myAccouserToolStripMenuItem_Click); // + // 권한설정ToolStripMenuItem + // + this.권한설정ToolStripMenuItem.Name = "권한설정ToolStripMenuItem"; + this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(134, 24); + this.권한설정ToolStripMenuItem.Text = "권한설정"; + this.권한설정ToolStripMenuItem.Click += new System.EventHandler(this.권한설정ToolStripMenuItem_Click); + // // customerToolStripMenuItem // this.customerToolStripMenuItem.Name = "customerToolStripMenuItem"; @@ -331,15 +325,6 @@ this.menu_jago.Text = "품목재고"; this.menu_jago.Click += new System.EventHandler(this.재고관리ToolStripMenuItem_Click); // - // personalInventoryToolStripMenuItem - // - this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; - this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem"; - this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(153, 24); - this.personalInventoryToolStripMenuItem.Text = "개인별 물품"; - this.personalInventoryToolStripMenuItem.Visible = false; - this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click); - // // menu_eq // this.menu_eq.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -386,6 +371,15 @@ this.라인코드관리ToolStripMenuItem.Text = "라인코드관리"; this.라인코드관리ToolStripMenuItem.Click += new System.EventHandler(this.라인코드관리ToolStripMenuItem_Click); // + // personalInventoryToolStripMenuItem + // + this.personalInventoryToolStripMenuItem.ForeColor = System.Drawing.Color.HotPink; + this.personalInventoryToolStripMenuItem.Name = "personalInventoryToolStripMenuItem"; + this.personalInventoryToolStripMenuItem.Size = new System.Drawing.Size(153, 24); + this.personalInventoryToolStripMenuItem.Text = "개인별 물품"; + this.personalInventoryToolStripMenuItem.Visible = false; + this.personalInventoryToolStripMenuItem.Click += new System.EventHandler(this.personalInventoryToolStripMenuItem_Click); + // // boardsToolStripMenuItem // this.boardsToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -570,7 +564,6 @@ // tabControl1 // this.tabControl1.Appearance = System.Windows.Forms.TabAppearance.FlatButtons; - this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Dock = System.Windows.Forms.DockStyle.Fill; this.tabControl1.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.tabControl1.Location = new System.Drawing.Point(1, 28); @@ -583,25 +576,6 @@ this.tabControl1.TabIndex = 34; this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); // - // tabPage1 - // - this.tabPage1.BackColor = System.Drawing.Color.LightGray; - this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; - this.tabPage1.ContextMenuStrip = this.cmTab; - this.tabPage1.Location = new System.Drawing.Point(4, 29); - this.tabPage1.Name = "tabPage1"; - this.tabPage1.Padding = new System.Windows.Forms.Padding(10); - this.tabPage1.Size = new System.Drawing.Size(1026, 561); - this.tabPage1.TabIndex = 0; - this.tabPage1.Text = "요약"; - // - // 권한설정ToolStripMenuItem - // - this.권한설정ToolStripMenuItem.Name = "권한설정ToolStripMenuItem"; - this.권한설정ToolStripMenuItem.Size = new System.Drawing.Size(152, 24); - this.권한설정ToolStripMenuItem.Text = "권한설정"; - this.권한설정ToolStripMenuItem.Click += new System.EventHandler(this.권한설정ToolStripMenuItem_Click); - // // fMain // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -624,7 +598,6 @@ this.statusStrip1.PerformLayout(); this.menuStrip1.ResumeLayout(false); this.menuStrip1.PerformLayout(); - this.tabControl1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -641,7 +614,6 @@ private System.Windows.Forms.ToolStripStatusLabel sbBCD; private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.ToolStripMenuItem btSetting; - private System.Windows.Forms.ToolStripMenuItem btLog; private System.Windows.Forms.MenuStrip menuStrip1; private System.Windows.Forms.ToolStripMenuItem commonToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem itemsToolStripMenuItem; @@ -673,7 +645,6 @@ private System.Windows.Forms.ToolStripMenuItem myAccouserToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem customerImportToolStripMenuItem; private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem 라인코드관리ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem materialImportToolStripMenuItem; diff --git a/Project/fMain.cs b/Project/fMain.cs index 177dea1..9c990d7 100644 --- a/Project/fMain.cs +++ b/Project/fMain.cs @@ -19,7 +19,7 @@ namespace Project this.KeyDown += (s1, e1) => { if (e1.KeyCode == Keys.F12) btSetting.PerformClick(); - else if (e1.KeyCode == Keys.F11) btLog.PerformClick(); + //else if (e1.KeyCode == Keys.F11) btLog.PerformClick(); else if (e1.KeyCode == Keys.F1 && e1.Control && e1.Shift) { Dialog.fDebug f = new Dialog.fDebug(); @@ -156,7 +156,7 @@ namespace Project void _SetLang() { - btSetting.Text = Lang.Setting; + //btSetting.Text = Lang.Setting; } void barcode_ReceiveData(object sender, Device.Barcode.ReceiveDataEventArgs e) @@ -378,13 +378,11 @@ namespace Project void menu_nrpurchase() { - string formkey = "PUCHASE"; if (!ShowForm(formkey)) AddForm(formkey, new FEQ0000.fPurchase()); - - } + private void nRPurchaseToolStripMenuItem_Click(object sender, EventArgs e) { menu_nrpurchase(); @@ -472,16 +470,34 @@ namespace Project f.Dock = DockStyle.Fill; f.ControlBox = false; f.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; + f.FormClosed += f_FormClosed; + f.Tag = key; this.tabControl1.TabPages.Add(key, f.Text); this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].BorderStyle = BorderStyle.Fixed3D; this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Padding = new Padding(10, 10, 10, 10); this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].BackColor = Color.LightGray; this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].ContextMenuStrip = this.cmTab; this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Controls.Add(f); - this.tabControl1.SelectedIndex = this.tabControl1.TabPages.Count - 1; + this.tabControl1.TabPages[this.tabControl1.TabPages.Count - 1].Tag = key; + this.tabControl1.SelectedIndex = this.tabControl1.TabPages.Count - 1; f.Show(); } + void f_FormClosed(object sender, FormClosedEventArgs e) + { + var f = sender as Form; + var key = f.Tag.ToString(); + foreach(TabPage tab in this.tabControl1.TabPages) + { + if (tab.Visible == true) + { + this.tabControl1.TabPages.Remove(tab); + break; + } + } + if (this.tabControl1.TabPages.Count > 0) this.tabControl1.SelectedIndex = this.tabControl1.TabCount - 1; + } + private void 라인코드관리ToolStripMenuItem_Click(object sender, EventArgs e) { _Management.fLineCode f = new _Management.fLineCode(); @@ -550,18 +566,16 @@ namespace Project private void 로그인ToolStripMenuItem_Click(object sender, EventArgs e) { - if (this.tabControl1.TabPages.Count > 1) + while (tabControl1.TabPages.Count > 0) { - while (tabControl1.TabPages.Count > 1) - { - var tab = this.tabControl1.TabPages[1]; - var f = tab.Controls[0] as System.Windows.Forms.Form; - f.Close(); - f.Dispose(); - tabControl1.TabPages.Remove(tab); - this.tabControl1.Refresh(); - } + var tab = this.tabControl1.TabPages[0]; + var f = tab.Controls[0] as System.Windows.Forms.Form; + f.Close(); + f.Dispose(); + tabControl1.TabPages.Remove(tab); + this.tabControl1.Refresh(); } + Func_Login(); } diff --git a/Project/fMain.resx b/Project/fMain.resx index cbd48a0..64ae914 100644 --- a/Project/fMain.resx +++ b/Project/fMain.resx @@ -162,34 +162,6 @@ Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIkAA/CByYwUOGgQgTfvDgwINChQw9IHD4UGBEABAuUETo oaNEDxg1erTo4IGDiQAGNFCA4QABAg4jdkxpoYOABAkUGKD4UaUFARUCMLCwk6NGCkADRKBQNKEHDB6E RpDQlCNUoRYkSJhQYKPFAyqZThjbleMBDxw07CxQYMKGBRs9vNTQcaGHBXjjjuS4t2LFgAA7 - - - - - R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA - AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 - QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl - OoWKdGiDBgEBADs= - - - - - R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh - e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI - oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui - ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC - Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= - - - - - R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// - /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY - JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP - jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA - Ow== @@ -252,6 +224,34 @@ AAAIfABJCBxIsKDBgwhJjFjIMOEIARQyGICAYMTBhyNEJCDAIMADiwIZChhhAAGHAQoUBJjAcESIly8v LDwA8+VCEThxghAYISfOhSCCBh2wsACAo0dbNhhxoIKEDh8wBFjQMKSGjBs7egBZcIQFByA2LCjA1WDL hQnTql2rNiAAOw== + + + + + R0lGODlhEAAQAIQQAP/cpv/GcNvb292RIP+kG/+5T6m5rMStgK13Jv+wOt2TJKmwrP/zcZOru////wAA + AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAQACwAAAAAEAAQAAAIZQAhCBxIsKBABgQBGCTIoCEEBgEWDmRAgMAAAwUgKJQ4 + QIEDBwciSmw4QMDHBRIBBCiQAIGABw8aSBSosgHMmCkH2oQpc6bAnTh9QgDa0ydRoUMffCw6s4FJB0wl + OoWKdGiDBgEBADs= + + + + + R0lGODlhEAAQAIQfAJrM+3OSsKfS++zx9uXt9Yis1FdwkZW51ElVa8fj/bba/NXb5PL2+o276b3d/VJh + e7TR4ENLXNXn8KLD536kwIyzzJ/E2KjL3t7n7ykxQz5FVa/W/OLp8I+w1P///////yH/C05FVFNDQVBF + Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAItgA9CBxIcOCHgx4kQIBwwcKBChQiBgjgASEECQQGZNRI + oGMDAxU9QCCQoGRJBygZNPgo8AKDBB1iyuzAoOYDgRZeonSgoGfPDQxuejjwcsLMAkgFBBVY4aVPBRui + ClCKQCCFojGRIm0ggEBVDxQG8IQqdSoAAhGsijWqdSsADmk9BBBLdqoAAHgxaBAYgAHPsnjxDtjrwcAC + Bhw5KOaAYQCEDHwNSH7wAAGCCBE0aMggtKBnggEBADs= + + + + + R0lGODlhEAAQAIMPAEWi6azap1WzS9LusYrSbApexXLHV+z41vH559Ltw8ns+pe75hBs0iCZEP////// + /yH/C05FVFNDQVBFMi4wAwEBAAAh+QQBAAAPACwAAAAAEAAQAAAIiwAfCBxIsKDBBw4SOjg4MGGDBgwY + JDzo4OEBBAgUMGiwkGBFBAcODAAAYMEAjh4ZIBgwQAAAAgZOdkTIQEGCAQRICoAZACVNBQACkHxpQEDP + jg5qLhgKQIDTowIrJoA5NGKDABIbNpjqlEGBAguyag3QEiLYsDOjPgwQYEFYsQUdRpSY1qDCugzzBgQA + Ow== diff --git a/SubProject/FBS0000/Holiday/fHolyday.cs b/SubProject/FBS0000/Holiday/fHolyday.cs index 741930f..b901ffa 100644 --- a/SubProject/FBS0000/Holiday/fHolyday.cs +++ b/SubProject/FBS0000/Holiday/fHolyday.cs @@ -53,7 +53,7 @@ namespace FBS0000 this.cmbUser.SelectedIndex = curuserindex; //일반사용자의경우에는 상태를 변경하지 못한다. - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.holyday)); + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyday)); if (curLevel >= 5) { //권한이 잇으므로 모든 사용자로 한다. diff --git a/SubProject/FCM0000/Customer_Import.cs b/SubProject/FCM0000/Customer_Import.cs index 377c771..ecb72ed 100644 --- a/SubProject/FCM0000/Customer_Import.cs +++ b/SubProject/FCM0000/Customer_Import.cs @@ -248,7 +248,7 @@ namespace FCM0000 if (dr[0] == DBNull.Value) continue; //nullerror string sangho = dr[1].ToString().Trim(); - int cnt = (int)(taE.ExistName(sangho)); + int cnt = (int)(taE.ExistName(sangho,FCOMMON.info.Login.gcode)); if (cnt > 0) continue; // diff --git a/SubProject/FCM0000/DSInventory.Designer.cs b/SubProject/FCM0000/DSInventory.Designer.cs index 73c7b3d..9fe5567 100644 --- a/SubProject/FCM0000/DSInventory.Designer.cs +++ b/SubProject/FCM0000/DSInventory.Designer.cs @@ -3828,20 +3828,21 @@ WHERE (idx = @Original_idx)"; B.model AS itemModel, A.project, A.projectName, A.wuid, A.wdate, B.sid FROM Inventory AS A LEFT OUTER JOIN Items AS B ON A.item = B.idx -WHERE (A.gcode = @gcode) AND (A.pdate BETWEEN @sd AND @ed) AND (ISNULL(A.uid, '') LIKE @uid) +WHERE (A.gcode = @gcode) AND (A.pdate BETWEEN @sd AND @ed) AND (ISNULL(A.uid, '') LIKE @uid) AND (A.invtype LIKE @invtype) ORDER BY A.pdate DESC"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); 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("@uid", 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("@invtype", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "invtype", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [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(DSInventory.vInventoryDataTable dataTable, string gcode, string sd, string ed, string uid) { + public virtual int Fill(DSInventory.vInventoryDataTable dataTable, string gcode, string sd, string ed, string uid, string invtype) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); @@ -3867,6 +3868,12 @@ ORDER BY A.pdate DESC"; else { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid)); } + if ((invtype == null)) { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(invtype)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -3878,7 +3885,7 @@ ORDER BY A.pdate 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 DSInventory.vInventoryDataTable GetData(string gcode, string sd, string ed, string uid) { + public virtual DSInventory.vInventoryDataTable GetData(string gcode, string sd, string ed, string uid, string invtype) { this.Adapter.SelectCommand = this.CommandCollection[0]; if ((gcode == null)) { throw new global::System.ArgumentNullException("gcode"); @@ -3904,6 +3911,12 @@ ORDER BY A.pdate DESC"; else { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(uid)); } + if ((invtype == null)) { + this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(invtype)); + } DSInventory.vInventoryDataTable dataTable = new DSInventory.vInventoryDataTable(); this.Adapter.Fill(dataTable); return dataTable; diff --git a/SubProject/FCM0000/DSInventory.xsd b/SubProject/FCM0000/DSInventory.xsd index 7f76618..2baf2d0 100644 --- a/SubProject/FCM0000/DSInventory.xsd +++ b/SubProject/FCM0000/DSInventory.xsd @@ -232,13 +232,14 @@ VALUES (@gcode,@pdate,@invtype,@uid,@serial,@dr_qty,@dr_amt,@cr_qty,@cr_amt,@pl B.model AS itemModel, A.project, A.projectName, A.wuid, A.wdate, B.sid FROM Inventory AS A LEFT OUTER JOIN Items AS B ON A.item = B.idx -WHERE (A.gcode = @gcode) AND (A.pdate BETWEEN @sd AND @ed) AND (ISNULL(A.uid, '') LIKE @uid) +WHERE (A.gcode = @gcode) AND (A.pdate BETWEEN @sd AND @ed) AND (ISNULL(A.uid, '') LIKE @uid) AND (A.invtype LIKE @invtype) ORDER BY A.pdate DESC + @@ -304,7 +305,7 @@ WHERE (idx = @Original_idx) - + @@ -395,7 +396,7 @@ WHERE (idx = @Original_idx) - + diff --git a/SubProject/FCM0000/DSInventory.xss b/SubProject/FCM0000/DSInventory.xss index 448e656..b5c3c36 100644 --- a/SubProject/FCM0000/DSInventory.xss +++ b/SubProject/FCM0000/DSInventory.xss @@ -4,7 +4,7 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + diff --git a/SubProject/FCM0000/FCM0000.csproj b/SubProject/FCM0000/FCM0000.csproj index 859d143..75e26c4 100644 --- a/SubProject/FCM0000/FCM0000.csproj +++ b/SubProject/FCM0000/FCM0000.csproj @@ -143,12 +143,24 @@ fCode.cs - + Form - + + finventoryAdd.cs + + + Form + + fLovUser.cs + + Form + + + fItemAdd.cs + Form @@ -173,12 +185,6 @@ fUserGroupPermission.cs - - Form - - - finventoryAdd.cs - Form @@ -191,10 +197,10 @@ fInventory.cs - + Form - + fItems.cs @@ -203,10 +209,10 @@ fHolidaytable.cs - + Form - + fLovOneItem.cs @@ -221,10 +227,10 @@ fLovProject.cs - + Form - + fLovItem.cs @@ -281,9 +287,15 @@ fCode.cs - + + finventoryAdd.cs + + fLovUser.cs + + fItemAdd.cs + fUserAuth.cs @@ -293,22 +305,19 @@ fCustoms.cs - - finventoryAdd.cs - fInventoryUser.cs fInventory.cs - + fItems.cs fHolidaytable.cs - + fLovOneItem.cs @@ -317,7 +326,7 @@ fLovProject.cs - + fLovItem.cs diff --git a/SubProject/FCM0000/User/fUserAuth.cs b/SubProject/FCM0000/User/fUserAuth.cs index f1665ec..78b3c95 100644 --- a/SubProject/FCM0000/User/fUserAuth.cs +++ b/SubProject/FCM0000/User/fUserAuth.cs @@ -32,7 +32,6 @@ namespace FCM0000 //e.Row["cid"] = selcectIDX; } - void refreshData() { try diff --git a/SubProject/FCM0000/User/fUserGroupPermission.Designer.cs b/SubProject/FCM0000/User/fUserGroupPermission.Designer.cs index 2b4000d..2bf1e13 100644 --- a/SubProject/FCM0000/User/fUserGroupPermission.Designer.cs +++ b/SubProject/FCM0000/User/fUserGroupPermission.Designer.cs @@ -35,6 +35,7 @@ this.button1 = new System.Windows.Forms.Button(); this.checkBox1 = new System.Windows.Forms.CheckBox(); this.checkBox2 = new System.Windows.Forms.CheckBox(); + this.checkBox3 = new System.Windows.Forms.CheckBox(); this.SuspendLayout(); // // c0 @@ -113,11 +114,23 @@ this.checkBox2.Text = "근태관리"; this.checkBox2.UseVisualStyleBackColor = true; // + // checkBox3 + // + this.checkBox3.AutoSize = true; + this.checkBox3.Location = new System.Drawing.Point(142, 14); + this.checkBox3.Name = "checkBox3"; + this.checkBox3.Size = new System.Drawing.Size(170, 34); + this.checkBox3.TabIndex = 4; + this.checkBox3.Tag = "6"; + this.checkBox3.Text = "(구매)상세입력"; + this.checkBox3.UseVisualStyleBackColor = true; + // // fUserGroupPermission // this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 30F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(160, 297); + this.ClientSize = new System.Drawing.Size(313, 297); + this.Controls.Add(this.checkBox3); this.Controls.Add(this.checkBox2); this.Controls.Add(this.checkBox1); this.Controls.Add(this.button1); @@ -146,5 +159,6 @@ private System.Windows.Forms.Button button1; private System.Windows.Forms.CheckBox checkBox1; private System.Windows.Forms.CheckBox checkBox2; + private System.Windows.Forms.CheckBox checkBox3; } } \ No newline at end of file diff --git a/SubProject/FCM0000/dsMSSQL.Designer.cs b/SubProject/FCM0000/dsMSSQL.Designer.cs index 217752c..2061068 100644 --- a/SubProject/FCM0000/dsMSSQL.Designer.cs +++ b/SubProject/FCM0000/dsMSSQL.Designer.cs @@ -700,6 +700,8 @@ namespace FCM0000 { private global::System.Data.DataColumn columnimport; + private global::System.Data.DataColumn columngcode; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ItemsDataTable() { @@ -877,6 +879,14 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -931,7 +941,8 @@ namespace FCM0000 { bool disable, bool bparam1, int iparam1, - string import) { + string import, + string gcode) { ItemsRow rowItemsRow = ((ItemsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -951,7 +962,8 @@ namespace FCM0000 { disable, bparam1, iparam1, - import}; + import, + gcode}; rowItemsRow.ItemArray = columnValuesArray; this.Rows.Add(rowItemsRow); return rowItemsRow; @@ -999,6 +1011,7 @@ namespace FCM0000 { this.columnbparam1 = base.Columns["bparam1"]; this.columniparam1 = base.Columns["iparam1"]; this.columnimport = base.Columns["import"]; + this.columngcode = base.Columns["gcode"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1040,6 +1053,8 @@ namespace FCM0000 { base.Columns.Add(this.columniparam1); this.columnimport = new global::System.Data.DataColumn("import", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnimport); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1062,6 +1077,7 @@ namespace FCM0000 { this.columnunit.DefaultValue = ((string)("EA")); this.columnunit.MaxLength = 10; this.columnimport.MaxLength = 1; + this.columngcode.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1213,6 +1229,8 @@ namespace FCM0000 { private global::System.Data.DataColumn columnwdate; + private global::System.Data.DataColumn columngcode; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public CommonDataTable() { @@ -1318,6 +1336,14 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -1355,7 +1381,7 @@ namespace FCM0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public CommonRow AddCommonRow(string grp, string code, string svalue, int ivalue, double fvalue, string memo, string wuid, System.DateTime wdate) { + public CommonRow AddCommonRow(string grp, string code, string svalue, int ivalue, double fvalue, string memo, string wuid, System.DateTime wdate, string gcode) { CommonRow rowCommonRow = ((CommonRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -1366,7 +1392,8 @@ namespace FCM0000 { fvalue, memo, wuid, - wdate}; + wdate, + gcode}; rowCommonRow.ItemArray = columnValuesArray; this.Rows.Add(rowCommonRow); return rowCommonRow; @@ -1405,6 +1432,7 @@ namespace FCM0000 { this.columnmemo = base.Columns["memo"]; this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; + this.columngcode = base.Columns["gcode"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1428,6 +1456,8 @@ namespace FCM0000 { base.Columns.Add(this.columnwuid); this.columnwdate = new global::System.Data.DataColumn("wdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnwdate); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -1443,6 +1473,8 @@ namespace FCM0000 { this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; + this.columngcode.AllowDBNull = false; + this.columngcode.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3401,6 +3433,8 @@ namespace FCM0000 { private global::System.Data.DataColumn columnname2; + private global::System.Data.DataColumn columngcode; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public CustomsDataTable() { @@ -3562,6 +3596,14 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -3599,7 +3641,23 @@ namespace FCM0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public CustomsRow AddCustomsRow(string grp, string name, string tel, string fax, string email, string memo, string wuid, System.DateTime wdate, string owner, string ownertel, string address, string uptae, string staff, string stafftel, string name2) { + public CustomsRow AddCustomsRow( + string grp, + string name, + string tel, + string fax, + string email, + string memo, + string wuid, + System.DateTime wdate, + string owner, + string ownertel, + string address, + string uptae, + string staff, + string stafftel, + string name2, + string gcode) { CustomsRow rowCustomsRow = ((CustomsRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -3617,7 +3675,8 @@ namespace FCM0000 { uptae, staff, stafftel, - name2}; + name2, + gcode}; rowCustomsRow.ItemArray = columnValuesArray; this.Rows.Add(rowCustomsRow); return rowCustomsRow; @@ -3663,6 +3722,7 @@ namespace FCM0000 { this.columnstaff = base.Columns["staff"]; this.columnstafftel = base.Columns["stafftel"]; this.columnname2 = base.Columns["name2"]; + this.columngcode = base.Columns["gcode"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3700,6 +3760,8 @@ namespace FCM0000 { base.Columns.Add(this.columnstafftel); this.columnname2 = new global::System.Data.DataColumn("name2", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnname2); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -3724,6 +3786,8 @@ namespace FCM0000 { this.columnstaff.MaxLength = 250; this.columnstafftel.MaxLength = 150; this.columnname2.MaxLength = 100; + this.columngcode.AllowDBNull = false; + this.columngcode.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3877,6 +3941,8 @@ namespace FCM0000 { private global::System.Data.DataColumn columnwdate; + private global::System.Data.DataColumn columngcode; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public StaffDataTable() { @@ -3990,6 +4056,14 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -4027,7 +4101,7 @@ namespace FCM0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public StaffRow AddStaffRow(int cid, string name, string grade, string dept, string tel, string email, string memo, string wuid, System.DateTime wdate) { + public StaffRow AddStaffRow(int cid, string name, string grade, string dept, string tel, string email, string memo, string wuid, System.DateTime wdate, string gcode) { StaffRow rowStaffRow = ((StaffRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -4039,7 +4113,8 @@ namespace FCM0000 { email, memo, wuid, - wdate}; + wdate, + gcode}; rowStaffRow.ItemArray = columnValuesArray; this.Rows.Add(rowStaffRow); return rowStaffRow; @@ -4079,6 +4154,7 @@ namespace FCM0000 { this.columnmemo = base.Columns["memo"]; this.columnwuid = base.Columns["wuid"]; this.columnwdate = base.Columns["wdate"]; + this.columngcode = base.Columns["gcode"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4104,6 +4180,8 @@ namespace FCM0000 { base.Columns.Add(this.columnwuid); this.columnwdate = new global::System.Data.DataColumn("wdate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnwdate); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -4121,6 +4199,8 @@ namespace FCM0000 { this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; this.columnwdate.AllowDBNull = false; + this.columngcode.AllowDBNull = false; + this.columngcode.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -4954,6 +5034,8 @@ namespace FCM0000 { private global::System.Data.DataColumn columnwuid; + private global::System.Data.DataColumn columngcode; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public ProjectsDataTable() { @@ -5099,6 +5181,14 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn gcodeColumn { + get { + return this.columngcode; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -5136,7 +5226,7 @@ namespace FCM0000 { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - public ProjectsRow AddProjectsRow(string ddate, string edate, string memo, string name, string odate, string part, string pdate, string process, string reqstaff, string sdate, string status, System.DateTime wdate, string wuid) { + public ProjectsRow AddProjectsRow(string ddate, string edate, string memo, string name, string odate, string part, string pdate, string process, string reqstaff, string sdate, string status, System.DateTime wdate, string wuid, string gcode) { ProjectsRow rowProjectsRow = ((ProjectsRow)(this.NewRow())); object[] columnValuesArray = new object[] { ddate, @@ -5152,7 +5242,8 @@ namespace FCM0000 { sdate, status, wdate, - wuid}; + wuid, + gcode}; rowProjectsRow.ItemArray = columnValuesArray; this.Rows.Add(rowProjectsRow); return rowProjectsRow; @@ -5196,6 +5287,7 @@ namespace FCM0000 { this.columnstatus = base.Columns["status"]; this.columnwdate = base.Columns["wdate"]; this.columnwuid = base.Columns["wuid"]; + this.columngcode = base.Columns["gcode"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -5229,6 +5321,8 @@ namespace FCM0000 { base.Columns.Add(this.columnwdate); this.columnwuid = new global::System.Data.DataColumn("wuid", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnwuid); + this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columngcode); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnddate.MaxLength = 50; @@ -5251,6 +5345,8 @@ namespace FCM0000 { this.columnwdate.AllowDBNull = false; this.columnwuid.AllowDBNull = false; this.columnwuid.MaxLength = 20; + this.columngcode.AllowDBNull = false; + this.columngcode.MaxLength = 10; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -6514,6 +6610,22 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string gcode { + get { + if (this.IsgcodeNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableItems.gcodeColumn])); + } + } + set { + this[this.tableItems.gcodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsnameNull() { @@ -6693,6 +6805,18 @@ namespace FCM0000 { public void SetimportNull() { this[this.tableItems.importColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsgcodeNull() { + return this.IsNull(this.tableItems.gcodeColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetgcodeNull() { + this[this.tableItems.gcodeColumn] = global::System.Convert.DBNull; + } } /// @@ -6838,6 +6962,17 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string gcode { + get { + return ((string)(this[this.tableCommon.gcodeColumn])); + } + set { + this[this.tableCommon.gcodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsgrpNull() { @@ -8506,6 +8641,17 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string gcode { + get { + return ((string)(this[this.tableCustoms.gcodeColumn])); + } + set { + this[this.tableCustoms.gcodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsgrpNull() { @@ -8822,6 +8968,17 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string gcode { + get { + return ((string)(this[this.tableStaff.gcodeColumn])); + } + set { + this[this.tableStaff.gcodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IscidNull() { @@ -9850,6 +10007,17 @@ namespace FCM0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string gcode { + get { + return ((string)(this[this.tableProjects.gcodeColumn])); + } + set { + this[this.tableProjects.gcodeColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IsddateNull() { @@ -11106,48 +11274,17 @@ namespace FCM0000.dsMSSQLTableAdapters { tableMapping.ColumnMappings.Add("bparam1", "bparam1"); tableMapping.ColumnMappings.Add("iparam1", "iparam1"); tableMapping.ColumnMappings.Add("import", "import"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); 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)) AND ((@IsNull_scale = 1 AND [scale] IS NULL) OR ([scale] = @Original_scale)) AND ((@IsNull_unit = 1 AND [unit] IS NULL) OR ([unit] = @Original_unit)) AND ((@IsNull_disable = 1 AND [disable] IS NULL) OR ([disable] = @Original_disable)) AND ((@IsNull_bparam1 = 1 AND [bparam1] IS NULL) OR ([bparam1] = @Original_bparam1)) AND ((@IsNull_iparam1 = 1 AND [iparam1] IS NULL) OR ([iparam1] = @Original_iparam1)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)))"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM Items\r\nWHERE (idx = @Original_idx)"; 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, "", "", "")); - this._adapter.DeleteCommand.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, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_model", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_model", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_manu", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "manu", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_manu", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "manu", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_supply", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supply", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_price", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "price", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_price", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 0, "price", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - 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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_disable", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_disable", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bparam1", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bparam1", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_iparam1", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_iparam1", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Char, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx], [scale], [unit], [disable], [bparam1], [iparam1], [import]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx, @scale, @unit, @disable, @bparam1, @iparam1, @import); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name, idx"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx], [scale], [unit], [disable], [bparam1], [iparam1], [import], [gcode]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx, @scale, @unit, @disable, @bparam1, @iparam1, @import, @gcode); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode 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, "", "", "")); @@ -11166,83 +11303,35 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bparam1", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@iparam1", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Char, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", 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, [scale] = @scale, [unit] = @" + - "unit, [disable] = @disable, [bparam1] = @bparam1, [iparam1] = @iparam1, [import]" + - " = @import WHERE (([idx] = @Original_idx) AND ((@IsNull_name = 1 AND [name] IS N" + - "ULL) 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] = @Or" + - "iginal_manu)) AND ((@IsNull_supply = 1 AND [supply] IS NULL) OR ([supply] = @Ori" + - "ginal_supply)) AND ((@IsNull_price = 1 AND [price] IS NULL) OR ([price] = @Origi" + - "nal_price)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_me" + - "mo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull" + - "_cate = 1 AND [cate] IS NULL) OR ([cate] = @Original_cate)) AND ((@IsNull_supply" + - "idx = 1 AND [supplyidx] IS NULL) OR ([supplyidx] = @Original_supplyidx)) AND ((@" + - "IsNull_scale = 1 AND [scale] IS NULL) OR ([scale] = @Original_scale)) AND ((@IsN" + - "ull_unit = 1 AND [unit] IS NULL) OR ([unit] = @Original_unit)) AND ((@IsNull_dis" + - "able = 1 AND [disable] IS NULL) OR ([disable] = @Original_disable)) AND ((@IsNul" + - "l_bparam1 = 1 AND [bparam1] IS NULL) OR ([bparam1] = @Original_bparam1)) AND ((@" + - "IsNull_iparam1 = 1 AND [iparam1] IS NULL) OR ([iparam1] = @Original_iparam1)) AN" + - "D ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)));" + - "\r\nSELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, su" + - "pplyidx, scale, unit, disable, bparam1, iparam1, import FROM Items WHERE (idx = " + - "@idx) ORDER BY cate, name, idx"; + 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, disable = @disable, bparam1 = @bparam1, iparam1 = @iparam1, import = @import, gcode = @gcode +WHERE (idx = @Original_idx); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode 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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@manu", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "manu", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supply", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@price", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 0, "price", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.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("@disable", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bparam1", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@iparam1", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Char, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", 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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_model", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_model", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_manu", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "manu", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_manu", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "manu", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_supply", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_supply", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_price", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "price", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_price", global::System.Data.SqlDbType.Decimal, 0, global::System.Data.ParameterDirection.Input, 18, 0, "price", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_cate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - 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("@IsNull_disable", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_disable", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_bparam1", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_bparam1", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_iparam1", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_iparam1", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_import", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_import", global::System.Data.SqlDbType.Char, 0, global::System.Data.ParameterDirection.Input, 0, 0, "import", 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, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 200, 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, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@model", global::System.Data.SqlDbType.NVarChar, 200, global::System.Data.ParameterDirection.Input, 0, 0, "model", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@manu", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "manu", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@supply", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "supply", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@price", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 0, "price", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, 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, 50, 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, 4, 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, 8, 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, 10, 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("@disable", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "disable", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@bparam1", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 0, 0, "bparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@iparam1", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "iparam1", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@import", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, "import", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11255,12 +11344,12 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] private void InitCommandCollection() { - this._commandCollection = new global::System.Data.SqlClient.SqlCommand[6]; + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[8]; 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, scale, unit, disable, bparam1, iparam1, import\r\nFROM Items\r\nWHERE (g" + - "code = @gcode)\r\nORDER BY cate, name, idx"; + "lyidx, scale, unit, disable, bparam1, iparam1, import, gcode\r\nFROM Items\r\nWH" + + "ERE (gcode = @gcode)\r\nORDER BY cate, name, idx"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); @@ -11271,46 +11360,45 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; - this._commandCollection[2].CommandText = @"SELECT bparam1, cate, disable, idx, import, iparam1, 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, '') <> '') AND (cate LIKE @cate) AND (gcode = @gcode) -ORDER BY sid, name, idx"; + this._commandCollection[2].CommandText = "SELECT COUNT(*) FROM Items\r\nwhere gcode = @gcode and isnull(replace(name,\' \',\'\') " + + "+ replace(model,\' \',\'\'),\'\') = @search"; 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, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", 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 bparam1, cate, disable, idx, import, iparam1, manu, memo, model, name, pr" + - "ice, scale, sid, supply, supplyidx, unit, wdate, wuid\r\nFROM Items\r\nWHERE (c" + - "ate LIKE @cate) AND (gcode = @code)\r\nORDER BY name, idx"; + this._commandCollection[3].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, 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, '') <> '') AND (cate LIKE @cate) AND (gcode = @gcode) ORDER BY sid, name, idx"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[4] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[4].Connection = this.Connection; - this._commandCollection[4].CommandText = @"SELECT bparam1, cate, disable, idx, import, iparam1, 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 - ISNULL(manu, N'') LIKE @search OR - ISNULL(supply, N'') LIKE @search OR - ISNULL(model, N'') LIKE @search OR - ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) -ORDER BY name, idx"; + this._commandCollection[4].CommandText = "SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, na" + + "me, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (ca" + + "te LIKE @cate) AND (gcode = @code) ORDER BY name, idx"; this._commandCollection[4].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[4].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].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "cate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[4].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[5] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[5].Connection = this.Connection; - this._commandCollection[5].CommandText = "SELECT bparam1, cate, disable, idx, import, iparam1, manu, memo, model, name, pri" + - "ce, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (idx = @id" + - "x)"; + this._commandCollection[5].CommandText = @"SELECT bparam1, cate, disable, gcode, idx, import, iparam1, 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 ISNULL(manu, N'') LIKE @search OR ISNULL(supply, N'') LIKE @search OR ISNULL(model, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) ORDER BY name, idx"; this._commandCollection[5].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[5].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[5].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[6] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[6].Connection = this.Connection; + this._commandCollection[6].CommandText = "SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, na" + + "me, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (id" + + "x = @idx)"; + this._commandCollection[6].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[6].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[7].Connection = this.Connection; + this._commandCollection[7].CommandText = "SELECT isnull(idx,-1)\r\nFROM Items\r\nWHERE (gcode = @gcode) AND (ISNULL(REPLA" + + "CE(name, \' \', \'\') + REPLACE(model, \' \', \'\'), \'\') = @search)"; + this._commandCollection[7].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -11354,7 +11442,7 @@ ORDER BY name, idx"; [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, string cate, string gcode) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((cate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -11379,7 +11467,7 @@ ORDER BY name, idx"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual dsMSSQL.ItemsDataTable GetDupCheck(string cate, string gcode) { - this.Adapter.SelectCommand = this.CommandCollection[2]; + this.Adapter.SelectCommand = this.CommandCollection[3]; if ((cate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -11402,7 +11490,7 @@ ORDER BY name, idx"; [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, string cate, string code) { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((cate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -11427,7 +11515,7 @@ ORDER BY name, idx"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual dsMSSQL.ItemsDataTable GetNoImage(string cate, string code) { - this.Adapter.SelectCommand = this.CommandCollection[3]; + this.Adapter.SelectCommand = this.CommandCollection[4]; if ((cate == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -11450,7 +11538,7 @@ ORDER BY name, idx"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, false)] public virtual int FillSearch(dsMSSQL.ItemsDataTable dataTable, string search, string gcode) { - this.Adapter.SelectCommand = this.CommandCollection[4]; + this.Adapter.SelectCommand = this.CommandCollection[5]; if ((search == null)) { throw new global::System.ArgumentNullException("search"); } @@ -11475,7 +11563,7 @@ ORDER BY name, idx"; [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual dsMSSQL.ItemsDataTable GetSearch(string search, string gcode) { - this.Adapter.SelectCommand = this.CommandCollection[4]; + this.Adapter.SelectCommand = this.CommandCollection[5]; if ((search == null)) { throw new global::System.ArgumentNullException("search"); } @@ -11497,8 +11585,8 @@ ORDER BY 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 GetIDX(int idx) { - this.Adapter.SelectCommand = this.CommandCollection[5]; + public virtual dsMSSQL.ItemsDataTable GetbyIDX(int idx) { + this.Adapter.SelectCommand = this.CommandCollection[6]; this.Adapter.SelectCommand.Parameters[0].Value = ((int)(idx)); dsMSSQL.ItemsDataTable dataTable = new dsMSSQL.ItemsDataTable(); this.Adapter.Fill(dataTable); @@ -11538,153 +11626,8 @@ ORDER BY 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, - global::System.Nullable Original_scale, - string Original_unit, - global::System.Nullable Original_disable, - global::System.Nullable Original_bparam1, - global::System.Nullable Original_iparam1, - string Original_import) { + public virtual int Delete(int Original_idx) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); - if ((Original_name == null)) { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_name)); - } - if ((Original_sid == null)) { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_sid)); - } - if ((Original_model == null)) { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_model)); - } - if ((Original_manu == null)) { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_manu)); - } - if ((Original_supply == null)) { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_supply)); - } - if ((Original_price.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[12].Value = ((decimal)(Original_price.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value; - } - if ((Original_memo == null)) { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_memo)); - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.DeleteCommand.Parameters[15].Value = ((string)(Original_wuid)); - } - this.Adapter.DeleteCommand.Parameters[16].Value = ((System.DateTime)(Original_wdate)); - if ((Original_cate == null)) { - this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[18].Value = ((string)(Original_cate)); - } - if ((Original_supplyidx.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[20].Value = ((int)(Original_supplyidx.Value)); - } - else { - 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)); - } - if ((Original_disable.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[26].Value = ((bool)(Original_disable.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[26].Value = global::System.DBNull.Value; - } - if ((Original_bparam1.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[28].Value = ((bool)(Original_bparam1.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[28].Value = global::System.DBNull.Value; - } - if ((Original_iparam1.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[30].Value = ((int)(Original_iparam1.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[29].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[30].Value = global::System.DBNull.Value; - } - if ((Original_import == null)) { - this.Adapter.DeleteCommand.Parameters[31].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[32].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[31].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[32].Value = ((string)(Original_import)); - } 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)) { @@ -11722,7 +11665,8 @@ ORDER BY name, idx"; global::System.Nullable disable, global::System.Nullable bparam1, global::System.Nullable iparam1, - string import) { + string import, + string gcode) { if ((name == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -11820,6 +11764,12 @@ ORDER BY name, idx"; else { this.Adapter.InsertCommand.Parameters[16].Value = ((string)(import)); } + if ((gcode == null)) { + this.Adapter.InsertCommand.Parameters[17].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[17].Value = ((string)(gcode)); + } 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)) { @@ -11858,24 +11808,8 @@ ORDER BY name, idx"; global::System.Nullable bparam1, global::System.Nullable iparam1, string import, + string gcode, 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, - global::System.Nullable Original_disable, - global::System.Nullable Original_bparam1, - global::System.Nullable Original_iparam1, - string Original_import, int idx) { if ((name == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -11974,135 +11908,14 @@ ORDER BY name, idx"; else { this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(import)); } - this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_idx)); - if ((Original_name == null)) { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; + if ((gcode == null)) { + this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_name)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(gcode)); } - if ((Original_sid == 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_sid)); - } - if ((Original_model == null)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_model)); - } - if ((Original_manu == null)) { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_manu)); - } - if ((Original_supply == null)) { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_supply)); - } - if ((Original_price.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[29].Value = ((decimal)(Original_price.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[28].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value; - } - if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_memo)); - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_wuid)); - } - this.Adapter.UpdateCommand.Parameters[33].Value = ((System.DateTime)(Original_wdate)); - if ((Original_cate == null)) { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_cate)); - } - if ((Original_supplyidx.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[37].Value = ((int)(Original_supplyidx.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[36].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[37].Value = global::System.DBNull.Value; - } - if ((Original_scale.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((double)(Original_scale.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; - } - if ((Original_unit == null)) { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_unit)); - } - if ((Original_disable.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((bool)(Original_disable.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; - } - if ((Original_bparam1.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[45].Value = ((bool)(Original_bparam1.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[44].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[45].Value = global::System.DBNull.Value; - } - if ((Original_iparam1.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[47].Value = ((int)(Original_iparam1.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[46].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[47].Value = global::System.DBNull.Value; - } - if ((Original_import == null)) { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[49].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[48].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[49].Value = ((string)(Original_import)); - } - this.Adapter.UpdateCommand.Parameters[50].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[19].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)) { @@ -12119,49 +11932,6 @@ ORDER BY name, idx"; } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [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.Update, true)] - public virtual int Update( - 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, - global::System.Nullable disable, - global::System.Nullable bparam1, - global::System.Nullable iparam1, - string import, - 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, - global::System.Nullable Original_disable, - global::System.Nullable Original_bparam1, - global::System.Nullable Original_iparam1, - string Original_import) { - return this.Update(name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, 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_disable, Original_bparam1, Original_iparam1, Original_import, Original_idx); - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] @@ -12195,6 +11965,86 @@ ORDER BY name, idx"; } return returnValue; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual global::System.Nullable ExistCheck(string gcode, string search) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[2]; + if ((gcode == null)) { + command.Parameters[0].Value = global::System.DBNull.Value; + } + else { + command.Parameters[0].Value = ((string)(gcode)); + } + if ((search == null)) { + throw new global::System.ArgumentNullException("search"); + } + else { + command.Parameters[1].Value = ((string)(search)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + object returnValue; + try { + returnValue = command.ExecuteScalar(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + if (((returnValue == null) + || (returnValue.GetType() == typeof(global::System.DBNull)))) { + return new global::System.Nullable(); + } + else { + return new global::System.Nullable(((int)(returnValue))); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public virtual global::System.Nullable ReadIDX(string gcode, string search) { + global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; + if ((gcode == null)) { + command.Parameters[0].Value = global::System.DBNull.Value; + } + else { + command.Parameters[0].Value = ((string)(gcode)); + } + if ((search == null)) { + throw new global::System.ArgumentNullException("search"); + } + else { + command.Parameters[1].Value = ((string)(search)); + } + global::System.Data.ConnectionState previousConnectionState = command.Connection.State; + if (((command.Connection.State & global::System.Data.ConnectionState.Open) + != global::System.Data.ConnectionState.Open)) { + command.Connection.Open(); + } + object returnValue; + try { + returnValue = command.ExecuteScalar(); + } + finally { + if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) { + command.Connection.Close(); + } + } + if (((returnValue == null) + || (returnValue.GetType() == typeof(global::System.DBNull)))) { + return new global::System.Nullable(); + } + else { + return new global::System.Nullable(((int)(returnValue))); + } + } } /// @@ -12327,10 +12177,11 @@ ORDER BY name, idx"; tableMapping.ColumnMappings.Add("memo", "memo"); tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); 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 [Common] WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + this._adapter.DeleteCommand.CommandText = @"DELETE FROM [Common] WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ([gcode] = @Original_gcode))"; 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_grp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); @@ -12345,6 +12196,7 @@ ORDER BY name, idx"; this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", 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 [Common] ([grp], [code], [svalue], [ivalue], [fvalue], [memo], [wuid], [wdate]) VALUES (@grp, @code, @svalue, @ivalue, @fvalue, @memo, @wuid, @wdate); @@ -12360,8 +12212,8 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE 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.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [Common] SET [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = @idx) ORDER BY grp, memo"; + this._adapter.UpdateCommand.CommandText = @"UPDATE [Common] SET [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [gcode] = @gcode WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ([gcode] = @Original_gcode)); +SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, gcode FROM Common WHERE (idx = @idx) ORDER BY grp, memo"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@code", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "code", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -12371,6 +12223,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.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("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", 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_grp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); @@ -12384,6 +12237,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", 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, "", "", "")); } @@ -12400,23 +12254,30 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate\r\nFROM Commo" + - "n\r\nWHERE (grp = @grp)\r\nORDER BY grp, memo"; + this._commandCollection[0].CommandText = "SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, gcode\r\nFROM " + + " Common\r\nWHERE (grp = @grpCode) AND (gcode = @gcode)\r\nORDER BY grp, memo"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; - this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grpCode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [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(dsMSSQL.CommonDataTable dataTable, string grp) { + public virtual int Fill(dsMSSQL.CommonDataTable dataTable, string grpCode, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((grp == null)) { + if ((grpCode == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[0].Value = ((string)(grp)); + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(grpCode)); + } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); @@ -12429,13 +12290,19 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE [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 dsMSSQL.CommonDataTable GetData(string grp) { + public virtual dsMSSQL.CommonDataTable GetData(string grpCode, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; - if ((grp == null)) { + if ((grpCode == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[0].Value = ((string)(grp)); + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(grpCode)); + } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); } dsMSSQL.CommonDataTable dataTable = new dsMSSQL.CommonDataTable(); this.Adapter.Fill(dataTable); @@ -12475,7 +12342,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE [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_grp, string Original_code, global::System.Nullable Original_ivalue, global::System.Nullable Original_fvalue, string Original_memo, string Original_wuid, System.DateTime Original_wdate) { + public virtual int Delete(int Original_idx, string Original_grp, string Original_code, global::System.Nullable Original_ivalue, global::System.Nullable Original_fvalue, string Original_memo, string Original_wuid, System.DateTime Original_wdate, string Original_gcode) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); if ((Original_grp == null)) { this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); @@ -12524,6 +12391,12 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE this.Adapter.DeleteCommand.Parameters[11].Value = ((string)(Original_wuid)); } this.Adapter.DeleteCommand.Parameters[12].Value = ((System.DateTime)(Original_wdate)); + if ((Original_gcode == null)) { + throw new global::System.ArgumentNullException("Original_gcode"); + } + else { + this.Adapter.DeleteCommand.Parameters[13].Value = ((string)(Original_gcode)); + } 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)) { @@ -12617,6 +12490,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE string memo, string wuid, System.DateTime wdate, + string gcode, int Original_idx, string Original_grp, string Original_code, @@ -12625,6 +12499,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE string Original_memo, string Original_wuid, System.DateTime Original_wdate, + string Original_gcode, int idx) { if ((grp == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -12669,55 +12544,67 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(wuid)); } this.Adapter.UpdateCommand.Parameters[7].Value = ((System.DateTime)(wdate)); - this.Adapter.UpdateCommand.Parameters[8].Value = ((int)(Original_idx)); - if ((Original_grp == null)) { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); } else { - this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[10].Value = ((string)(Original_grp)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(gcode)); + } + this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_idx)); + if ((Original_grp == null)) { + this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((string)(Original_grp)); } if ((Original_code == null)) { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(Original_code)); + this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_code)); } if ((Original_ivalue.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_ivalue.Value)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_ivalue.Value)); } else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[14].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[15].Value = global::System.DBNull.Value; } if ((Original_fvalue.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((double)(Original_fvalue.Value)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[17].Value = ((double)(Original_fvalue.Value)); } else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; } if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[19].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[18].Value = ((string)(Original_memo)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_memo)); } if ((Original_wuid == null)) { throw new global::System.ArgumentNullException("Original_wuid"); } else { - this.Adapter.UpdateCommand.Parameters[19].Value = ((string)(Original_wuid)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_wuid)); } - this.Adapter.UpdateCommand.Parameters[20].Value = ((System.DateTime)(Original_wdate)); - this.Adapter.UpdateCommand.Parameters[21].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[21].Value = ((System.DateTime)(Original_wdate)); + if ((Original_gcode == null)) { + throw new global::System.ArgumentNullException("Original_gcode"); + } + else { + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_gcode)); + } + this.Adapter.UpdateCommand.Parameters[23].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)) { @@ -12747,6 +12634,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE string memo, string wuid, System.DateTime wdate, + string gcode, int Original_idx, string Original_grp, string Original_code, @@ -12754,8 +12642,9 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE global::System.Nullable Original_fvalue, string Original_memo, string Original_wuid, - System.DateTime Original_wdate) { - return this.Update(grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, Original_idx, Original_grp, Original_code, Original_ivalue, Original_fvalue, Original_memo, Original_wuid, Original_wdate, Original_idx); + System.DateTime Original_wdate, + string Original_gcode) { + return this.Update(grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, gcode, Original_idx, Original_grp, Original_code, Original_ivalue, Original_fvalue, Original_memo, Original_wuid, Original_wdate, Original_gcode, Original_idx); } } @@ -15535,128 +15424,62 @@ SELECT idx, tolist, cclist, bcclist, title, sid, url, qty, remark, wuid, wdate, tableMapping.ColumnMappings.Add("staff", "staff"); tableMapping.ColumnMappings.Add("stafftel", "stafftel"); tableMapping.ColumnMappings.Add("name2", "name2"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); 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 [Customs] WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_owner = 1 AND [owner] IS NULL) OR ([owner] = @Original_owner)) AND ((@IsNull_ownertel = 1 AND [ownertel] IS NULL) OR ([ownertel] = @Original_ownertel)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_fax = 1 AND [fax] IS NULL) OR ([fax] = @Original_fax)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uptae = 1 AND [uptae] IS NULL) OR ([uptae] = @Original_uptae)) AND ((@IsNull_staff = 1 AND [staff] IS NULL) OR ([staff] = @Original_staff)) AND ((@IsNull_stafftel = 1 AND [stafftel] IS NULL) OR ([stafftel] = @Original_stafftel)) AND ((@IsNull_name2 = 1 AND [name2] IS NULL) OR ([name2] = @Original_name2)))"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM Customs\r\nWHERE (idx = @Original_idx)"; 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_grp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", 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, "", "", "")); - this._adapter.DeleteCommand.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, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_owner", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "owner", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_owner", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "owner", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ownertel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ownertel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ownertel", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ownertel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_address", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "address", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_address", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "address", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_fax", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fax", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_fax", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fax", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_email", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uptae", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uptae", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uptae", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uptae", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_staff", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "staff", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_staff", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "staff", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_stafftel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stafftel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_stafftel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stafftel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name2", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name2", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [Customs] ([grp], [name], [owner], [ownertel], [address], [tel], [fax], [email], [memo], [wuid], [wdate], [uptae], [staff], [stafftel], [name2]) VALUES (@grp, @name, @owner, @ownertel, @address, @tel, @fax, @email, @memo, @wuid, @wdate, @uptae, @staff, @stafftel, @name2); + this._adapter.InsertCommand.CommandText = @"INSERT INTO Customs + (grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wdate, uptae, staff, stafftel, name2, gcode) +VALUES (@grp,@name,@owner,@ownertel,@address,@tel,@fax,@email,@memo,@wuid,@wdate,@uptae,@staff,@stafftel,@name2,@gcode); SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wdate, uptae, staff, stafftel, name2 FROM Customs WHERE (idx = SCOPE_IDENTITY()) ORDER BY name"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@owner", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "owner", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ownertel", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ownertel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@address", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "address", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fax", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fax", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.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("@uptae", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uptae", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@staff", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "staff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stafftel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stafftel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 100, 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("@owner", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "owner", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ownertel", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ownertel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@address", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "address", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tel", global::System.Data.SqlDbType.VarChar, 150, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fax", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "fax", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, 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("@uptae", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "uptae", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@staff", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, "staff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stafftel", global::System.Data.SqlDbType.VarChar, 150, global::System.Data.ParameterDirection.Input, 0, 0, "stafftel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name2", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "name2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = "UPDATE [Customs] SET [grp] = @grp, [name] = @name, [owner] = @owner, [ownertel] =" + - " @ownertel, [address] = @address, [tel] = @tel, [fax] = @fax, [email] = @email, " + - "[memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [uptae] = @uptae, [staff] = @s" + - "taff, [stafftel] = @stafftel, [name2] = @name2 WHERE (([idx] = @Original_idx) AN" + - "D ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull" + - "_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_owner " + - "= 1 AND [owner] IS NULL) OR ([owner] = @Original_owner)) AND ((@IsNull_ownertel " + - "= 1 AND [ownertel] IS NULL) OR ([ownertel] = @Original_ownertel)) AND ((@IsNull_" + - "address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@Is" + - "Null_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_fax = " + - "1 AND [fax] IS NULL) OR ([fax] = @Original_fax)) AND ((@IsNull_email = 1 AND [em" + - "ail] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_memo = 1 AND [memo] " + - "IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate" + - "] = @Original_wdate) AND ((@IsNull_uptae = 1 AND [uptae] IS NULL) OR ([uptae] = " + - "@Original_uptae)) AND ((@IsNull_staff = 1 AND [staff] IS NULL) OR ([staff] = @Or" + - "iginal_staff)) AND ((@IsNull_stafftel = 1 AND [stafftel] IS NULL) OR ([stafftel]" + - " = @Original_stafftel)) AND ((@IsNull_name2 = 1 AND [name2] IS NULL) OR ([name2]" + - " = @Original_name2)));\r\nSELECT idx, grp, name, owner, ownertel, address, tel, fa" + - "x, email, memo, wuid, wdate, uptae, staff, stafftel, name2 FROM Customs WHERE (i" + - "dx = @idx) ORDER BY name"; + this._adapter.UpdateCommand.CommandText = @"UPDATE Customs +SET grp = @grp, name = @name, owner = @owner, ownertel = @ownertel, address = @address, tel = @tel, fax = @fax, email = @email, memo = @memo, wuid = @wuid, wdate = @wdate, + uptae = @uptae, staff = @staff, stafftel = @stafftel, name2 = @name2, gcode = @gcode +WHERE (idx = @Original_idx); +SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wdate, uptae, staff, stafftel, name2, gcode FROM Customs WHERE (idx = @idx) ORDER BY name"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - 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("@owner", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "owner", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ownertel", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ownertel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@address", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "address", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fax", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fax", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.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("@uptae", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uptae", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@staff", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "staff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stafftel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stafftel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name2", 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_grp", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grp", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grp", 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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_owner", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "owner", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_owner", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "owner", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ownertel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ownertel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ownertel", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ownertel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_address", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "address", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_address", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "address", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_fax", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fax", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_fax", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "fax", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_email", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_uptae", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uptae", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_uptae", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "uptae", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_staff", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "staff", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_staff", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "staff", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_stafftel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stafftel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_stafftel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "stafftel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_name2", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name2", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_name2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name2", 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, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 100, 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("@owner", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "owner", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ownertel", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ownertel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@address", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "address", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tel", global::System.Data.SqlDbType.VarChar, 150, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@fax", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "fax", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, 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("@uptae", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "uptae", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@staff", global::System.Data.SqlDbType.NVarChar, 250, global::System.Data.ParameterDirection.Input, 0, 0, "staff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@stafftel", global::System.Data.SqlDbType.VarChar, 150, global::System.Data.ParameterDirection.Input, 0, 0, "stafftel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name2", global::System.Data.SqlDbType.NVarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "name2", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -15673,33 +15496,52 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd" + - "ate, uptae, staff, stafftel, name2\r\nFROM Customs\r\nORDER BY name"; + "ate, uptae, staff, stafftel, name2, gcode\r\nFROM Customs\r\nWHERE (gcode = @gc" + + "ode)\r\nORDER BY name"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; this._commandCollection[1].CommandText = "SELECT ISNULL(COUNT(*), 0) AS Expr1\r\nFROM Customs\r\nWHERE (ISNULL(name, N\'\')" + - " LIKE @name) OR\r\n (ISNULL(name2, N\'\') LIKE @name)"; + " LIKE @name OR\r\n ISNULL(name2, N\'\') LIKE @name) AND (gcode = @gcod" + + "e)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", 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 address, email, fax, grp, idx, memo, name, name2, owner, ownertel, staff, " + - "stafftel, tel, uptae, wdate, wuid FROM Customs WHERE (grp = @grp)"; + this._commandCollection[2].CommandText = "SELECT address, email, fax, gcode, grp, idx, memo, name, name2, owner, ownertel," + + " staff, stafftel, tel, uptae, wdate, wuid\r\nFROM Customs\r\nWHERE (grp = @grp)" + + " AND (gcode = @gcode)"; this._commandCollection[2].CommandType = global::System.Data.CommandType.Text; this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grp", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "grp", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[2].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[3] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[3].Connection = this.Connection; - this._commandCollection[3].CommandText = @"SELECT address, email, fax, grp, idx, memo, name, name2, owner, ownertel, staff, stafftel, tel, uptae, wdate, wuid FROM Customs WHERE (ISNULL(name, N'') LIKE @search) OR (ISNULL(tel, N'') LIKE @search) OR (ISNULL(email, N'') LIKE @search) OR (ISNULL(name2, N'') LIKE @search) OR (memo LIKE @search)"; + this._commandCollection[3].CommandText = @"SELECT address, email, fax, gcode, grp, idx, memo, name, name2, owner, ownertel, staff, stafftel, tel, uptae, wdate, wuid +FROM Customs +WHERE (ISNULL(name, N'') LIKE @search OR + ISNULL(tel, N'') LIKE @search OR + ISNULL(email, N'') LIKE @search OR + ISNULL(name2, N'') LIKE @search) AND (gcode = @gcode) OR + (memo LIKE @search) AND (gcode = @gcode)"; this._commandCollection[3].CommandType = global::System.Data.CommandType.Text; this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@search", global::System.Data.SqlDbType.NVarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [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(dsMSSQL.CustomsDataTable dataTable) { + public virtual int Fill(dsMSSQL.CustomsDataTable dataTable, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -15711,8 +15553,14 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd [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 dsMSSQL.CustomsDataTable GetData() { + public virtual dsMSSQL.CustomsDataTable GetData(string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } dsMSSQL.CustomsDataTable dataTable = new dsMSSQL.CustomsDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -15722,7 +15570,7 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd [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 FillbyGrp(dsMSSQL.CustomsDataTable dataTable, string grp) { + public virtual int FillbyGrp(dsMSSQL.CustomsDataTable dataTable, string grp, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[2]; if ((grp == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -15730,6 +15578,12 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(grp)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -15741,7 +15595,7 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd [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.CustomsDataTable GetbyGrp(string grp) { + public virtual dsMSSQL.CustomsDataTable GetbyGrp(string grp, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[2]; if ((grp == null)) { this.Adapter.SelectCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -15749,6 +15603,12 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(grp)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } dsMSSQL.CustomsDataTable dataTable = new dsMSSQL.CustomsDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -15758,7 +15618,7 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd [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 FillSearch(dsMSSQL.CustomsDataTable dataTable, string search) { + public virtual int FillSearch(dsMSSQL.CustomsDataTable dataTable, string search, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[3]; if ((search == null)) { throw new global::System.ArgumentNullException("search"); @@ -15766,6 +15626,12 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -15777,7 +15643,7 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd [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.CustomsDataTable GetSearch(string search) { + public virtual dsMSSQL.CustomsDataTable GetSearch(string search, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[3]; if ((search == null)) { throw new global::System.ArgumentNullException("search"); @@ -15785,6 +15651,12 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } dsMSSQL.CustomsDataTable dataTable = new dsMSSQL.CustomsDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -15823,135 +15695,8 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd [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_grp, - string Original_name, - string Original_owner, - string Original_ownertel, - string Original_address, - string Original_tel, - string Original_fax, - string Original_email, - string Original_memo, - string Original_wuid, - System.DateTime Original_wdate, - string Original_uptae, - string Original_staff, - string Original_stafftel, - string Original_name2) { + public virtual int Delete(int Original_idx) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); - if ((Original_grp == null)) { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[2].Value = ((string)(Original_grp)); - } - if ((Original_name == null)) { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_name)); - } - if ((Original_owner == null)) { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_owner)); - } - if ((Original_ownertel == null)) { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_ownertel)); - } - if ((Original_address == null)) { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_address)); - } - if ((Original_tel == null)) { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_tel)); - } - if ((Original_fax == null)) { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_fax)); - } - if ((Original_email == null)) { - this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[16].Value = ((string)(Original_email)); - } - if ((Original_memo == null)) { - this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[18].Value = ((string)(Original_memo)); - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.DeleteCommand.Parameters[19].Value = ((string)(Original_wuid)); - } - this.Adapter.DeleteCommand.Parameters[20].Value = ((System.DateTime)(Original_wdate)); - if ((Original_uptae == null)) { - this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[22].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[22].Value = ((string)(Original_uptae)); - } - if ((Original_staff == 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_staff)); - } - if ((Original_stafftel == null)) { - this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[26].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[25].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[26].Value = ((string)(Original_stafftel)); - } - if ((Original_name2 == null)) { - this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[28].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[27].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[28].Value = ((string)(Original_name2)); - } 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)) { @@ -15972,7 +15717,23 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd [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 grp, string name, string owner, string ownertel, string address, string tel, string fax, string email, string memo, string wuid, System.DateTime wdate, string uptae, string staff, string stafftel, string name2) { + public virtual int Insert( + string grp, + string name, + string owner, + string ownertel, + string address, + string tel, + string fax, + string email, + string memo, + string wuid, + System.DateTime wdate, + string uptae, + string staff, + string stafftel, + string name2, + string gcode) { if ((grp == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -16058,6 +15819,12 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd else { this.Adapter.InsertCommand.Parameters[14].Value = ((string)(name2)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.InsertCommand.Parameters[15].Value = ((string)(gcode)); + } 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)) { @@ -16094,22 +15861,8 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd string staff, string stafftel, string name2, + string gcode, int Original_idx, - string Original_grp, - string Original_name, - string Original_owner, - string Original_ownertel, - string Original_address, - string Original_tel, - string Original_fax, - string Original_email, - string Original_memo, - string Original_wuid, - System.DateTime Original_wdate, - string Original_uptae, - string Original_staff, - string Original_stafftel, - string Original_name2, int idx) { if ((grp == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -16196,119 +15949,14 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd else { this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(name2)); } - this.Adapter.UpdateCommand.Parameters[15].Value = ((int)(Original_idx)); - if ((Original_grp == null)) { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[17].Value = global::System.DBNull.Value; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); } else { - this.Adapter.UpdateCommand.Parameters[16].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[17].Value = ((string)(Original_grp)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((string)(gcode)); } - if ((Original_name == 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_name)); - } - if ((Original_owner == 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_owner)); - } - if ((Original_ownertel == null)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_ownertel)); - } - if ((Original_address == null)) { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_address)); - } - if ((Original_tel == null)) { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_tel)); - } - if ((Original_fax == 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_fax)); - } - if ((Original_email == null)) { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_email)); - } - if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_memo)); - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_wuid)); - } - this.Adapter.UpdateCommand.Parameters[35].Value = ((System.DateTime)(Original_wdate)); - if ((Original_uptae == 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_uptae)); - } - if ((Original_staff == null)) { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[39].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[38].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[39].Value = ((string)(Original_staff)); - } - if ((Original_stafftel == null)) { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[41].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[40].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[41].Value = ((string)(Original_stafftel)); - } - if ((Original_name2 == null)) { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[43].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[42].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[43].Value = ((string)(Original_name2)); - } - this.Adapter.UpdateCommand.Parameters[44].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[17].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)) { @@ -16328,46 +15976,7 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [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.Update, true)] - public virtual int Update( - string grp, - string name, - string owner, - string ownertel, - string address, - string tel, - string fax, - string email, - string memo, - string wuid, - System.DateTime wdate, - string uptae, - string staff, - string stafftel, - string name2, - int Original_idx, - string Original_grp, - string Original_name, - string Original_owner, - string Original_ownertel, - string Original_address, - string Original_tel, - string Original_fax, - string Original_email, - string Original_memo, - string Original_wuid, - System.DateTime Original_wdate, - string Original_uptae, - string Original_staff, - string Original_stafftel, - string Original_name2) { - return this.Update(grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wdate, uptae, staff, stafftel, name2, Original_idx, Original_grp, Original_name, Original_owner, Original_ownertel, Original_address, Original_tel, Original_fax, Original_email, Original_memo, Original_wuid, Original_wdate, Original_uptae, Original_staff, Original_stafftel, Original_name2, Original_idx); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] - [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual global::System.Nullable ExistName(string name) { + public virtual global::System.Nullable ExistName(string name, string gcode) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1]; if ((name == null)) { throw new global::System.ArgumentNullException("name"); @@ -16375,6 +15984,12 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd else { command.Parameters[0].Value = ((string)(name)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + command.Parameters[1].Value = ((string)(gcode)); + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { @@ -16530,33 +16145,19 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd tableMapping.ColumnMappings.Add("memo", "memo"); tableMapping.ColumnMappings.Add("wuid", "wuid"); tableMapping.ColumnMappings.Add("wdate", "wdate"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); 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 [Staff] WHERE (([idx] = @Original_idx) AND ((@IsNull_cid = 1 AND [cid] IS NULL) OR ([cid] = @Original_cid)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate))"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM Staff\r\nWHERE (idx = @Original_idx)"; 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_cid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cid", 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, "", "", "")); - this._adapter.DeleteCommand.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, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_grade", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grade", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grade", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grade", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_dept", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_email", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [Staff] ([cid], [name], [grade], [dept], [tel], [email], [memo], [wuid], [wdate]) VALUES (@cid, @name, @grade, @dept, @tel, @email, @memo, @wuid, @wdate); -SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHERE (idx = SCOPE_IDENTITY())"; + this._adapter.InsertCommand.CommandText = @"INSERT INTO [Staff] ([gcode], [cid], [name], [grade], [dept], [tel], [email], [memo], [wuid], [wdate]) VALUES (@gcode, @cid, @name, @grade, @dept, @tel, @email, @memo, @wuid, @wdate); +SELECT idx, gcode, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHERE (idx = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@grade", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grade", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -16568,36 +16169,23 @@ SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHE 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.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [Staff] SET [cid] = @cid, [name] = @name, [grade] = @grade, [dept] = @dept, [tel] = @tel, [email] = @email, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_cid = 1 AND [cid] IS NULL) OR ([cid] = @Original_cid)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHERE (idx = @idx)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE Staff +SET gcode = @gcode, cid = @cid, name = @name, grade = @grade, dept = @dept, tel = @tel, email = @email, memo = @memo, wuid = @wuid, wdate = @wdate +WHERE (idx = @Original_idx); +SELECT idx, gcode, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHERE (idx = @idx)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - 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("@grade", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grade", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.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("@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_cid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cid", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_cid", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "cid", 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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_grade", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grade", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_grade", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "grade", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_dept", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_dept", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_tel", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_tel", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_email", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_email", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", 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, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@cid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "cid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 100, 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("@grade", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "grade", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@dept", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "dept", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@tel", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "tel", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@email", global::System.Data.SqlDbType.VarChar, 100, global::System.Data.ParameterDirection.Input, 0, 0, "email", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, 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("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -16613,16 +16201,24 @@ SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHE this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = "SELECT Staff.*\r\nFROM Staff"; + this._commandCollection[0].CommandText = "SELECT idx, gcode, cid, name, grade, dept, tel, email, memo, wuid, wdate\r\nFROM " + + " Staff\r\nWHERE (gcode = @gcode)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; + this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [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(dsMSSQL.StaffDataTable dataTable) { + public virtual int Fill(dsMSSQL.StaffDataTable dataTable, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -16634,8 +16230,14 @@ SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHE [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 dsMSSQL.StaffDataTable GetData() { + public virtual dsMSSQL.StaffDataTable GetData(string gcode) { this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[0].Value = ((string)(gcode)); + } dsMSSQL.StaffDataTable dataTable = new dsMSSQL.StaffDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -16674,71 +16276,8 @@ SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHE [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, global::System.Nullable Original_cid, string Original_name, string Original_grade, string Original_dept, string Original_tel, string Original_email, string Original_memo, string Original_wuid, System.DateTime Original_wdate) { + public virtual int Delete(int Original_idx) { this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); - if ((Original_cid.HasValue == true)) { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[2].Value = ((int)(Original_cid.Value)); - } - else { - this.Adapter.DeleteCommand.Parameters[1].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[2].Value = global::System.DBNull.Value; - } - if ((Original_name == null)) { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[4].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[3].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[4].Value = ((string)(Original_name)); - } - if ((Original_grade == null)) { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_grade)); - } - if ((Original_dept == null)) { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_dept)); - } - if ((Original_tel == null)) { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_tel)); - } - if ((Original_email == null)) { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_email)); - } - if ((Original_memo == null)) { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_memo)); - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.DeleteCommand.Parameters[15].Value = ((string)(Original_wuid)); - } - this.Adapter.DeleteCommand.Parameters[16].Value = ((System.DateTime)(Original_wdate)); 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)) { @@ -16759,56 +16298,62 @@ SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHE [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(global::System.Nullable cid, string name, string grade, string dept, string tel, string email, string memo, string wuid, System.DateTime wdate) { - if ((cid.HasValue == true)) { - this.Adapter.InsertCommand.Parameters[0].Value = ((int)(cid.Value)); + public virtual int Insert(string gcode, global::System.Nullable cid, string name, string grade, string dept, string tel, string email, string memo, string wuid, System.DateTime wdate) { + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); } else { - this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; + this.Adapter.InsertCommand.Parameters[0].Value = ((string)(gcode)); } - if ((name == null)) { + if ((cid.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[1].Value = ((int)(cid.Value)); + } + else { this.Adapter.InsertCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { - this.Adapter.InsertCommand.Parameters[1].Value = ((string)(name)); - } - if ((grade == null)) { + if ((name == null)) { this.Adapter.InsertCommand.Parameters[2].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[2].Value = ((string)(grade)); + this.Adapter.InsertCommand.Parameters[2].Value = ((string)(name)); } - if ((dept == null)) { + if ((grade == null)) { this.Adapter.InsertCommand.Parameters[3].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[3].Value = ((string)(dept)); + this.Adapter.InsertCommand.Parameters[3].Value = ((string)(grade)); } - if ((tel == null)) { + if ((dept == null)) { this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[4].Value = ((string)(tel)); + this.Adapter.InsertCommand.Parameters[4].Value = ((string)(dept)); } - if ((email == null)) { + if ((tel == null)) { this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[5].Value = ((string)(email)); + this.Adapter.InsertCommand.Parameters[5].Value = ((string)(tel)); } - if ((memo == null)) { + if ((email == null)) { this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value; } else { - this.Adapter.InsertCommand.Parameters[6].Value = ((string)(memo)); + this.Adapter.InsertCommand.Parameters[6].Value = ((string)(email)); + } + if ((memo == null)) { + this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[7].Value = ((string)(memo)); } if ((wuid == null)) { throw new global::System.ArgumentNullException("wuid"); } else { - this.Adapter.InsertCommand.Parameters[7].Value = ((string)(wuid)); + this.Adapter.InsertCommand.Parameters[8].Value = ((string)(wuid)); } - this.Adapter.InsertCommand.Parameters[8].Value = ((System.DateTime)(wdate)); + this.Adapter.InsertCommand.Parameters[9].Value = ((System.DateTime)(wdate)); 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)) { @@ -16829,141 +16374,64 @@ SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHE [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.Update, true)] - public virtual int Update( - global::System.Nullable cid, - string name, - string grade, - string dept, - string tel, - string email, - string memo, - string wuid, - System.DateTime wdate, - int Original_idx, - global::System.Nullable Original_cid, - string Original_name, - string Original_grade, - string Original_dept, - string Original_tel, - string Original_email, - string Original_memo, - string Original_wuid, - System.DateTime Original_wdate, - int idx) { - if ((cid.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[0].Value = ((int)(cid.Value)); + public virtual int Update(string gcode, global::System.Nullable cid, string name, string grade, string dept, string tel, string email, string memo, string wuid, System.DateTime wdate, int Original_idx, int idx) { + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); } else { - this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[0].Value = ((string)(gcode)); } - if ((name == null)) { + if ((cid.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[1].Value = ((int)(cid.Value)); + } + else { this.Adapter.UpdateCommand.Parameters[1].Value = global::System.DBNull.Value; } - else { - this.Adapter.UpdateCommand.Parameters[1].Value = ((string)(name)); - } - if ((grade == null)) { + if ((name == null)) { this.Adapter.UpdateCommand.Parameters[2].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(grade)); + this.Adapter.UpdateCommand.Parameters[2].Value = ((string)(name)); } - if ((dept == null)) { + if ((grade == null)) { this.Adapter.UpdateCommand.Parameters[3].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(dept)); + this.Adapter.UpdateCommand.Parameters[3].Value = ((string)(grade)); } - if ((tel == null)) { + if ((dept == null)) { this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(tel)); + this.Adapter.UpdateCommand.Parameters[4].Value = ((string)(dept)); } - if ((email == null)) { + if ((tel == null)) { this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(email)); + this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(tel)); } - if ((memo == null)) { + if ((email == null)) { this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(memo)); + this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(email)); + } + if ((memo == null)) { + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(memo)); } if ((wuid == null)) { throw new global::System.ArgumentNullException("wuid"); } else { - this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(wuid)); + this.Adapter.UpdateCommand.Parameters[8].Value = ((string)(wuid)); } - this.Adapter.UpdateCommand.Parameters[8].Value = ((System.DateTime)(wdate)); - this.Adapter.UpdateCommand.Parameters[9].Value = ((int)(Original_idx)); - if ((Original_cid.HasValue == true)) { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[11].Value = ((int)(Original_cid.Value)); - } - else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; - } - if ((Original_name == null)) { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(Original_name)); - } - if ((Original_grade == 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_grade)); - } - if ((Original_dept == 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_dept)); - } - if ((Original_tel == 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_tel)); - } - if ((Original_email == 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_email)); - } - if ((Original_memo == null)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_memo)); - } - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((string)(Original_wuid)); - } - this.Adapter.UpdateCommand.Parameters[25].Value = ((System.DateTime)(Original_wdate)); - this.Adapter.UpdateCommand.Parameters[26].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((System.DateTime)(wdate)); + this.Adapter.UpdateCommand.Parameters[10].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[11].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)) { @@ -16979,33 +16447,6 @@ SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHE } } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [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.Update, true)] - public virtual int Update( - global::System.Nullable cid, - string name, - string grade, - string dept, - string tel, - string email, - string memo, - string wuid, - System.DateTime wdate, - int Original_idx, - global::System.Nullable Original_cid, - string Original_name, - string Original_grade, - string Original_dept, - string Original_tel, - string Original_email, - string Original_memo, - string Original_wuid, - System.DateTime Original_wdate) { - return this.Update(cid, name, grade, dept, tel, email, memo, wuid, wdate, Original_idx, Original_cid, Original_name, Original_grade, Original_dept, Original_tel, Original_email, Original_memo, Original_wuid, Original_wdate, Original_idx); - } } /// @@ -18535,98 +17976,58 @@ ORDER BY pdate DESC"; tableMapping.ColumnMappings.Add("status", "status"); tableMapping.ColumnMappings.Add("wdate", "wdate"); tableMapping.ColumnMappings.Add("wuid", "wuid"); + tableMapping.ColumnMappings.Add("gcode", "gcode"); 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 [Projects] WHERE (((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ([idx] = @Original_idx) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ([wdate] = @Original_wdate) AND ([wuid] = @Original_wuid))"; + this._adapter.DeleteCommand.CommandText = "DELETE FROM Projects\r\nWHERE (idx = @Original_idx)"; this._adapter.DeleteCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ddate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - 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_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", 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, "", "", "")); - this._adapter.DeleteCommand.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, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_odate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_odate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_part", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_part", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_reqstaff", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_reqstaff", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.InsertCommand.Connection = this.Connection; - this._adapter.InsertCommand.CommandText = @"INSERT INTO [Projects] ([ddate], [edate], [memo], [name], [odate], [part], [pdate], [process], [reqstaff], [sdate], [status], [wdate], [wuid]) VALUES (@ddate, @edate, @memo, @name, @odate, @part, @pdate, @process, @reqstaff, @sdate, @status, @wdate, @wuid); + this._adapter.InsertCommand.CommandText = @"INSERT INTO Projects + (ddate, edate, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid, gcode) +VALUES (@ddate,@edate,@memo,@name,@odate,@part,@pdate,@process,@reqstaff,@sdate,@status,@wdate,@wuid,@gcode); SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid FROM Projects WHERE (idx = SCOPE_IDENTITY())"; this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@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("@odate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@part", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqstaff", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@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("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@odate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@part", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqstaff", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, 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("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.UpdateCommand.Connection = this.Connection; - this._adapter.UpdateCommand.CommandText = @"UPDATE [Projects] SET [ddate] = @ddate, [edate] = @edate, [memo] = @memo, [name] = @name, [odate] = @odate, [part] = @part, [pdate] = @pdate, [process] = @process, [reqstaff] = @reqstaff, [sdate] = @sdate, [status] = @status, [wdate] = @wdate, [wuid] = @wuid WHERE (((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ([idx] = @Original_idx) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ([wdate] = @Original_wdate) AND ([wuid] = @Original_wuid)); -SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid FROM Projects WHERE (idx = @idx)"; + this._adapter.UpdateCommand.CommandText = @"UPDATE Projects +SET ddate = @ddate, edate = @edate, memo = @memo, name = @name, odate = @odate, part = @part, pdate = @pdate, process = @process, reqstaff = @reqstaff, sdate = @sdate, + status = @status, wdate = @wdate, wuid = @wuid, gcode = @gcode +WHERE (idx = @Original_idx); +SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid, gcode FROM Projects WHERE (idx = @idx)"; this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text; - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.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("@odate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@part", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqstaff", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.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("@wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_ddate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ddate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_edate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_edate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Original, 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_memo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_memo", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", 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, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_odate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_odate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_part", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_part", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_process", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_reqstaff", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_reqstaff", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_sdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_sdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_status", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_status", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wdate", global::System.Data.SqlDbType.DateTime, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wdate", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); - this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_wuid", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", 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, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ddate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "ddate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@edate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "edate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@name", global::System.Data.SqlDbType.NVarChar, 255, global::System.Data.ParameterDirection.Input, 0, 0, "name", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@odate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "odate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@part", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "part", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@process", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "process", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@reqstaff", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "reqstaff", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@sdate", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "sdate", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@status", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, "status", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@wdate", global::System.Data.SqlDbType.DateTime, 8, 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("@wuid", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, "wuid", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -18643,17 +18044,18 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; this._commandCollection[0].CommandText = "SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda" + - "te, status, wdate, wuid\r\nFROM Projects\r\nWHERE idx = @idx"; + "te, status, wdate, wuid, gcode\r\nFROM Projects\r\nWHERE (idx = @idx)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@idx", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[1].Connection = this.Connection; - this._commandCollection[1].CommandText = "SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda" + - "te, status, wdate, wuid\r\nFROM Projects\r\nWHERE (ISNULL(name, N\'\') LIKE @sear" + - "ch OR\r\n ISNULL(memo, N\'\') LIKE @search) AND (ISNULL(isdel, 0) = 0)" + - ""; + this._commandCollection[1].CommandText = "SELECT ddate, edate, gcode, idx, memo, name, odate, part, pdate, process, reqstaf" + + "f, sdate, status, wdate, wuid FROM Projects WHERE (ISNULL(name, N\'\') LIKE @searc" + + "h OR ISNULL(memo, N\'\') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gc" + + "ode)"; this._commandCollection[1].CommandType = global::System.Data.CommandType.Text; this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -18686,7 +18088,7 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda [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 FillSearch(dsMSSQL.ProjectsDataTable dataTable, string search) { + public virtual int FillSearch(dsMSSQL.ProjectsDataTable dataTable, string search, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((search == null)) { throw new global::System.ArgumentNullException("search"); @@ -18694,6 +18096,12 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } if ((this.ClearBeforeFill == true)) { dataTable.Clear(); } @@ -18705,7 +18113,7 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda [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.ProjectsDataTable GetSearch(string search) { + public virtual dsMSSQL.ProjectsDataTable GetSearch(string search, string gcode) { this.Adapter.SelectCommand = this.CommandCollection[1]; if ((search == null)) { throw new global::System.ArgumentNullException("search"); @@ -18713,6 +18121,12 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda else { this.Adapter.SelectCommand.Parameters[0].Value = ((string)(search)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode)); + } dsMSSQL.ProjectsDataTable dataTable = new dsMSSQL.ProjectsDataTable(); this.Adapter.Fill(dataTable); return dataTable; @@ -18751,103 +18165,8 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda [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(string Original_ddate, string Original_edate, int Original_idx, string Original_memo, string Original_name, string Original_odate, string Original_part, string Original_pdate, string Original_process, string Original_reqstaff, string Original_sdate, string Original_status, System.DateTime Original_wdate, string Original_wuid) { - if ((Original_ddate == null)) { - this.Adapter.DeleteCommand.Parameters[0].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[1].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[0].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[1].Value = ((string)(Original_ddate)); - } - if ((Original_edate == null)) { - this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[3].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[2].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[3].Value = ((string)(Original_edate)); - } - this.Adapter.DeleteCommand.Parameters[4].Value = ((int)(Original_idx)); - if ((Original_memo == null)) { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[6].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[5].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[6].Value = ((string)(Original_memo)); - } - if ((Original_name == null)) { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[8].Value = ((string)(Original_name)); - } - if ((Original_odate == null)) { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[10].Value = ((string)(Original_odate)); - } - if ((Original_part == null)) { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[12].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[11].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[12].Value = ((string)(Original_part)); - } - if ((Original_pdate == null)) { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[14].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[14].Value = ((string)(Original_pdate)); - } - if ((Original_process == null)) { - this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[16].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[16].Value = ((string)(Original_process)); - } - if ((Original_reqstaff == null)) { - this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[18].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[17].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[18].Value = ((string)(Original_reqstaff)); - } - if ((Original_sdate == null)) { - this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[20].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[19].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[20].Value = ((string)(Original_sdate)); - } - if ((Original_status == null)) { - this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(1)); - this.Adapter.DeleteCommand.Parameters[22].Value = global::System.DBNull.Value; - } - else { - this.Adapter.DeleteCommand.Parameters[21].Value = ((object)(0)); - this.Adapter.DeleteCommand.Parameters[22].Value = ((string)(Original_status)); - } - this.Adapter.DeleteCommand.Parameters[23].Value = ((System.DateTime)(Original_wdate)); - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.DeleteCommand.Parameters[24].Value = ((string)(Original_wuid)); - } + public virtual int Delete(int Original_idx) { + this.Adapter.DeleteCommand.Parameters[0].Value = ((int)(Original_idx)); 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)) { @@ -18868,7 +18187,7 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda [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 ddate, string edate, string memo, string name, string odate, string part, string pdate, string process, string reqstaff, string sdate, string status, System.DateTime wdate, string wuid) { + public virtual int Insert(string ddate, string edate, string memo, string name, string odate, string part, string pdate, string process, string reqstaff, string sdate, string status, System.DateTime wdate, string wuid, string gcode) { if ((ddate == null)) { this.Adapter.InsertCommand.Parameters[0].Value = global::System.DBNull.Value; } @@ -18942,6 +18261,12 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda else { this.Adapter.InsertCommand.Parameters[12].Value = ((string)(wuid)); } + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); + } + else { + this.Adapter.InsertCommand.Parameters[13].Value = ((string)(gcode)); + } 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)) { @@ -18976,20 +18301,8 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda string status, System.DateTime wdate, string wuid, - string Original_ddate, - string Original_edate, + string gcode, int Original_idx, - string Original_memo, - string Original_name, - string Original_odate, - string Original_part, - string Original_pdate, - string Original_process, - string Original_reqstaff, - string Original_sdate, - string Original_status, - System.DateTime Original_wdate, - string Original_wuid, int idx) { if ((ddate == null)) { this.Adapter.UpdateCommand.Parameters[0].Value = global::System.DBNull.Value; @@ -19064,103 +18377,14 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda else { this.Adapter.UpdateCommand.Parameters[12].Value = ((string)(wuid)); } - if ((Original_ddate == null)) { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[14].Value = global::System.DBNull.Value; + if ((gcode == null)) { + throw new global::System.ArgumentNullException("gcode"); } else { - this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[14].Value = ((string)(Original_ddate)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((string)(gcode)); } - if ((Original_edate == null)) { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[16].Value = ((string)(Original_edate)); - } - this.Adapter.UpdateCommand.Parameters[17].Value = ((int)(Original_idx)); - if ((Original_memo == 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_memo)); - } - if ((Original_name == 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_name)); - } - if ((Original_odate == null)) { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[23].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[22].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[23].Value = ((string)(Original_odate)); - } - if ((Original_part == null)) { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[25].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[24].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[25].Value = ((string)(Original_part)); - } - if ((Original_pdate == null)) { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[27].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[26].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[27].Value = ((string)(Original_pdate)); - } - if ((Original_process == 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_process)); - } - if ((Original_reqstaff == null)) { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[31].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[30].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[31].Value = ((string)(Original_reqstaff)); - } - if ((Original_sdate == null)) { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[33].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[32].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[33].Value = ((string)(Original_sdate)); - } - if ((Original_status == null)) { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[35].Value = global::System.DBNull.Value; - } - else { - this.Adapter.UpdateCommand.Parameters[34].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[35].Value = ((string)(Original_status)); - } - this.Adapter.UpdateCommand.Parameters[36].Value = ((System.DateTime)(Original_wdate)); - if ((Original_wuid == null)) { - throw new global::System.ArgumentNullException("Original_wuid"); - } - else { - this.Adapter.UpdateCommand.Parameters[37].Value = ((string)(Original_wuid)); - } - this.Adapter.UpdateCommand.Parameters[38].Value = ((int)(idx)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((int)(Original_idx)); + this.Adapter.UpdateCommand.Parameters[15].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)) { @@ -19176,41 +18400,6 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda } } } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [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.Update, true)] - public virtual int Update( - string ddate, - string edate, - string memo, - string name, - string odate, - string part, - string pdate, - string process, - string reqstaff, - string sdate, - string status, - System.DateTime wdate, - string wuid, - string Original_ddate, - string Original_edate, - int Original_idx, - string Original_memo, - string Original_name, - string Original_odate, - string Original_part, - string Original_pdate, - string Original_process, - string Original_reqstaff, - string Original_sdate, - string Original_status, - System.DateTime Original_wdate, - string Original_wuid) { - return this.Update(ddate, edate, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid, Original_ddate, Original_edate, Original_idx, Original_memo, Original_name, Original_odate, Original_part, Original_pdate, Original_process, Original_reqstaff, Original_sdate, Original_status, Original_wdate, Original_wuid, Original_idx); - } } /// diff --git a/SubProject/FCM0000/dsMSSQL.xsd b/SubProject/FCM0000/dsMSSQL.xsd index c500cbd..06dcef8 100644 --- a/SubProject/FCM0000/dsMSSQL.xsd +++ b/SubProject/FCM0000/dsMSSQL.xsd @@ -11,49 +11,18 @@ - - 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)) AND ((@IsNull_disable = 1 AND [disable] IS NULL) OR ([disable] = @Original_disable)) AND ((@IsNull_bparam1 = 1 AND [bparam1] IS NULL) OR ([bparam1] = @Original_bparam1)) AND ((@IsNull_iparam1 = 1 AND [iparam1] IS NULL) OR ([iparam1] = @Original_iparam1)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import))) + + DELETE FROM Items +WHERE (idx = @Original_idx) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx], [scale], [unit], [disable], [bparam1], [iparam1], [import]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx, @scale, @unit, @disable, @bparam1, @iparam1, @import); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name, idx + INSERT INTO [Items] ([name], [sid], [model], [manu], [supply], [price], [memo], [wuid], [wdate], [cate], [supplyidx], [scale], [unit], [disable], [bparam1], [iparam1], [import], [gcode]) VALUES (@name, @sid, @model, @manu, @supply, @price, @memo, @wuid, @wdate, @cate, @supplyidx, @scale, @unit, @disable, @bparam1, @iparam1, @import, @gcode); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode FROM Items WHERE (idx = SCOPE_IDENTITY()) ORDER BY cate, name, idx @@ -72,12 +41,13 @@ 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, scale, unit, disable, bparam1, iparam1, import + SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode FROM Items WHERE (gcode = @gcode) ORDER BY cate, name, idx @@ -87,61 +57,33 @@ 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, [scale] = @scale, [unit] = @unit, [disable] = @disable, [bparam1] = @bparam1, [iparam1] = @iparam1, [import] = @import 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)) AND ((@IsNull_disable = 1 AND [disable] IS NULL) OR ([disable] = @Original_disable)) AND ((@IsNull_bparam1 = 1 AND [bparam1] IS NULL) OR ([bparam1] = @Original_bparam1)) AND ((@IsNull_iparam1 = 1 AND [iparam1] IS NULL) OR ([iparam1] = @Original_iparam1)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import))); -SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import FROM Items WHERE (idx = @idx) 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, + scale = @scale, unit = @unit, disable = @disable, bparam1 = @bparam1, iparam1 = @iparam1, import = @import, gcode = @gcode +WHERE (idx = @Original_idx); +SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supplyidx, scale, unit, disable, bparam1, iparam1, import, gcode FROM Items WHERE (idx = @idx) ORDER BY cate, name, idx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + @@ -166,6 +108,7 @@ SELECT idx, name, sid, model, manu, supply, price, memo, wuid, wdate, cate, supp + @@ -189,17 +132,22 @@ WHERE (import = @imptag) AND (gcode = @gcode) + + + + SELECT COUNT(*) FROM Items +where gcode = @gcode and isnull(replace(name,' ','') + replace(model,' ',''),'') = @search + + + + + + + - SELECT bparam1, cate, disable, idx, import, iparam1, 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, '') <> '') AND (cate LIKE @cate) AND (gcode = @gcode) -ORDER BY sid, name, idx + SELECT bparam1, cate, disable, gcode, idx, import, iparam1, 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, '') <> '') AND (cate LIKE @cate) AND (gcode = @gcode) ORDER BY sid, name, idx @@ -210,10 +158,7 @@ ORDER BY sid, name, idx - SELECT bparam1, cate, disable, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid -FROM Items -WHERE (cate LIKE @cate) AND (gcode = @code) -ORDER BY name, idx + SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (cate LIKE @cate) AND (gcode = @code) ORDER BY name, idx @@ -224,15 +169,7 @@ ORDER BY name, idx - SELECT bparam1, cate, disable, idx, import, iparam1, 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 - ISNULL(manu, N'') LIKE @search OR - ISNULL(supply, N'') LIKE @search OR - ISNULL(model, N'') LIKE @search OR - ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) -ORDER BY name, idx + SELECT bparam1, cate, disable, gcode, idx, import, iparam1, 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 ISNULL(manu, N'') LIKE @search OR ISNULL(supply, N'') LIKE @search OR ISNULL(model, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (gcode = @gcode) ORDER BY name, idx @@ -240,16 +177,29 @@ ORDER BY name, idx - + - SELECT bparam1, cate, disable, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (idx = @idx) + SELECT bparam1, cate, disable, gcode, idx, import, iparam1, manu, memo, model, name, price, scale, sid, supply, supplyidx, unit, wdate, wuid FROM Items WHERE (idx = @idx) + + + + SELECT isnull(idx,-1) +FROM Items +WHERE (gcode = @gcode) AND (ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = @search) + + + + + + + @@ -257,7 +207,7 @@ ORDER BY name, idx - DELETE FROM [Common] WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + DELETE FROM [Common] WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ([gcode] = @Original_gcode)) @@ -272,6 +222,7 @@ ORDER BY name, idx + @@ -293,19 +244,20 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE - SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate + SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, gcode FROM Common -WHERE (grp = @grp) +WHERE (grp = @grpCode) AND (gcode = @gcode) ORDER BY grp, memo - + + - UPDATE [Common] SET [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHERE (idx = @idx) ORDER BY grp, memo + UPDATE [Common] SET [grp] = @grp, [code] = @code, [svalue] = @svalue, [ivalue] = @ivalue, [fvalue] = @fvalue, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [gcode] = @gcode WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_code = 1 AND [code] IS NULL) OR ([code] = @Original_code)) AND ((@IsNull_ivalue = 1 AND [ivalue] IS NULL) OR ([ivalue] = @Original_ivalue)) AND ((@IsNull_fvalue = 1 AND [fvalue] IS NULL) OR ([fvalue] = @Original_fvalue)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ([gcode] = @Original_gcode)); +SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate, gcode FROM Common WHERE (idx = @idx) ORDER BY grp, memo @@ -315,6 +267,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE + @@ -328,7 +281,8 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE - + + @@ -344,6 +298,7 @@ SELECT idx, grp, code, svalue, ivalue, fvalue, memo, wuid, wdate FROM Common WHE + @@ -804,122 +759,77 @@ SELECT idx, tolist, cclist, bcclist, title, sid, url, qty, remark, wuid, wdate, - - DELETE FROM [Customs] WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_owner = 1 AND [owner] IS NULL) OR ([owner] = @Original_owner)) AND ((@IsNull_ownertel = 1 AND [ownertel] IS NULL) OR ([ownertel] = @Original_ownertel)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_fax = 1 AND [fax] IS NULL) OR ([fax] = @Original_fax)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uptae = 1 AND [uptae] IS NULL) OR ([uptae] = @Original_uptae)) AND ((@IsNull_staff = 1 AND [staff] IS NULL) OR ([staff] = @Original_staff)) AND ((@IsNull_stafftel = 1 AND [stafftel] IS NULL) OR ([stafftel] = @Original_stafftel)) AND ((@IsNull_name2 = 1 AND [name2] IS NULL) OR ([name2] = @Original_name2))) + + DELETE FROM Customs +WHERE (idx = @Original_idx) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - INSERT INTO [Customs] ([grp], [name], [owner], [ownertel], [address], [tel], [fax], [email], [memo], [wuid], [wdate], [uptae], [staff], [stafftel], [name2]) VALUES (@grp, @name, @owner, @ownertel, @address, @tel, @fax, @email, @memo, @wuid, @wdate, @uptae, @staff, @stafftel, @name2); + + INSERT INTO Customs + (grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wdate, uptae, staff, stafftel, name2, gcode) +VALUES (@grp,@name,@owner,@ownertel,@address,@tel,@fax,@email,@memo,@wuid,@wdate,@uptae,@staff,@stafftel,@name2,@gcode); SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wdate, uptae, staff, stafftel, name2 FROM Customs WHERE (idx = SCOPE_IDENTITY()) ORDER BY name - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wdate, uptae, staff, stafftel, name2 + SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wdate, uptae, staff, stafftel, name2, gcode FROM Customs +WHERE (gcode = @gcode) ORDER BY name - + + + - - UPDATE [Customs] SET [grp] = @grp, [name] = @name, [owner] = @owner, [ownertel] = @ownertel, [address] = @address, [tel] = @tel, [fax] = @fax, [email] = @email, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate, [uptae] = @uptae, [staff] = @staff, [stafftel] = @stafftel, [name2] = @name2 WHERE (([idx] = @Original_idx) AND ((@IsNull_grp = 1 AND [grp] IS NULL) OR ([grp] = @Original_grp)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_owner = 1 AND [owner] IS NULL) OR ([owner] = @Original_owner)) AND ((@IsNull_ownertel = 1 AND [ownertel] IS NULL) OR ([ownertel] = @Original_ownertel)) AND ((@IsNull_address = 1 AND [address] IS NULL) OR ([address] = @Original_address)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_fax = 1 AND [fax] IS NULL) OR ([fax] = @Original_fax)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_uptae = 1 AND [uptae] IS NULL) OR ([uptae] = @Original_uptae)) AND ((@IsNull_staff = 1 AND [staff] IS NULL) OR ([staff] = @Original_staff)) AND ((@IsNull_stafftel = 1 AND [stafftel] IS NULL) OR ([stafftel] = @Original_stafftel)) AND ((@IsNull_name2 = 1 AND [name2] IS NULL) OR ([name2] = @Original_name2))); -SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wdate, uptae, staff, stafftel, name2 FROM Customs WHERE (idx = @idx) ORDER BY name + + UPDATE Customs +SET grp = @grp, name = @name, owner = @owner, ownertel = @ownertel, address = @address, tel = @tel, fax = @fax, email = @email, memo = @memo, wuid = @wuid, wdate = @wdate, + uptae = @uptae, staff = @staff, stafftel = @stafftel, name2 = @name2, gcode = @gcode +WHERE (idx = @Original_idx); +SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wdate, uptae, staff, stafftel, name2, gcode FROM Customs WHERE (idx = @idx) ORDER BY name - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + @@ -942,37 +852,49 @@ SELECT idx, grp, name, owner, ownertel, address, tel, fax, email, memo, wuid, wd + - + SELECT ISNULL(COUNT(*), 0) AS Expr1 FROM Customs -WHERE (ISNULL(name, N'') LIKE @name) OR - (ISNULL(name2, N'') LIKE @name) +WHERE (ISNULL(name, N'') LIKE @name OR + ISNULL(name2, N'') LIKE @name) AND (gcode = @gcode) + - - SELECT address, email, fax, grp, idx, memo, name, name2, owner, ownertel, staff, stafftel, tel, uptae, wdate, wuid FROM Customs WHERE (grp = @grp) + + SELECT address, email, fax, gcode, grp, idx, memo, name, name2, owner, ownertel, staff, stafftel, tel, uptae, wdate, wuid +FROM Customs +WHERE (grp = @grp) AND (gcode = @gcode) - + + - - SELECT address, email, fax, grp, idx, memo, name, name2, owner, ownertel, staff, stafftel, tel, uptae, wdate, wuid FROM Customs WHERE (ISNULL(name, N'') LIKE @search) OR (ISNULL(tel, N'') LIKE @search) OR (ISNULL(email, N'') LIKE @search) OR (ISNULL(name2, N'') LIKE @search) OR (memo LIKE @search) + + SELECT address, email, fax, gcode, grp, idx, memo, name, name2, owner, ownertel, staff, stafftel, tel, uptae, wdate, wuid +FROM Customs +WHERE (ISNULL(name, N'') LIKE @search OR + ISNULL(tel, N'') LIKE @search OR + ISNULL(email, N'') LIKE @search OR + ISNULL(name2, N'') LIKE @search) AND (gcode = @gcode) OR + (memo LIKE @search) AND (gcode = @gcode) + @@ -983,34 +905,20 @@ WHERE (ISNULL(name, N'') LIKE @name) OR - - DELETE FROM [Staff] WHERE (([idx] = @Original_idx) AND ((@IsNull_cid = 1 AND [cid] IS NULL) OR ([cid] = @Original_cid)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)) + + DELETE FROM Staff +WHERE (idx = @Original_idx) - - - - - - - - - - - - - - - - - + - INSERT INTO [Staff] ([cid], [name], [grade], [dept], [tel], [email], [memo], [wuid], [wdate]) VALUES (@cid, @name, @grade, @dept, @tel, @email, @memo, @wuid, @wdate); -SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHERE (idx = SCOPE_IDENTITY()) + INSERT INTO [Staff] ([gcode], [cid], [name], [grade], [dept], [tel], [email], [memo], [wuid], [wdate]) VALUES (@gcode, @cid, @name, @grade, @dept, @tel, @email, @memo, @wuid, @wdate); +SELECT idx, gcode, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHERE (idx = SCOPE_IDENTITY()) + @@ -1025,43 +933,33 @@ SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHE - SELECT Staff.* -FROM Staff - + SELECT idx, gcode, cid, name, grade, dept, tel, email, memo, wuid, wdate +FROM Staff +WHERE (gcode = @gcode) + + + - - UPDATE [Staff] SET [cid] = @cid, [name] = @name, [grade] = @grade, [dept] = @dept, [tel] = @tel, [email] = @email, [memo] = @memo, [wuid] = @wuid, [wdate] = @wdate WHERE (([idx] = @Original_idx) AND ((@IsNull_cid = 1 AND [cid] IS NULL) OR ([cid] = @Original_cid)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_grade = 1 AND [grade] IS NULL) OR ([grade] = @Original_grade)) AND ((@IsNull_dept = 1 AND [dept] IS NULL) OR ([dept] = @Original_dept)) AND ((@IsNull_tel = 1 AND [tel] IS NULL) OR ([tel] = @Original_tel)) AND ((@IsNull_email = 1 AND [email] IS NULL) OR ([email] = @Original_email)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate)); -SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHERE (idx = @idx) + + UPDATE Staff +SET gcode = @gcode, cid = @cid, name = @name, grade = @grade, dept = @dept, tel = @tel, email = @email, memo = @memo, wuid = @wuid, wdate = @wdate +WHERE (idx = @Original_idx); +SELECT idx, gcode, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHERE (idx = @idx) - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + @@ -1078,6 +976,7 @@ SELECT idx, cid, name, grade, dept, tel, email, memo, wuid, wdate FROM Staff WHE + @@ -1314,112 +1213,72 @@ SELECT TOP (10) idx, pdate, state, process, receive, sc, request, sid, pumname, - - DELETE FROM [Projects] WHERE (((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ([idx] = @Original_idx) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ([wdate] = @Original_wdate) AND ([wuid] = @Original_wuid)) + + DELETE FROM Projects +WHERE (idx = @Original_idx) - - - - - - - - - - - - - - - - - - - - - - - - - + - - INSERT INTO [Projects] ([ddate], [edate], [memo], [name], [odate], [part], [pdate], [process], [reqstaff], [sdate], [status], [wdate], [wuid]) VALUES (@ddate, @edate, @memo, @name, @odate, @part, @pdate, @process, @reqstaff, @sdate, @status, @wdate, @wuid); + + INSERT INTO Projects + (ddate, edate, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid, gcode) +VALUES (@ddate,@edate,@memo,@name,@odate,@part,@pdate,@process,@reqstaff,@sdate,@status,@wdate,@wuid,@gcode); SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid FROM Projects WHERE (idx = SCOPE_IDENTITY()) - - - - - - - - - - - - - + + + + + + + + + + + + + + - - SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid + + SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid, gcode FROM Projects -WHERE idx = @idx +WHERE (idx = @idx) - - UPDATE [Projects] SET [ddate] = @ddate, [edate] = @edate, [memo] = @memo, [name] = @name, [odate] = @odate, [part] = @part, [pdate] = @pdate, [process] = @process, [reqstaff] = @reqstaff, [sdate] = @sdate, [status] = @status, [wdate] = @wdate, [wuid] = @wuid WHERE (((@IsNull_ddate = 1 AND [ddate] IS NULL) OR ([ddate] = @Original_ddate)) AND ((@IsNull_edate = 1 AND [edate] IS NULL) OR ([edate] = @Original_edate)) AND ([idx] = @Original_idx) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_name = 1 AND [name] IS NULL) OR ([name] = @Original_name)) AND ((@IsNull_odate = 1 AND [odate] IS NULL) OR ([odate] = @Original_odate)) AND ((@IsNull_part = 1 AND [part] IS NULL) OR ([part] = @Original_part)) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_process = 1 AND [process] IS NULL) OR ([process] = @Original_process)) AND ((@IsNull_reqstaff = 1 AND [reqstaff] IS NULL) OR ([reqstaff] = @Original_reqstaff)) AND ((@IsNull_sdate = 1 AND [sdate] IS NULL) OR ([sdate] = @Original_sdate)) AND ((@IsNull_status = 1 AND [status] IS NULL) OR ([status] = @Original_status)) AND ([wdate] = @Original_wdate) AND ([wuid] = @Original_wuid)); -SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid FROM Projects WHERE (idx = @idx) + + UPDATE Projects +SET ddate = @ddate, edate = @edate, memo = @memo, name = @name, odate = @odate, part = @part, pdate = @pdate, process = @process, reqstaff = @reqstaff, sdate = @sdate, + status = @status, wdate = @wdate, wuid = @wuid, gcode = @gcode +WHERE (idx = @Original_idx); +SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid, gcode FROM Projects WHERE (idx = @idx) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -1440,17 +1299,16 @@ SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sda + - SELECT ddate, edate, idx, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid -FROM Projects -WHERE (ISNULL(name, N'') LIKE @search OR - ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) + SELECT ddate, edate, gcode, idx, memo, name, odate, part, pdate, process, reqstaff, sdate, status, wdate, wuid FROM Projects WHERE (ISNULL(name, N'') LIKE @search OR ISNULL(memo, N'') LIKE @search) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) + @@ -1725,7 +1583,7 @@ ORDER BY pdate - + @@ -1806,10 +1664,17 @@ ORDER BY pdate + + + + + + + - + @@ -1851,10 +1716,17 @@ ORDER BY pdate + + + + + + + - + @@ -1921,7 +1793,7 @@ ORDER BY pdate - + @@ -1982,7 +1854,7 @@ ORDER BY pdate - + @@ -2046,7 +1918,7 @@ ORDER BY pdate - + @@ -2135,7 +2007,7 @@ ORDER BY pdate - + @@ -2238,10 +2110,17 @@ ORDER BY pdate + + + + + + + - + @@ -2296,10 +2175,17 @@ ORDER BY pdate + + + + + + + - + @@ -2440,7 +2326,7 @@ ORDER BY pdate - + @@ -2529,10 +2415,17 @@ ORDER BY pdate + + + + + + + - + @@ -2562,7 +2455,7 @@ ORDER BY pdate - + diff --git a/SubProject/FCM0000/dsMSSQL.xss b/SubProject/FCM0000/dsMSSQL.xss index 5f28270..0644433 100644 --- a/SubProject/FCM0000/dsMSSQL.xss +++ b/SubProject/FCM0000/dsMSSQL.xss @@ -1 +1,23 @@ - \ No newline at end of file + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubProject/FCM0000/fCode.Designer.cs b/SubProject/FCM0000/fCode.Designer.cs index 5ecfb95..3719fea 100644 --- a/SubProject/FCM0000/fCode.Designer.cs +++ b/SubProject/FCM0000/fCode.Designer.cs @@ -74,7 +74,7 @@ this.panel1.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.panel1.Name = "panel1"; this.panel1.Padding = new System.Windows.Forms.Padding(5); - this.panel1.Size = new System.Drawing.Size(552, 48); + this.panel1.Size = new System.Drawing.Size(685, 48); this.panel1.TabIndex = 0; // // cmbList @@ -86,7 +86,7 @@ this.cmbList.Location = new System.Drawing.Point(5, 5); this.cmbList.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); this.cmbList.Name = "cmbList"; - this.cmbList.Size = new System.Drawing.Size(542, 37); + this.cmbList.Size = new System.Drawing.Size(675, 37); this.cmbList.TabIndex = 0; this.cmbList.SelectedIndexChanged += new System.EventHandler(this.cmbList_SelectedIndexChanged); // @@ -111,6 +111,7 @@ this.tam.CommonTableAdapter = this.ta; this.tam.CustomsTableAdapter = null; this.tam.HolidayLIstTableAdapter = null; + this.tam.InventoryUserTableAdapter = null; this.tam.ItemsTableAdapter = null; this.tam.MailDataTableAdapter = null; this.tam.MailFormTableAdapter = null; @@ -142,14 +143,14 @@ this.commonBindingNavigatorSaveItem, this.toolStripSeparator1, this.toolStripButton1}); - this.bn.Location = new System.Drawing.Point(0, 459); + this.bn.Location = new System.Drawing.Point(0, 576); 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(552, 25); + this.bn.Size = new System.Drawing.Size(685, 25); this.bn.TabIndex = 1; this.bn.Text = "bindingNavigator1"; // @@ -285,7 +286,7 @@ this.commonDataGridView.Location = new System.Drawing.Point(0, 48); this.commonDataGridView.Name = "commonDataGridView"; this.commonDataGridView.RowTemplate.Height = 23; - this.commonDataGridView.Size = new System.Drawing.Size(552, 411); + this.commonDataGridView.Size = new System.Drawing.Size(685, 528); this.commonDataGridView.TabIndex = 3; // // dataGridViewTextBoxColumn3 @@ -327,12 +328,15 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 19F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(552, 484); + this.ClientSize = new System.Drawing.Size(685, 601); this.Controls.Add(this.commonDataGridView); this.Controls.Add(this.bn); this.Controls.Add(this.panel1); this.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5); + this.MaximizeBox = false; + this.MinimizeBox = false; this.Name = "fCode"; this.Text = "Common Code List"; this.Load += new System.EventHandler(this.@__Load); diff --git a/SubProject/FCM0000/fCode.cs b/SubProject/FCM0000/fCode.cs index 0a83d03..a97b6ae 100644 --- a/SubProject/FCM0000/fCode.cs +++ b/SubProject/FCM0000/fCode.cs @@ -20,6 +20,7 @@ namespace FCM0000 void Common_TableNewRow(object sender, DataTableNewRowEventArgs e) { + e.Row["gcode"] = FCOMMON.info.Login.gcode; e.Row["wuid"] = FCOMMON.info.Login.no; e.Row["wdate"] = DateTime.Now; string grp = "99"; @@ -33,6 +34,10 @@ namespace FCM0000 private void __Load(object sender, EventArgs e) { + this.Show(); + Application.DoEvents(); + // this.TopMost=true; + // this.Activate(); cmbList_SelectedIndexChanged(null, null); } void RefreshCodeList() @@ -56,7 +61,7 @@ namespace FCM0000 } try { - this.ta.Fill(this.dsMSSQL.Common, grp); + this.ta.Fill(this.dsMSSQL.Common, grp,FCOMMON.info.Login.gcode ); this.dsMSSQL.Common.AcceptChanges(); } catch (Exception ex) diff --git a/SubProject/FCM0000/fCustoms.cs b/SubProject/FCM0000/fCustoms.cs index 09cd062..02a3b6a 100644 --- a/SubProject/FCM0000/fCustoms.cs +++ b/SubProject/FCM0000/fCustoms.cs @@ -24,7 +24,10 @@ namespace FCM0000 private void __Load(object sender, EventArgs e) { // TODO: 이 코드는 데이터를 'dsMSSQL.Staff' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. - + + this.Show(); + Application.DoEvents(); + refreshData(); refreshDataS(); @@ -37,20 +40,22 @@ namespace FCM0000 e.Row["wuid"] = FCOMMON.info.Login.no; e.Row["wdate"] = DateTime.Now; e.Row["cid"] = selcectIDX; + e.Row["gcode"] = FCOMMON.info.Login.gcode; } void Customs_TableNewRow(object sender, DataTableNewRowEventArgs e) { e.Row["wuid"] = FCOMMON.info.Login.no; e.Row["wdate"] = DateTime.Now; - e.Row["grp"] = "Supply"; + e.Row["grp"] = "Supply"; + e.Row["gcode"] = FCOMMON.info.Login.gcode; } void refreshData() { try { - this.ta.Fill(this.dsMSSQL.Customs); + this.ta.Fill(this.dsMSSQL.Customs,FCOMMON.info.Login.gcode); // this.taStaff.Fill(this.dsMSSQL.Staff); FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize1); @@ -64,7 +69,7 @@ namespace FCM0000 try { // this.ta.Fill(this.dsMSSQL.Customs); - this.taStaff.Fill(this.dsMSSQL.Staff); + this.taStaff.Fill(this.dsMSSQL.Staff, FCOMMON.info.Login.gcode); FPUtil.ColSizeLoad(ref this.fpSpread2, fn_fpcolsize2); } catch (Exception ex) diff --git a/SubProject/FCM0000/fItems.Designer.cs b/SubProject/FCM0000/fItems.Designer.cs deleted file mode 100644 index 59a3de3..0000000 --- a/SubProject/FCM0000/fItems.Designer.cs +++ /dev/null @@ -1,840 +0,0 @@ -namespace FCM0000 -{ - partial class fItems - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fItems)); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CurrencyCellType currencyCellType1 = new FarPoint.Win.Spread.CellType.CurrencyCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - 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); - this.dsMSSQL = new FCM0000.dsMSSQL(); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - 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.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.autoToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.resetToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.viewPurchaseListToolStripMenuItem = 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.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.panel1 = new System.Windows.Forms.Panel(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.lvOrder = new System.Windows.Forms.ListView(); - this.columnHeader5 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader6 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader7 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader8 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader10 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.label3 = new System.Windows.Forms.Label(); - this.lvInDate = new System.Windows.Forms.ListView(); - this.columnHeader1 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader2 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader3 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader4 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.columnHeader9 = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader())); - this.label2 = new System.Windows.Forms.Label(); - this.memoTextBox = new System.Windows.Forms.TextBox(); - this.label1 = new System.Windows.Forms.Label(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.cmImage = new System.Windows.Forms.ContextMenuStrip(this.components); - this.파일섡택ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.이미지붙여넣기ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.taPurchase = new FCM0000.dsMSSQLTableAdapters.PurchaseTableAdapter(); - this.촬영ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); - this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - this.cm1.SuspendLayout(); - this.toolStrip1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); - this.groupBox1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.cmImage.SuspendLayout(); - this.SuspendLayout(); - // - // bn - // - this.bn.AddNewItem = this.bindingNavigatorAddNewItem; - this.bn.BindingSource = this.bs; - this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = this.bindingNavigatorDeleteItem; - this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.ImageScalingSize = new System.Drawing.Size(24, 24); - this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bindingNavigatorMoveFirstItem, - this.bindingNavigatorMovePreviousItem, - this.bindingNavigatorSeparator, - this.bindingNavigatorPositionItem, - this.bindingNavigatorCountItem, - this.bindingNavigatorSeparator1, - this.bindingNavigatorMoveNextItem, - this.bindingNavigatorMoveLastItem, - this.bindingNavigatorSeparator2, - this.bindingNavigatorAddNewItem, - this.bindingNavigatorDeleteItem, - this.itemsBindingNavigatorSaveItem, - this.toolStripSeparator2, - this.toolStripLabel3, - this.tbFind, - this.btFind}); - this.bn.Location = new System.Drawing.Point(0, 722); - 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(877, 31); - this.bn.TabIndex = 0; - this.bn.Text = "bindingNavigator1"; - // - // 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(73, 28); - this.bindingNavigatorAddNewItem.Text = "Add(&A)"; - // - // bs - // - this.bs.DataMember = "Items"; - this.bs.DataSource = this.dsMSSQL; - this.bs.Sort = "sid,name"; - this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); - // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 28); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorDeleteItem - // - 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(86, 28); - this.bindingNavigatorDeleteItem.Text = "Delete(&D)"; - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(28, 28); - this.bindingNavigatorMoveFirstItem.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(28, 28); - this.bindingNavigatorMovePreviousItem.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 31); - // - // bindingNavigatorPositionItem - // - this.bindingNavigatorPositionItem.AccessibleName = "위치"; - this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; - this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); - this.bindingNavigatorPositionItem.Text = "0"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 31); - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(28, 28); - this.bindingNavigatorMoveNextItem.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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(28, 28); - this.bindingNavigatorMoveLastItem.Text = "마지막으로 이동"; - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 31); - // - // itemsBindingNavigatorSaveItem - // - this.itemsBindingNavigatorSaveItem.Image = ((System.Drawing.Image)(resources.GetObject("itemsBindingNavigatorSaveItem.Image"))); - this.itemsBindingNavigatorSaveItem.Name = "itemsBindingNavigatorSaveItem"; - this.itemsBindingNavigatorSaveItem.Size = new System.Drawing.Size(75, 28); - 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, 31); - // - // toolStripLabel3 - // - this.toolStripLabel3.Name = "toolStripLabel3"; - this.toolStripLabel3.Size = new System.Drawing.Size(41, 28); - 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, 31); - 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(28, 28); - this.btFind.Text = "toolStripButton1"; - this.btFind.Click += new System.EventHandler(this.toolStripButton1_Click_1); - // - // cm1 - // - this.cm1.Font = new System.Drawing.Font("맑은 고딕", 20F); - this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.columnSizeToolStripMenuItem, - this.toolStripMenuItem1, - this.viewPurchaseListToolStripMenuItem}); - this.cm1.Name = "cm1"; - this.cm1.Size = new System.Drawing.Size(318, 94); - // - // columnSizeToolStripMenuItem - // - this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.autoToolStripMenuItem, - this.resetToolStripMenuItem, - this.saveToolStripMenuItem, - this.loadToolStripMenuItem}); - this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(317, 42); - this.columnSizeToolStripMenuItem.Text = "Column Size"; - // - // autoToolStripMenuItem - // - this.autoToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("autoToolStripMenuItem.Image"))); - this.autoToolStripMenuItem.Name = "autoToolStripMenuItem"; - this.autoToolStripMenuItem.Size = new System.Drawing.Size(159, 42); - this.autoToolStripMenuItem.Text = "Auto"; - this.autoToolStripMenuItem.Click += new System.EventHandler(this.autoToolStripMenuItem_Click); - // - // resetToolStripMenuItem - // - this.resetToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("resetToolStripMenuItem.Image"))); - this.resetToolStripMenuItem.Name = "resetToolStripMenuItem"; - this.resetToolStripMenuItem.Size = new System.Drawing.Size(159, 42); - this.resetToolStripMenuItem.Text = "Reset"; - this.resetToolStripMenuItem.Click += new System.EventHandler(this.resetToolStripMenuItem_Click); - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(159, 42); - this.saveToolStripMenuItem.Text = "Save"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // loadToolStripMenuItem - // - this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); - this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(159, 42); - this.loadToolStripMenuItem.Text = "Load"; - this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); - // - // toolStripMenuItem1 - // - this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(314, 6); - // - // viewPurchaseListToolStripMenuItem - // - this.viewPurchaseListToolStripMenuItem.Enabled = false; - this.viewPurchaseListToolStripMenuItem.Name = "viewPurchaseListToolStripMenuItem"; - this.viewPurchaseListToolStripMenuItem.Size = new System.Drawing.Size(317, 42); - this.viewPurchaseListToolStripMenuItem.Text = "view Purchase List"; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // tam - // - this.tam.BackupDataSetBeforeUpdate = false; - this.tam.BoardTableAdapter = null; - this.tam.CommonTableAdapter = null; - this.tam.CustomsTableAdapter = null; - this.tam.ItemsTableAdapter = this.ta; - this.tam.MailDataTableAdapter = null; - this.tam.MailFormTableAdapter = null; - this.tam.ProjectsTableAdapter = null; - this.tam.PurchaseTableAdapter = null; - this.tam.RequestItemTableAdapter = null; - this.tam.StaffTableAdapter = null; - this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - // - // toolStrip1 - // - this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); - this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.toolStripLabel2, - this.cmbCate, - this.toolStripSeparator1, - this.toolStripLabel1, - this.cmbMode, - this.toolStripButton2, - this.toolStripSeparator3}); - this.toolStrip1.Location = new System.Drawing.Point(0, 0); - this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1272, 31); - this.toolStrip1.TabIndex = 2; - this.toolStrip1.Text = "toolStrip1"; - // - // toolStripLabel2 - // - this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(55, 28); - 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, 31); - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 31); - // - // toolStripLabel1 - // - this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(68, 28); - this.toolStripLabel1.Text = "Query Type"; - // - // cmbMode - // - this.cmbMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.cmbMode.Items.AddRange(new object[] { - "Normal", - "Duplication"}); - this.cmbMode.Name = "cmbMode"; - this.cmbMode.Size = new System.Drawing.Size(150, 31); - // - // toolStripButton2 - // - this.toolStripButton2.Image = global::FCM0000.Properties.Resources.action_refresh; - this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolStripButton2.Name = "toolStripButton2"; - this.toolStripButton2.Size = new System.Drawing.Size(74, 28); - this.toolStripButton2.Text = "Refresh"; - this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); - // - // toolStripSeparator3 - // - this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 31); - // - // fpSpread1 - // - this.fpSpread1.AccessibleDescription = ""; - this.fpSpread1.ContextMenuStrip = this.cm1; - this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; - this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1.Location = new System.Drawing.Point(0, 31); - this.fpSpread1.Name = "fpSpread1"; - this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { - this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(877, 691); - this.fpSpread1.TabIndex = 3; - // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 9; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.AutoGenerateColumns = false; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "분류"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "품명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "SID#"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "모델명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "매입가"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "제조사"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "규격"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "단위"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 42F; - this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 2147483647D; - numberCellType1.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx"; - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX"; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 88F; - this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "cate"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Label = "분류"; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(2).Label = "품명"; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "sid"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "SID#"; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 113F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "model"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "모델명"; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 113F; - currencyCellType1.DecimalPlaces = 0; - currencyCellType1.MaximumValue = new decimal(new int[] { - 10000000, - 0, - 0, - 0}); - currencyCellType1.MinimumValue = new decimal(new int[] { - 10000000, - 0, - 0, - -2147483648}); - currencyCellType1.NegativeRed = true; - currencyCellType1.NullDisplay = "--"; - currencyCellType1.Separator = ","; - currencyCellType1.ShowSeparator = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = currencyCellType1; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "price"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "매입가"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 123F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "manu"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "제조사"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 113F; - numberCellType2.MaximumValue = 999999999999999D; - numberCellType2.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType2; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "scale"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Label = "규격"; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 84F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "unit"; - this.fpSpread1_Sheet1.Columns.Get(8).Label = "단위"; - this.fpSpread1_Sheet1.DataAutoCellTypes = false; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // - // panel1 - // - this.panel1.Dock = System.Windows.Forms.DockStyle.Right; - this.panel1.Location = new System.Drawing.Point(877, 31); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(13, 722); - this.panel1.TabIndex = 4; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.lvOrder); - this.groupBox1.Controls.Add(this.label3); - this.groupBox1.Controls.Add(this.lvInDate); - this.groupBox1.Controls.Add(this.label2); - this.groupBox1.Controls.Add(this.memoTextBox); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.pictureBox1); - this.groupBox1.Dock = System.Windows.Forms.DockStyle.Right; - this.groupBox1.Location = new System.Drawing.Point(890, 31); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(382, 722); - this.groupBox1.TabIndex = 5; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "기타 정보"; - // - // lvOrder - // - this.lvOrder.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader5, - this.columnHeader6, - this.columnHeader7, - this.columnHeader8, - this.columnHeader10}); - this.lvOrder.Dock = System.Windows.Forms.DockStyle.Top; - this.lvOrder.Location = new System.Drawing.Point(3, 467); - this.lvOrder.Name = "lvOrder"; - this.lvOrder.Size = new System.Drawing.Size(376, 120); - this.lvOrder.TabIndex = 7; - this.lvOrder.UseCompatibleStateImageBehavior = false; - this.lvOrder.View = System.Windows.Forms.View.Details; - // - // columnHeader5 - // - this.columnHeader5.Text = "등록일"; - this.columnHeader5.Width = 80; - // - // columnHeader6 - // - this.columnHeader6.Text = "담당"; - // - // columnHeader7 - // - this.columnHeader7.Text = "수량"; - this.columnHeader7.Width = 50; - // - // columnHeader8 - // - this.columnHeader8.Text = "금액"; - this.columnHeader8.Width = 80; - // - // columnHeader10 - // - this.columnHeader10.Text = "상태"; - this.columnHeader10.Width = 70; - // - // label3 - // - this.label3.Dock = System.Windows.Forms.DockStyle.Top; - this.label3.Location = new System.Drawing.Point(3, 445); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(376, 22); - this.label3.TabIndex = 6; - this.label3.Text = "최근 주문 내역"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // lvInDate - // - this.lvInDate.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] { - this.columnHeader1, - this.columnHeader2, - this.columnHeader3, - this.columnHeader4, - this.columnHeader9}); - this.lvInDate.Dock = System.Windows.Forms.DockStyle.Top; - this.lvInDate.Location = new System.Drawing.Point(3, 325); - this.lvInDate.Name = "lvInDate"; - this.lvInDate.Size = new System.Drawing.Size(376, 120); - this.lvInDate.TabIndex = 5; - this.lvInDate.UseCompatibleStateImageBehavior = false; - this.lvInDate.View = System.Windows.Forms.View.Details; - // - // columnHeader1 - // - this.columnHeader1.Text = "입고일"; - this.columnHeader1.Width = 80; - // - // columnHeader2 - // - this.columnHeader2.Text = "담당"; - // - // columnHeader3 - // - this.columnHeader3.Text = "수량"; - this.columnHeader3.Width = 50; - // - // columnHeader4 - // - this.columnHeader4.Text = "금액"; - this.columnHeader4.Width = 80; - // - // columnHeader9 - // - this.columnHeader9.Text = "상태"; - this.columnHeader9.Width = 70; - // - // label2 - // - this.label2.Dock = System.Windows.Forms.DockStyle.Top; - this.label2.Location = new System.Drawing.Point(3, 303); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(376, 22); - this.label2.TabIndex = 4; - this.label2.Text = "최근 입고 내역"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // memoTextBox - // - this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); - this.memoTextBox.Dock = System.Windows.Forms.DockStyle.Top; - this.memoTextBox.Location = new System.Drawing.Point(3, 238); - this.memoTextBox.Multiline = true; - this.memoTextBox.Name = "memoTextBox"; - this.memoTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.memoTextBox.Size = new System.Drawing.Size(376, 65); - this.memoTextBox.TabIndex = 3; - // - // label1 - // - this.label1.Dock = System.Windows.Forms.DockStyle.Top; - this.label1.Location = new System.Drawing.Point(3, 216); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(376, 22); - this.label1.TabIndex = 1; - this.label1.Text = "비고"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // pictureBox1 - // - this.pictureBox1.BackColor = System.Drawing.Color.DimGray; - this.pictureBox1.ContextMenuStrip = this.cmImage; - this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Top; - this.pictureBox1.Location = new System.Drawing.Point(3, 17); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(376, 199); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox1.TabIndex = 0; - this.pictureBox1.TabStop = false; - // - // cmImage - // - this.cmImage.Font = new System.Drawing.Font("맑은 고딕", 20F); - this.cmImage.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.파일섡택ToolStripMenuItem, - this.이미지붙여넣기ToolStripMenuItem, - this.촬영ToolStripMenuItem}); - this.cmImage.Name = "cm1"; - this.cmImage.Size = new System.Drawing.Size(293, 152); - // - // 파일섡택ToolStripMenuItem - // - this.파일섡택ToolStripMenuItem.Name = "파일섡택ToolStripMenuItem"; - this.파일섡택ToolStripMenuItem.Size = new System.Drawing.Size(292, 42); - this.파일섡택ToolStripMenuItem.Text = "파일 선택"; - this.파일섡택ToolStripMenuItem.Click += new System.EventHandler(this.파일섡택ToolStripMenuItem_Click); - // - // 이미지붙여넣기ToolStripMenuItem - // - this.이미지붙여넣기ToolStripMenuItem.Name = "이미지붙여넣기ToolStripMenuItem"; - this.이미지붙여넣기ToolStripMenuItem.Size = new System.Drawing.Size(292, 42); - this.이미지붙여넣기ToolStripMenuItem.Text = "이미지 붙여넣기"; - this.이미지붙여넣기ToolStripMenuItem.Click += new System.EventHandler(this.이미지붙여넣기ToolStripMenuItem_Click); - // - // taPurchase - // - this.taPurchase.ClearBeforeFill = true; - // - // 촬영ToolStripMenuItem - // - this.촬영ToolStripMenuItem.Name = "촬영ToolStripMenuItem"; - this.촬영ToolStripMenuItem.Size = new System.Drawing.Size(292, 42); - this.촬영ToolStripMenuItem.Text = "촬영"; - this.촬영ToolStripMenuItem.Click += new System.EventHandler(this.촬영ToolStripMenuItem_Click); - // - // fItems - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1272, 753); - this.Controls.Add(this.fpSpread1); - this.Controls.Add(this.bn); - this.Controls.Add(this.panel1); - this.Controls.Add(this.groupBox1); - this.Controls.Add(this.toolStrip1); - this.Name = "fItems"; - this.Text = "품목 정보"; - this.Load += new System.EventHandler(this.fItems_Load); - ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - this.cm1.ResumeLayout(false); - this.toolStrip1.ResumeLayout(false); - this.toolStrip1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.cmImage.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private dsMSSQL dsMSSQL; - private System.Windows.Forms.BindingSource bs; - private dsMSSQLTableAdapters.ItemsTableAdapter ta; - private dsMSSQLTableAdapters.TableAdapterManager tam; - private System.Windows.Forms.BindingNavigator bn; - private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem; - private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorDeleteItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; - private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.ToolStripButton itemsBindingNavigatorSaveItem; - private System.Windows.Forms.ContextMenuStrip cm1; - 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 FarPoint.Win.Spread.FpSpread fpSpread1; - private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem autoToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem resetToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; - private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; - private System.Windows.Forms.ToolStripMenuItem viewPurchaseListToolStripMenuItem; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; - private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.ContextMenuStrip cmImage; - private System.Windows.Forms.ToolStripMenuItem 파일섡택ToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem 이미지붙여넣기ToolStripMenuItem; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox memoTextBox; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.ListView lvInDate; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; - private System.Windows.Forms.ColumnHeader columnHeader1; - private System.Windows.Forms.ColumnHeader columnHeader2; - private System.Windows.Forms.ColumnHeader columnHeader3; - private System.Windows.Forms.ColumnHeader columnHeader4; - private System.Windows.Forms.ListView lvOrder; - private System.Windows.Forms.ColumnHeader columnHeader5; - private System.Windows.Forms.ColumnHeader columnHeader6; - private System.Windows.Forms.ColumnHeader columnHeader7; - private System.Windows.Forms.ColumnHeader columnHeader8; - private dsMSSQLTableAdapters.PurchaseTableAdapter taPurchase; - private System.Windows.Forms.ColumnHeader columnHeader10; - private System.Windows.Forms.ColumnHeader columnHeader9; - private System.Windows.Forms.ToolStripMenuItem 촬영ToolStripMenuItem; - } -} \ No newline at end of file diff --git a/SubProject/FCM0000/fItems.cs b/SubProject/FCM0000/fItems.cs deleted file mode 100644 index 9ce44f8..0000000 --- a/SubProject/FCM0000/fItems.cs +++ /dev/null @@ -1,323 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; -using util = FCOMMON.Util; - -namespace FCM0000 -{ - public partial class fItems : FCOMMON.fBase - { - string fn_fpcolsize = ""; - public fItems() - { - InitializeComponent(); - fn_fpcolsize = util.MakeFilePath(util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); - this.FormClosed += fItems_FormClosed; - this.dsMSSQL.Items.TableNewRow += Items_TableNewRow; - } - - void fItems_FormClosed(object sender, FormClosedEventArgs e) - { - } - 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; - //this.Show(); - //Application.DoEvents(); - - - - - refreshData(); - } - - void refreshData() - { - //refresh data - string cateSearch = "%"; - if (cmbCate.SelectedIndex > 0) cateSearch = cmbCate.Text; - if (cmbMode.SelectedIndex == 0) - this.ta.FillNoImage(this.dsMSSQL.Items, cateSearch,FCOMMON.info.Login.gcode); - else - this.ta.FillDupCheck(this.dsMSSQL.Items, cateSearch, FCOMMON.info.Login.gcode); - - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); - } - - void Items_TableNewRow(object sender, DataTableNewRowEventArgs e) - { - e.Row["wuid"] = FCOMMON.info.Login.no; - e.Row["wdate"] = DateTime.Now; - e.Row["gcode"] = FCOMMON.info.Login.gcode; - } - private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e) - { - this.Validate(); - this.bs.EndEdit(); - - - var dlg = FCOMMON.Util.MsgQ("변경된 사항을 저장 하시겠습니까?"); - if (dlg != System.Windows.Forms.DialogResult.Yes) return; - - try - { - this.tam.UpdateAll(this.dsMSSQL); - } - catch (Exception ex) - { - FCOMMON.Util.MsgE(ex.Message); - } - - - } - - private void toolStripButton2_Click(object sender, EventArgs e) - { - refreshData(); - } - - 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(); - - } - - private void autoToolStripMenuItem_Click(object sender, EventArgs e) - { - this.fpSpread1.ActiveSheet.DataAutoSizeColumns = true; - - for (int i = 0; i < this.fpSpread1.ActiveSheet.Rows.Count; i++) - this.fpSpread1.ActiveSheet.SetRowHeight(i, 25); - //dv1.AutoResizeColumns(); - } - - private void resetToolStripMenuItem_Click(object sender, EventArgs e) - { - foreach (FarPoint.Win.Spread.Column col in this.fpSpread1.ActiveSheet.Columns) - { - col.Width = 100; - } - } - - private void saveToolStripMenuItem_Click(object sender, EventArgs e) - { - FPUtil.ColsizeSave(this.fpSpread1, fn_fpcolsize); - } - - private void loadToolStripMenuItem_Click(object sender, EventArgs e) - { - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); - } - - private void bs_CurrentChanged(object sender, EventArgs e) - { - var drv = this.bs.Current as DataRowView; - var img = this.pictureBox1.Image; - if(drv == null) - { - this.pictureBox1.Image = null; - } - else - { - var dr = drv.Row as dsMSSQL.ItemsRow; - - //이미지 확인 - try { - var img1 = FCOMMON.DBM.GetImageData("Items", "image", dr.idx); - if (img1 != null) this.pictureBox1.Image = img1; - else this.pictureBox1.Image = null; - } catch (Exception ex) - { - this.pictureBox1.Image = null; - } - - //최근 입고 데이터 확인 (일자,담당,수량,금액,상태) - var inData = taPurchase.GetInDate(dr.idx); - lvInDate.Items.Clear(); - if(inData != null && inData.Rows.Count > 0) - { - foreach( dsMSSQL.PurchaseRow drP in inData.Rows) - { - string date = drP.indate; - if (date.Length > 9) date = date.Substring(2); - var lv = this.lvInDate.Items.Add(date); - lv.SubItems.Add(drP.request); - lv.SubItems.Add(drP.pumqty.ToString("N0")); - lv.SubItems.Add(drP.pumprice.ToString("N0")); - lv.SubItems.Add(drP.state); - } - } - - var odData = taPurchase.GetOrderDate(dr.idx); - lvOrder.Items.Clear(); - if (odData != null && odData.Rows.Count > 0) - { - foreach (dsMSSQL.PurchaseRow drP in odData.Rows) - { - string date = drP.pdate; - if (date.Length > 9) date = date.Substring(2); - var lv = this.lvOrder.Items.Add(date); - lv.SubItems.Add(drP.request); - lv.SubItems.Add(drP.pumqty.ToString("N0")); - lv.SubItems.Add(drP.pumprice.ToString("N0")); - lv.SubItems.Add(drP.state); - } - } - } - if (img != null) img.Dispose(); - } - - private void button1_Click(object sender, EventArgs e) - { - - } - - private void 파일섡택ToolStripMenuItem_Click(object sender, EventArgs e) - { - var drv = this.bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as dsMSSQL.ItemsRow; - if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached || - dr.RowState == DataRowState.Added) - { - FCOMMON.Util.MsgE("이미지는 등록 완료된 아이템만 가능합니다. 먼저 저장한 후 다시 시도하세요."); - return; - } - OpenFileDialog od = new OpenFileDialog(); - if (od.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; - var image = Image.FromFile(od.FileName); - if (!FCOMMON.DBM.setImageData(image, "Items", "image", dr.idx)) - { - FCOMMON.Util.MsgE("등록 실패"); - } - else this.pictureBox1.Image = Image.FromFile(od.FileName); //181208 - } - - private void 이미지붙여넣기ToolStripMenuItem_Click(object sender, EventArgs e) - { - if(!Clipboard.ContainsImage()) - { - FCOMMON.Util.MsgE("이미지를 먼저 클립보드에 복사 하세요."); - return; - } - - var drv = this.bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as dsMSSQL.ItemsRow; - if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached || - dr.RowState == DataRowState.Added) - { - FCOMMON.Util.MsgE("이미지는 등록 완료된 아이템만 가능합니다. 먼저 저장한 후 다시 시도하세요."); - return; - } - - var image = Clipboard.GetImage(); - if(!FCOMMON.DBM.setImageData(image, "Items", "image", dr.idx)) - { - FCOMMON.Util.MsgE("등록 실패"); - } - else this.pictureBox1.Image = image; //181208 - } - - private void 촬영ToolStripMenuItem_Click(object sender, EventArgs e) - { - var drv = this.bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as dsMSSQL.ItemsRow; - if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached || - dr.RowState == DataRowState.Added) - { - FCOMMON.Util.MsgE("이미지는 등록 완료된 아이템만 가능합니다. 먼저 저장한 후 다시 시도하세요."); - return; - } - - FCOMMON.fWebCamera f = new FCOMMON.fWebCamera(FCOMMON.info.camIndex); - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - System.Drawing.Bitmap bmp = f.bmp.Clone() as System.Drawing.Bitmap; - Application.DoEvents(); - - if (!FCOMMON.DBM.setImageData(bmp, "Items", "image", dr.idx)) - { - FCOMMON.Util.MsgE("등록 실패"); - } - else - { - var oimag = this.pictureBox1.Image; - this.pictureBox1.Image = (Image)bmp; - if (oimag != null) oimag.Dispose(); - } - - - } - } - } -} diff --git a/SubProject/FCM0000/fItems.resx b/SubProject/FCM0000/fItems.resx deleted file mode 100644 index 0645bd3..0000000 --- a/SubProject/FCM0000/fItems.resx +++ /dev/null @@ -1,272 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 321, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC - pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ - Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ - /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA - zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ - IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E - rkJggg== - - - - 122, 17 - - - 17, 17 - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC - DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC - rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV - i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG - 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG - QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX - bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo - dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZIxS8NQFEb7W/wLjh0Fl9a1SxBHBekkWFd1 - qYg4Ci5dndSCg2AHl4LQSaRSKDqoFUE7VAjUmvTKueWmL2mw2gunL7zmO+/mJhmZoTJusdF868vpXUfO - b5/lpPEox9f3SvnsRtk8uojxHQ7HEgSEkXS6vrz3xqtdu+xdfUiheEBsJOGCk/mz/hROUHsIIrp+qIKY - hB/a9r+CVAG4Auj5g7iA5/1NACaptgIVLHkb0wWVw13ZL60p2+uerqkCJs1mMgwUU6d1k/xJwI10RZj1 - 9TPUN7Wam9dgTMC75QR7TjCBkRQs5Jd1jQS8c1ewtZLTPcQW/peADpC44cudgnjZOQ1OCGjTwkwaGBon - GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg== - - - - 389, 10 - - - - R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ - 4TaCromrvC9ymyV+0Dd3mTl1koe72YvN7LTj+9ne6N3g6v7+/0Cw2Stoh////////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAInwA/CBzooaAHgQUHKvRQoUABCgUlHFT4IYMCBAsQIIBg - wcBEgh0WCBDAgcAFDAc+fvDQIUKHDgMeEHDQIIFKlgoMGgjQoAGDmwUOehhg4EACBhM+GlzKVOkEBgkO - GBggNOhCBhgCBPBYUEGHmwkCOCDwYMCAll8XHghwgQCHkQDSLjRgAcKDBwAAKNCwgaIHiR4oOKygkuDE - pRQTK6YYEAA7 - - - - - R0lGODlhEAAQAIQfALnik2aXQv7+/dPut73llbfala3LmW6gSWqdQ2eYRGqaSLfck568iYrUQN7yzF6R - PLTXlYjUP8XwmYfQQLbYl4jRQGiaQsPumNbyu7nglNPzsLXYlf7+/lCHK////////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIlgA/CBzooaAHgQUHEvSgIEAABQUfHFTIwQECDAMwYDhg - oENCgRw8dBgAAECFBgsweJxYsAODDjApTIhAwCMHkCItGOxwgUCGlQQTeAgJsyhQg0iTGvzQ0qhND0IX - dtBwQcJKDxZsIhQpIcIECkVffmwpYUGDCiUheBQg1cCBAgU2QFDg4KZCDxIZOoQ48S7LpQoDCx4cEAA7 - - - - - R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh - e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw - QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK - HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC - un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= - - - - - R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7 - 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ - IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj - SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG - vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== - - - - 186, 17 - - - 248, 17 - - - 462, 17 - - - 17, 56 - - - 568, 17 - - - 169, 56 - - \ No newline at end of file diff --git a/SubProject/FCM0000/fLovItem.Designer.cs b/SubProject/FCM0000/fLovItem.Designer.cs deleted file mode 100644 index 98cc34c..0000000 --- a/SubProject/FCM0000/fLovItem.Designer.cs +++ /dev/null @@ -1,528 +0,0 @@ -namespace FCM0000 -{ - partial class fLovItem - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - 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.Windows.Forms.Label label2; - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLovItem)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = 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(); - this.bn = new System.Windows.Forms.BindingNavigator(this.components); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dsMSSQL = new FCM0000.dsMSSQL(); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - 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.model = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.panel1 = new System.Windows.Forms.Panel(); - this.linkLabel1 = new System.Windows.Forms.LinkLabel(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.textBox3 = new System.Windows.Forms.TextBox(); - this.textBox2 = new System.Windows.Forms.TextBox(); - this.textBox1 = 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(); - this.ta = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter(); - this.tam = new FCM0000.dsMSSQLTableAdapters.TableAdapterManager(); - 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(); - label2 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); - this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit(); - this.panel1.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.SuspendLayout(); - // - // manuLabel - // - manuLabel.AutoSize = true; - manuLabel.Location = new System.Drawing.Point(18, 15); - manuLabel.Name = "manuLabel"; - manuLabel.Size = new System.Drawing.Size(50, 18); - manuLabel.TabIndex = 8; - manuLabel.Text = "manu:"; - // - // supplyLabel - // - supplyLabel.AutoSize = true; - supplyLabel.Location = new System.Drawing.Point(14, 47); - supplyLabel.Name = "supplyLabel"; - supplyLabel.Size = new System.Drawing.Size(54, 18); - supplyLabel.TabIndex = 10; - supplyLabel.Text = "supply:"; - // - // memoLabel - // - memoLabel.AutoSize = true; - memoLabel.Location = new System.Drawing.Point(13, 81); - memoLabel.Name = "memoLabel"; - memoLabel.Size = new System.Drawing.Size(55, 18); - memoLabel.TabIndex = 12; - memoLabel.Text = "memo:"; - // - // priceLabel - // - priceLabel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - priceLabel.AutoSize = true; - priceLabel.Location = new System.Drawing.Point(25, 435); - priceLabel.Name = "priceLabel"; - priceLabel.Size = new System.Drawing.Size(43, 18); - priceLabel.TabIndex = 18; - priceLabel.Text = "price:"; - // - // label1 - // - label1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - label1.AutoSize = true; - label1.Location = new System.Drawing.Point(32, 466); - label1.Name = "label1"; - label1.Size = new System.Drawing.Size(36, 18); - label1.TabIndex = 20; - label1.Text = "cate"; - // - // label2 - // - label2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - label2.AutoSize = true; - label2.Location = new System.Drawing.Point(27, 404); - label2.Name = "label2"; - label2.Size = new System.Drawing.Size(41, 18); - label2.TabIndex = 22; - label2.Text = "Scale"; - // - // bn - // - this.bn.AddNewItem = null; - this.bn.BindingSource = this.bs; - this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = null; - this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bindingNavigatorMoveFirstItem, - this.bindingNavigatorMovePreviousItem, - this.bindingNavigatorSeparator, - this.bindingNavigatorPositionItem, - this.bindingNavigatorCountItem, - this.bindingNavigatorSeparator1, - this.bindingNavigatorMoveNextItem, - this.bindingNavigatorMoveLastItem, - this.bindingNavigatorSeparator2, - this.btOK}); - this.bn.Location = new System.Drawing.Point(0, 502); - 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(985, 25); - this.bn.TabIndex = 0; - this.bn.Text = "bindingNavigator1"; - // - // bs - // - this.bs.DataMember = "Items"; - this.bs.DataSource = this.dsMSSQL; - this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); - // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorPositionItem - // - this.bindingNavigatorPositionItem.AccessibleName = "위치"; - this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; - this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); - this.bindingNavigatorPositionItem.Text = "0"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "마지막으로 이동"; - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); - // - // btOK - // - this.btOK.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btOK.Image = ((System.Drawing.Image)(resources.GetObject("btOK.Image"))); - this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(76, 22); - this.btOK.Text = "Select(&O)"; - this.btOK.Click += new System.EventHandler(this.itemsBindingNavigatorSaveItem_Click); - // - // dv - // - this.dv.AllowUserToAddRows = false; - this.dv.AllowUserToDeleteRows = false; - this.dv.AutoGenerateColumns = false; - this.dv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; - this.dv.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; - this.dv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewTextBoxColumn1, - this.dataGridViewTextBoxColumn2, - this.model, - this.dataGridViewTextBoxColumn3}); - this.dv.DataSource = this.bs; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle6.Font = new System.Drawing.Font("Tahoma", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle6.Padding = new System.Windows.Forms.Padding(1, 3, 1, 3); - dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv.DefaultCellStyle = dataGridViewCellStyle6; - this.dv.Dock = System.Windows.Forms.DockStyle.Fill; - this.dv.Location = new System.Drawing.Point(0, 0); - this.dv.Name = "dv"; - this.dv.ReadOnly = true; - this.dv.RowHeadersVisible = false; - this.dv.RowTemplate.Height = 23; - this.dv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dv.Size = new System.Drawing.Size(695, 502); - this.dv.TabIndex = 1; - this.dv.DoubleClick += new System.EventHandler(this.dv_DoubleClick); - this.dv.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dv_KeyDown); - // - // dataGridViewTextBoxColumn1 - // - this.dataGridViewTextBoxColumn1.DataPropertyName = "idx"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle4; - this.dataGridViewTextBoxColumn1.HeaderText = "IDX"; - this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; - this.dataGridViewTextBoxColumn1.ReadOnly = true; - this.dataGridViewTextBoxColumn1.Width = 60; - // - // dataGridViewTextBoxColumn2 - // - this.dataGridViewTextBoxColumn2.DataPropertyName = "name"; - this.dataGridViewTextBoxColumn2.HeaderText = "Name"; - this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2"; - this.dataGridViewTextBoxColumn2.ReadOnly = true; - this.dataGridViewTextBoxColumn2.Width = 74; - // - // model - // - this.model.DataPropertyName = "model"; - dataGridViewCellStyle5.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.model.DefaultCellStyle = dataGridViewCellStyle5; - this.model.HeaderText = "model"; - this.model.Name = "model"; - this.model.ReadOnly = true; - this.model.Width = 74; - // - // dataGridViewTextBoxColumn3 - // - this.dataGridViewTextBoxColumn3.DataPropertyName = "sid"; - this.dataGridViewTextBoxColumn3.HeaderText = "SID"; - this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3"; - this.dataGridViewTextBoxColumn3.ReadOnly = true; - this.dataGridViewTextBoxColumn3.Width = 59; - // - // panel1 - // - this.panel1.Controls.Add(this.linkLabel1); - this.panel1.Controls.Add(this.pictureBox1); - 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(695, 0); - this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(290, 502); - this.panel1.TabIndex = 2; - // - // linkLabel1 - // - this.linkLabel1.AutoSize = true; - this.linkLabel1.Location = new System.Drawing.Point(13, 249); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(51, 18); - this.linkLabel1.TabIndex = 27; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "Image"; - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); - // - // pictureBox1 - // - this.pictureBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.pictureBox1.BackColor = System.Drawing.Color.Black; - this.pictureBox1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.pictureBox1.Location = new System.Drawing.Point(74, 248); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(202, 146); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.pictureBox1.TabIndex = 26; - this.pictureBox1.TabStop = false; - // - // textBox3 - // - this.textBox3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "unit", true)); - this.textBox3.Location = new System.Drawing.Point(237, 401); - this.textBox3.Name = "textBox3"; - this.textBox3.ReadOnly = true; - this.textBox3.Size = new System.Drawing.Size(38, 25); - this.textBox3.TabIndex = 24; - // - // textBox2 - // - this.textBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.textBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "scale", true)); - this.textBox2.Location = new System.Drawing.Point(75, 401); - this.textBox2.Name = "textBox2"; - this.textBox2.ReadOnly = true; - this.textBox2.Size = new System.Drawing.Size(156, 25); - this.textBox2.TabIndex = 23; - // - // textBox1 - // - this.textBox1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "cate", true)); - this.textBox1.Location = new System.Drawing.Point(75, 464); - 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, 45); - this.supplyTextBox.Name = "supplyTextBox"; - this.supplyTextBox.ReadOnly = true; - this.supplyTextBox.Size = new System.Drawing.Size(200, 25); - this.supplyTextBox.TabIndex = 11; - // - // memoTextBox - // - this.memoTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true)); - this.memoTextBox.Location = new System.Drawing.Point(75, 79); - this.memoTextBox.Multiline = true; - this.memoTextBox.Name = "memoTextBox"; - this.memoTextBox.ReadOnly = true; - this.memoTextBox.Size = new System.Drawing.Size(200, 158); - this.memoTextBox.TabIndex = 13; - // - // priceTextBox - // - this.priceTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.priceTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "price", true)); - this.priceTextBox.Location = new System.Drawing.Point(75, 433); - this.priceTextBox.Name = "priceTextBox"; - this.priceTextBox.ReadOnly = true; - this.priceTextBox.Size = new System.Drawing.Size(200, 25); - this.priceTextBox.TabIndex = 19; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // tam - // - this.tam.BackupDataSetBeforeUpdate = false; - this.tam.BoardTableAdapter = null; - this.tam.CommonTableAdapter = null; - this.tam.CustomsTableAdapter = null; - this.tam.ItemsTableAdapter = this.ta; - this.tam.MailDataTableAdapter = null; - this.tam.MailFormTableAdapter = null; - this.tam.ProjectsTableAdapter = null; - this.tam.PurchaseTableAdapter = null; - this.tam.RequestItemTableAdapter = null; - this.tam.StaffTableAdapter = null; - this.tam.UpdateOrder = FCM0000.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - // - // fLovItem - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(985, 527); - this.Controls.Add(this.dv); - this.Controls.Add(this.panel1); - this.Controls.Add(this.bn); - 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.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private dsMSSQL dsMSSQL; - private System.Windows.Forms.BindingSource bs; - private dsMSSQLTableAdapters.ItemsTableAdapter ta; - private dsMSSQLTableAdapters.TableAdapterManager tam; - private System.Windows.Forms.BindingNavigator bn; - private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; - private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.ToolStripButton btOK; - private System.Windows.Forms.DataGridView dv; - private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.TextBox manuTextBox; - private System.Windows.Forms.TextBox supplyTextBox; - private System.Windows.Forms.TextBox memoTextBox; - private System.Windows.Forms.TextBox priceTextBox; - private System.Windows.Forms.TextBox textBox1; - private System.Windows.Forms.TextBox textBox3; - private System.Windows.Forms.TextBox textBox2; - 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.PictureBox pictureBox1; - private System.Windows.Forms.LinkLabel linkLabel1; - - } -} \ No newline at end of file diff --git a/SubProject/FCM0000/fLovItem.cs b/SubProject/FCM0000/fLovItem.cs deleted file mode 100644 index daa2f0e..0000000 --- a/SubProject/FCM0000/fLovItem.cs +++ /dev/null @@ -1,143 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace FCM0000 -{ - public partial class fLovItem : Form - { - public string itemName = string.Empty; - public int item = -1; - public string itemmodel = string.Empty; - public decimal itemprice = 0; - public string SID = string.Empty; - public string itemUnit = "EA"; - public string itemSupply = string.Empty; - public int itemSupplyidx = -1; - - string keyword = string.Empty; - public fLovItem(string search_) - { - InitializeComponent(); - this.keyword = search_; - this.KeyPreview = true; - this.KeyDown += (s1, e1) => { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - - } - - private void fLovItem_Load(object sender, EventArgs e) - { - //search data - this.ta.FillSearch(this.dsMSSQL.Items,this.keyword,FCOMMON.info.Login.gcode); - } - - private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e) - { - var drv = bs.Current as DataRowView; - if (drv == null) - { - itemName = string.Empty; - item = -1; - itemmodel = string.Empty; - itemprice = 0; - itemSupply = string.Empty; - itemSupplyidx = -1; - itemUnit = "EA"; - SID = string.Empty; - return; - } - else - { - var dr = drv.Row as dsMSSQL.ItemsRow; - item = dr.idx; - if (dr.IsnameNull()) itemName = string.Empty; - else itemName = dr.name; - if (dr.IsmodelNull()) itemmodel = string.Empty; - else itemmodel = dr.model; - if (dr.IspriceNull()) itemprice = 0; - else itemprice = dr.price; - if (dr.IssupplyNull()) itemSupply = string.Empty; - else itemSupply = dr.supply; - if (dr.IssupplyidxNull()) itemSupplyidx = -1; - else itemSupplyidx = dr.supplyidx; - if (dr.IsunitNull()) itemUnit = "EA"; - else itemUnit = dr.unit; - SID = dr.sid; - } - - if (itemName.isEmpty() || item == -1) DialogResult = System.Windows.Forms.DialogResult.Cancel; - else DialogResult = System.Windows.Forms.DialogResult.OK; - } - - private void bs_CurrentChanged(object sender, EventArgs e) - { - var drv = this.bs.Current as DataRowView; - var img = this.pictureBox1.Image; - if (drv == null) - { - this.pictureBox1.Image = null; - } - else - { - try - { - var dr = drv.Row as dsMSSQL.ItemsRow; - var img1 = FCOMMON.DBM.GetImageData("Items", "image", dr.idx); - if (img1 != null) this.pictureBox1.Image = img1; - else this.pictureBox1.Image = null; - }catch (Exception ex) - { - this.pictureBox1.Image = null; - } - - } - if (img != null) img.Dispose(); - } - - private void dv_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - - btOK.PerformClick(); - } - - } - - private void dv_DoubleClick(object sender, EventArgs e) - { - btOK.PerformClick(); - } - - private void linkLabel1_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) - { - var drv = this.bs.Current as DataRowView; - if (drv == null) return; - var dr = drv.Row as dsMSSQL.ItemsRow; - if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached || - dr.RowState == DataRowState.Added) - { - FCOMMON.Util.MsgE("이미지는 등록 완료된 아이템만 가능합니다. 먼저 저장한 후 다시 시도하세요."); - return; - } - OpenFileDialog od = new OpenFileDialog(); - if (od.ShowDialog() != System.Windows.Forms.DialogResult.OK) return; - var image = Image.FromFile(od.FileName); - if (!FCOMMON.DBM.setImageData(image, "Items", "image", dr.idx)) - { - FCOMMON.Util.MsgE("등록 실패"); - } - else - { - this.pictureBox1.Image = Image.FromFile(od.FileName); - } - } - } -} diff --git a/SubProject/FCM0000/fLovItem.resx b/SubProject/FCM0000/fLovItem.resx deleted file mode 100644 index 1ed4608..0000000 --- a/SubProject/FCM0000/fLovItem.resx +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - False - - - False - - - False - - - False - - - False - - - False - - - 321, 17 - - - 17, 17 - - - 216, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo - dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - - - 216, 17 - - - True - - - 81, 17 - - - 143, 17 - - \ No newline at end of file diff --git a/SubProject/FCM0000/fLovOneItem.Designer.cs b/SubProject/FCM0000/fLovOneItem.Designer.cs deleted file mode 100644 index 59a7f53..0000000 --- a/SubProject/FCM0000/fLovOneItem.Designer.cs +++ /dev/null @@ -1,234 +0,0 @@ -namespace FCM0000 -{ - partial class fLovOneItem - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLovOneItem)); - this.bn = new System.Windows.Forms.BindingNavigator(this.components); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.dv = new System.Windows.Forms.DataGridView(); - this.ta = new FCM0000.dsMSSQLTableAdapters.CustomsTableAdapter(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - this.btOK = new System.Windows.Forms.ToolStripButton(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); - this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - this.SuspendLayout(); - // - // bn - // - this.bn.AddNewItem = null; - this.bn.BindingSource = this.bs; - this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = null; - this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bindingNavigatorMoveFirstItem, - this.bindingNavigatorMovePreviousItem, - this.bindingNavigatorSeparator, - this.bindingNavigatorPositionItem, - this.bindingNavigatorCountItem, - this.bindingNavigatorSeparator1, - this.bindingNavigatorMoveNextItem, - this.bindingNavigatorMoveLastItem, - this.bindingNavigatorSeparator2, - this.btOK}); - this.bn.Location = new System.Drawing.Point(0, 564); - 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(402, 25); - this.bn.TabIndex = 0; - this.bn.Text = "bindingNavigator1"; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorPositionItem - // - this.bindingNavigatorPositionItem.AccessibleName = "위치"; - this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; - this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); - this.bindingNavigatorPositionItem.Text = "0"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); - // - // dv - // - this.dv.AllowUserToAddRows = false; - this.dv.AllowUserToDeleteRows = false; - this.dv.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; - this.dv.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; - this.dv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dv.ColumnHeadersVisible = false; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.Padding = new System.Windows.Forms.Padding(1, 3, 1, 3); - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dv.DefaultCellStyle = dataGridViewCellStyle1; - this.dv.Dock = System.Windows.Forms.DockStyle.Fill; - this.dv.Location = new System.Drawing.Point(0, 0); - this.dv.Name = "dv"; - this.dv.ReadOnly = true; - this.dv.RowHeadersVisible = false; - this.dv.RowTemplate.Height = 23; - this.dv.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect; - this.dv.Size = new System.Drawing.Size(402, 564); - this.dv.TabIndex = 1; - this.dv.DoubleClick += new System.EventHandler(this.dv_DoubleClick); - this.dv.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dv_KeyDown); - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // bs - // - this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged); - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "이전으로 이동"; - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "마지막으로 이동"; - // - // btOK - // - this.btOK.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btOK.Image = ((System.Drawing.Image)(resources.GetObject("btOK.Image"))); - this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(76, 22); - this.btOK.Text = "Select(&O)"; - this.btOK.Click += new System.EventHandler(this.itemsBindingNavigatorSaveItem_Click); - // - // fLovOneItem - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(402, 589); - this.Controls.Add(this.dv); - this.Controls.Add(this.bn); - this.Font = new System.Drawing.Font("Tahoma", 13F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Name = "fLovOneItem"; - this.Text = "Select Item"; - this.Load += new System.EventHandler(this.fLovItem_Load); - ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.BindingSource bs; - private System.Windows.Forms.BindingNavigator bn; - private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; - private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.ToolStripButton btOK; - private System.Windows.Forms.DataGridView dv; - private dsMSSQLTableAdapters.CustomsTableAdapter ta; - - } -} \ No newline at end of file diff --git a/SubProject/FCM0000/fLovOneItem.cs b/SubProject/FCM0000/fLovOneItem.cs deleted file mode 100644 index 0df66af..0000000 --- a/SubProject/FCM0000/fLovOneItem.cs +++ /dev/null @@ -1,100 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace FCM0000 -{ - public partial class fLovOneItem : Form - { - public string Title { get; set; } - DataTable dt; - - public fLovOneItem(List lists) - { - InitializeComponent(); - this.StartPosition = FormStartPosition.CenterScreen; - Title = string.Empty; - dt = new DataTable(); - dt.Columns.Add("item"); - foreach (var item in lists) - dt.Rows.Add(new string[] { item }); - - this.KeyPreview = true; - this.KeyDown += (s1, e1) => { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - - } - public fLovOneItem(Dictionary lists) - { - InitializeComponent(); - Title = string.Empty; - dt = new DataTable(); - dt.Columns.Add("item"); - dt.Columns.Add("Desc"); - foreach (var item in lists) - dt.Rows.Add(new string[] { item.Key ,item.Value}); - - this.KeyPreview = true; - this.KeyDown += (s1, e1) => - { - if (e1.KeyCode == Keys.Escape) this.Close(); - }; - - } - private void fLovItem_Load(object sender, EventArgs e) - { - this.bs.DataSource = this.dt; - this.bn.BindingSource = this.bs; - this.dv.DataSource = this.bs; - - if(dv.Columns.Count > 1) - this.dv.Columns[1].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - else - this.dv.Columns[0].AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; - } - - - private void bs_CurrentChanged(object sender, EventArgs e) - { - - } - - private void dv_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - - btOK.PerformClick(); - } - - } - - private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e) - { - var drv = bs.Current as DataRowView; - if (drv == null) - { - Title = string.Empty; - return; - } - else - { - Title = drv[0].ToString(); - } - - if (Title.isEmpty()) DialogResult = System.Windows.Forms.DialogResult.Cancel; - else DialogResult = System.Windows.Forms.DialogResult.OK; - } - - private void dv_DoubleClick(object sender, EventArgs e) - { - btOK.PerformClick(); - } - } -} diff --git a/SubProject/FCM0000/fLovOneItem.resx b/SubProject/FCM0000/fLovOneItem.resx deleted file mode 100644 index 30ca9fd..0000000 --- a/SubProject/FCM0000/fLovOneItem.resx +++ /dev/null @@ -1,180 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 81, 17 - - - 17, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo - dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - - - 147, 17 - - - 82 - - \ No newline at end of file diff --git a/SubProject/FCM0000/fLovProject.cs b/SubProject/FCM0000/fLovProject.cs index 3a1b6a0..e1318d2 100644 --- a/SubProject/FCM0000/fLovProject.cs +++ b/SubProject/FCM0000/fLovProject.cs @@ -33,10 +33,9 @@ namespace FCM0000 { //search data // var dt = this.ta.GetSearch(this.keyword); - this.ta.FillSearch(this.dsMSSQL.Projects,this.keyword); + this.ta.FillSearch(this.dsMSSQL.Projects,"%" + this.keyword + "%",FCOMMON.info.Login.gcode); } - private void bs_CurrentChanged(object sender, EventArgs e) { @@ -48,8 +47,7 @@ namespace FCM0000 { btOK.PerformClick(); - } - + } } private void itemsBindingNavigatorSaveItem_Click(object sender, EventArgs e) diff --git a/SubProject/FCM0000/fLovSupply.cs b/SubProject/FCM0000/fLovSupply.cs index e88b674..b3664e6 100644 --- a/SubProject/FCM0000/fLovSupply.cs +++ b/SubProject/FCM0000/fLovSupply.cs @@ -31,7 +31,7 @@ namespace FCM0000 private void fLovItem_Load(object sender, EventArgs e) { - this.ta.FillSearch(this.dsMSSQL.Customs, "%" + this.keyword + "%"); + this.ta.FillSearch(this.dsMSSQL.Customs, "%" + this.keyword + "%",FCOMMON.info.Login.gcode); } diff --git a/SubProject/FCM0000/fLovUser.Designer.cs b/SubProject/FCM0000/fLovUser.Designer.cs deleted file mode 100644 index 90ac73d..0000000 --- a/SubProject/FCM0000/fLovUser.Designer.cs +++ /dev/null @@ -1,430 +0,0 @@ -namespace FCM0000 -{ - partial class fLovUser - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLovUser)); - FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.DateTimeCellType dateTimeCellType1 = new FarPoint.Win.Spread.CellType.DateTimeCellType(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dSUser = new FCM0000.DSUser(); - this.bn = new System.Windows.Forms.BindingNavigator(this.components); - this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); - this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorPositionItem = new System.Windows.Forms.ToolStripTextBox(); - this.bindingNavigatorSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.bindingNavigatorMoveNextItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); - this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.btOK = new System.Windows.Forms.ToolStripButton(); - this.ta = new FCM0000.DSUserTableAdapters.UsersTableAdapter(); - this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); - this.cm = new System.Windows.Forms.ContextMenuStrip(this.components); - this.columnSizeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.exportListToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSUser)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); - this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); - this.cm.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); - this.SuspendLayout(); - // - // bs - // - this.bs.DataMember = "Users"; - this.bs.DataSource = this.dSUser; - // - // dSUser - // - this.dSUser.DataSetName = "DSUser"; - this.dSUser.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bn - // - this.bn.AddNewItem = null; - this.bn.BindingSource = this.bs; - this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = null; - this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; - this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.bindingNavigatorMoveFirstItem, - this.bindingNavigatorMovePreviousItem, - this.bindingNavigatorSeparator, - this.bindingNavigatorPositionItem, - this.bindingNavigatorCountItem, - this.bindingNavigatorSeparator1, - this.bindingNavigatorMoveNextItem, - this.bindingNavigatorMoveLastItem, - this.bindingNavigatorSeparator2, - this.btOK}); - this.bn.Location = new System.Drawing.Point(0, 457); - 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(759, 25); - this.bn.TabIndex = 0; - this.bn.Text = "bindingNavigator1"; - // - // bindingNavigatorCountItem - // - this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; - this.bindingNavigatorCountItem.Size = new System.Drawing.Size(27, 22); - this.bindingNavigatorCountItem.Text = "/{0}"; - this.bindingNavigatorCountItem.ToolTipText = "전체 항목 수"; - // - // bindingNavigatorMoveFirstItem - // - this.bindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "처음으로 이동"; - // - // bindingNavigatorMovePreviousItem - // - this.bindingNavigatorMovePreviousItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "이전으로 이동"; - // - // bindingNavigatorSeparator - // - this.bindingNavigatorSeparator.Name = "bindingNavigatorSeparator"; - this.bindingNavigatorSeparator.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorPositionItem - // - this.bindingNavigatorPositionItem.AccessibleName = "위치"; - this.bindingNavigatorPositionItem.AutoSize = false; - this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem"; - this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23); - this.bindingNavigatorPositionItem.Text = "0"; - this.bindingNavigatorPositionItem.ToolTipText = "현재 위치"; - // - // bindingNavigatorSeparator1 - // - this.bindingNavigatorSeparator1.Name = "bindingNavigatorSeparator1"; - this.bindingNavigatorSeparator1.Size = new System.Drawing.Size(6, 25); - // - // bindingNavigatorMoveNextItem - // - this.bindingNavigatorMoveNextItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "다음으로 이동"; - // - // bindingNavigatorMoveLastItem - // - this.bindingNavigatorMoveLastItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - 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.Text = "마지막으로 이동"; - // - // bindingNavigatorSeparator2 - // - this.bindingNavigatorSeparator2.Name = "bindingNavigatorSeparator2"; - this.bindingNavigatorSeparator2.Size = new System.Drawing.Size(6, 25); - // - // btOK - // - this.btOK.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; - this.btOK.Image = ((System.Drawing.Image)(resources.GetObject("btOK.Image"))); - this.btOK.Name = "btOK"; - this.btOK.Size = new System.Drawing.Size(68, 22); - this.btOK.Text = "선택(&O)"; - this.btOK.Click += new System.EventHandler(this.btSelect_Cliock); - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // fpSpread1 - // - this.fpSpread1.AccessibleDescription = ""; - this.fpSpread1.ContextMenuStrip = this.cm; - this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; - this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1.Location = new System.Drawing.Point(0, 0); - this.fpSpread1.Name = "fpSpread1"; - this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { - this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(759, 457); - this.fpSpread1.TabIndex = 1; - // - // cm - // - this.cm.Font = new System.Drawing.Font("맑은 고딕", 18F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.cm.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.columnSizeToolStripMenuItem, - this.exportListToolStripMenuItem}); - this.cm.Name = "contextMenuStrip1"; - this.cm.Size = new System.Drawing.Size(243, 76); - // - // columnSizeToolStripMenuItem - // - this.columnSizeToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.saveToolStripMenuItem, - this.loadToolStripMenuItem}); - this.columnSizeToolStripMenuItem.Name = "columnSizeToolStripMenuItem"; - this.columnSizeToolStripMenuItem.Size = new System.Drawing.Size(242, 36); - this.columnSizeToolStripMenuItem.Text = "열 크기"; - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.Size = new System.Drawing.Size(266, 36); - this.saveToolStripMenuItem.Text = "현재 상태 저장"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); - // - // loadToolStripMenuItem - // - this.loadToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("loadToolStripMenuItem.Image"))); - this.loadToolStripMenuItem.Name = "loadToolStripMenuItem"; - this.loadToolStripMenuItem.Size = new System.Drawing.Size(266, 36); - this.loadToolStripMenuItem.Text = "저장값 불러오기"; - this.loadToolStripMenuItem.Click += new System.EventHandler(this.loadToolStripMenuItem_Click); - // - // exportListToolStripMenuItem - // - this.exportListToolStripMenuItem.Name = "exportListToolStripMenuItem"; - this.exportListToolStripMenuItem.Size = new System.Drawing.Size(242, 36); - this.exportListToolStripMenuItem.Text = "목록 내보내기"; - this.exportListToolStripMenuItem.Click += new System.EventHandler(this.exportListToolStripMenuItem_Click); - // - // fpSpread1_Sheet1 - // - this.fpSpread1_Sheet1.Reset(); - this.fpSpread1_Sheet1.SheetName = "Sheet1"; - // Formulas and custom names must be loaded with R1C1 reference style - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1; - this.fpSpread1_Sheet1.ColumnCount = 19; - this.fpSpread1_Sheet1.ActiveColumnIndex = -1; - this.fpSpread1_Sheet1.ActiveRowIndex = -1; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "사용자번호"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "성명"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "부서"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "직책"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "이메일"; - this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "전화"; - this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 34F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; - this.fpSpread1_Sheet1.Columns.Get(0).DataField = "id"; - this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Label = "사용자번호"; - this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(0).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; - this.fpSpread1_Sheet1.Columns.Get(1).DataField = "password"; - this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(1).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(1).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; - this.fpSpread1_Sheet1.Columns.Get(2).DataField = "nameE"; - this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(2).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(2).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "name"; - this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Label = "성명"; - this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(3).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; - this.fpSpread1_Sheet1.Columns.Get(4).DataField = "dept"; - this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(4).Label = "부서"; - this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(4).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; - this.fpSpread1_Sheet1.Columns.Get(5).DataField = "grade"; - this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Label = "직책"; - this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(5).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "email"; - this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; - this.fpSpread1_Sheet1.Columns.Get(6).Label = "이메일"; - this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(6).Width = 135F; - numberCellType1.DecimalPlaces = 0; - numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType1.MaximumValue = 32767D; - numberCellType1.MinimumValue = -32768D; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = numberCellType1; - this.fpSpread1_Sheet1.Columns.Get(7).DataField = "level"; - this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(7).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(7).Width = 61F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8; - this.fpSpread1_Sheet1.Columns.Get(8).DataField = "indate"; - this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(8).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(8).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9; - this.fpSpread1_Sheet1.Columns.Get(9).DataField = "outdate"; - this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(9).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(9).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; - this.fpSpread1_Sheet1.Columns.Get(10).DataField = "tel"; - this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Label = "전화"; - this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(10).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; - this.fpSpread1_Sheet1.Columns.Get(11).DataField = "hp"; - this.fpSpread1_Sheet1.Columns.Get(11).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(11).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12; - this.fpSpread1_Sheet1.Columns.Get(12).DataField = "place"; - this.fpSpread1_Sheet1.Columns.Get(12).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(12).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType13; - this.fpSpread1_Sheet1.Columns.Get(13).DataField = "ads_employNo"; - this.fpSpread1_Sheet1.Columns.Get(13).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(13).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = textCellType14; - this.fpSpread1_Sheet1.Columns.Get(14).DataField = "ads_title"; - this.fpSpread1_Sheet1.Columns.Get(14).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(14).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType15; - this.fpSpread1_Sheet1.Columns.Get(15).DataField = "ads_created"; - this.fpSpread1_Sheet1.Columns.Get(15).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(15).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = textCellType16; - this.fpSpread1_Sheet1.Columns.Get(16).DataField = "memo"; - this.fpSpread1_Sheet1.Columns.Get(16).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(16).Width = 135F; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType17; - this.fpSpread1_Sheet1.Columns.Get(17).DataField = "wuid"; - this.fpSpread1_Sheet1.Columns.Get(17).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(17).Width = 135F; - dateTimeCellType1.Calendar = new System.Globalization.GregorianCalendar(System.Globalization.GregorianCalendarTypes.Localized); - dateTimeCellType1.CalendarSurroundingDaysColor = System.Drawing.SystemColors.GrayText; - dateTimeCellType1.MaximumTime = System.TimeSpan.Parse("23:59:59.9999999"); - dateTimeCellType1.TimeDefault = new System.DateTime(2019, 7, 23, 10, 27, 21, 386); - this.fpSpread1_Sheet1.Columns.Get(18).CellType = dateTimeCellType1; - this.fpSpread1_Sheet1.Columns.Get(18).DataField = "wdate"; - this.fpSpread1_Sheet1.Columns.Get(18).Visible = false; - this.fpSpread1_Sheet1.Columns.Get(18).Width = 91F; - this.fpSpread1_Sheet1.DataAutoSizeColumns = false; - this.fpSpread1_Sheet1.DataSource = this.bs; - this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; - this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; - // - // fLovUser - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(759, 482); - this.Controls.Add(this.fpSpread1); - this.Controls.Add(this.bn); - this.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Name = "fLovUser"; - this.Text = "사용자 선택"; - this.Load += new System.EventHandler(this.fLovItem_Load); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSUser)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); - this.bn.ResumeLayout(false); - this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); - this.cm.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.BindingSource bs; - private System.Windows.Forms.BindingNavigator bn; - private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMovePreviousItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator; - private System.Windows.Forms.ToolStripTextBox bindingNavigatorPositionItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator1; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveNextItem; - private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; - private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; - private System.Windows.Forms.ToolStripButton btOK; - private DSUser dSUser; - private DSUserTableAdapters.UsersTableAdapter ta; - private FarPoint.Win.Spread.FpSpread fpSpread1; - private System.Windows.Forms.ContextMenuStrip cm; - private System.Windows.Forms.ToolStripMenuItem columnSizeToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem saveToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem loadToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem exportListToolStripMenuItem; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; - - } -} \ No newline at end of file diff --git a/SubProject/FCM0000/fLovUser.cs b/SubProject/FCM0000/fLovUser.cs deleted file mode 100644 index 300dbf6..0000000 --- a/SubProject/FCM0000/fLovUser.cs +++ /dev/null @@ -1,117 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace FCM0000 -{ - public partial class fLovUser : FCOMMON.fBase - { - string fn_fpcolsize = ""; - string keyword = string.Empty; - - public string userEmail { get; set; } - public string userID { get; set; } - public string userName { get; set; } - public string userTel { get; set; } - - - public fLovUser(string search_) - { - InitializeComponent(); - fn_fpcolsize = System.IO.Path.Combine(FCOMMON.Util.CurrentPath, "formSetting", "fp_" + this.Name + ".ini"); - this.keyword = search_; - this.fpSpread1.KeyDown += fpSpread1_KeyDown; - this.fpSpread1.CellDoubleClick += fpSpread1_CellDoubleClick; - - //clear data - userEmail = string.Empty; - userID = string.Empty; - userName = string.Empty; - userTel = string.Empty; - } - - void fpSpread1_CellDoubleClick(object sender, FarPoint.Win.Spread.CellClickEventArgs e) - { - btOK.PerformClick(); - } - - void fpSpread1_KeyDown(object sender, KeyEventArgs e) - { - if (e.KeyCode == Keys.Enter) - { - btOK.PerformClick(); - } - } - - private void fLovItem_Load(object sender, EventArgs e) - { - this.Text = string.Format("사용자선택({0})",this.keyword); - this.Show(); - Application.DoEvents(); - refreshData(); - } - - void refreshData() - { - - try - { - if (keyword == "" || keyword == "%" || keyword == "%%") this.ta.Fill(this.dSUser.Users); - else this.ta.FillBySearch(this.dSUser.Users, keyword ); - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); - } - catch (Exception eX) - { - FCOMMON.Util.MsgE(eX.Message); - } - } - - - private void btSelect_Cliock(object sender, EventArgs e) - { - var drv = bs.Current as DataRowView; - if (drv == null) return; - else - { - var dr = drv.Row as DSUser.UsersRow;//.CustomsRow; - userID = dr.id; - userName = dr.name; - userEmail = dr.email; - userTel = dr.tel; - } - DialogResult = System.Windows.Forms.DialogResult.OK; - } - - - private void saveToolStripMenuItem_Click(object sender, EventArgs e) - { - FPUtil.ColsizeSave(this.fpSpread1, fn_fpcolsize); - } - - private void loadToolStripMenuItem_Click(object sender, EventArgs e) - { - FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize); - } - - private void exportListToolStripMenuItem_Click(object sender, EventArgs e) - { - SaveFileDialog sd = new SaveFileDialog(); - sd.Filter = "excel|*.xls"; - sd.FileName = "userlist.xls"; - if (sd.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - fpSpread1.SaveExcel(sd.FileName, - FarPoint.Excel.ExcelSaveFlags.SaveAsViewed - | FarPoint.Excel.ExcelSaveFlags.SaveAsFiltered - | FarPoint.Excel.ExcelSaveFlags.NoFormulas - | FarPoint.Excel.ExcelSaveFlags.SaveCustomColumnHeaders); - FCOMMON.Util.MsgI("다음 파일이 생성 되었습니다.\n\n" + sd.FileName); - } - } - } -} diff --git a/SubProject/FCM0000/fLovUser.resx b/SubProject/FCM0000/fLovUser.resx deleted file mode 100644 index 1999db6..0000000 --- a/SubProject/FCM0000/fLovUser.resx +++ /dev/null @@ -1,219 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 147, 17 - - - 81, 17 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 - wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 - v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg - UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA - Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu - lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w - 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f - Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ - 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 - n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI - N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f - oAc0QjgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// - h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B - twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA - kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG - WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 - 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo - dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - - - 238, 17 - - - 439, 17 - - - - R0lGODlhEAAQAIQAAJXD9Iasxm6MqnSn2lZtjVaRyEpXbYu767TX/2KZztvr/4Gy5KrT/3ut32+gzlFh - e+r0/0RNX9/u/9Ln+8Xg//n8/4e36CkxQz9GVkSCvKjL35/N/Je91K7T5bDS4////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQAAAAAACwAAAAAEAAQAAAIuQA/CBxIsKDACRwScggQwIGAhwIICBDYQcEEgwg+bNjw - QKCHCQgkQBgpQcKBCg0AEBCoAaRIkhIsVBigUiAHCgwkKNjJU8GAAx0/3NwIAMABCwsaDHCwIGgAChuK - HjiQdMDSAQYEPpWKtKqDBA6yfgiAwGhXpUsTJIgg0AGCo0nRfi1QgO0HAQyQNpCrtkAGDAIFbKi69GsC - un8FEohqdEFavxkyXAhMoPKDBwYMRIiAAcOFoAZDCwwIADs= - - - - - R0lGODlhEAAQAIQfAJfL/OTs9HWVsW6aUqnT+6bnZldwkYiux7TZ/O3z+UlVa/P2+ZfTW36wWJDLV4m7 - 69nn78bi/qjL3qDP+VJhe4rAVa7S40NLXJ3bYJrA1ikxQz5FVdDU22OPRf///////yH/C05FVFNDQVBF - Mi4wAwEBAAAh+QQBAAAfACwAAAAAEAAQAAAIwQA9CBxIcOCHgx4gWLAgIUOGAwcESBTgAaEFCAEGaBwQ - IGOABwYqerCQsYBJBho7JHgAUqCEDjAxYGBQgYHKBAsoCMzQIUIEmA6CdkCAIOfOBT5/MnBQYSgBozCj - SoVJ4KkCDx1MFhhKFEFVAhMCXM1aAANMoh2qTgh7AWvZmQ6igp0AIEDbDg0aLA06YC4AABA2eBjgYcHG - vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw== - - - - 507, 17 - - - - AAEAAAD/////AQAAAAAAAAAEAQAAACZTeXN0ZW0uR2xvYmFsaXphdGlvbi5HcmVnb3JpYW5DYWxlbmRh - cgYAAAAGbV90eXBlEW1fY3VycmVudEVyYVZhbHVlD3R3b0RpZ2l0WWVhck1heBpDYWxlbmRhcittX2N1 - cnJlbnRFcmFWYWx1ZRVDYWxlbmRhcittX2lzUmVhZE9ubHkYQ2FsZW5kYXIrdHdvRGlnaXRZZWFyTWF4 - AwAAAAAAK1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMICAgBCAT+//// - K1N5c3RlbS5HbG9iYWxpemF0aW9uLkdyZWdvcmlhbkNhbGVuZGFyVHlwZXMBAAAAB3ZhbHVlX18ACAEA - AAD/////7QcAAP////8A7QcAAAs= - - - - 82 - - \ No newline at end of file diff --git a/SubProject/FCOMMON/Auth.cs b/SubProject/FCOMMON/Auth.cs index 2317352..f8885dd 100644 --- a/SubProject/FCOMMON/Auth.cs +++ b/SubProject/FCOMMON/Auth.cs @@ -8,19 +8,18 @@ namespace FCOMMON { public static partial class DBM { - - public enum eAutoType + public enum eAuthType { purchase, holyday, project, jobreport, } - public static int getAuth(eAutoType type, string uid) + public static int getAuth(eAuthType type, string uid) { return getAuth(type.ToString(), uid); } - public static int getAuth(eAutoType type) + public static int getAuth(eAuthType type) { return getAuth(type.ToString(), info.Login.no); } diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 901fa7b..467b7bb 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -374,7 +374,7 @@ namespace FCOMMON string sql = "select [id],[name],concat([name],'(',[id],')') as dispName,[dept],[email],[level],[tel] "+ " from Users " + - " where [id] <> 'dev' and dept like '%"+ FCOMMON.info.Login.dept.Replace("'","''") +"%' order by [name]"; + " where gcode='"+ FCOMMON.info.Login.gcode+"' and [id] <> 'dev' and dept like '%"+ FCOMMON.info.Login.dept.Replace("'","''") +"%' order by [name]"; var cmd = new SqlCommand(sql, cn); var da = new SqlDataAdapter(sql, cn); var ds = new System.Data.DataSet(); @@ -527,7 +527,8 @@ namespace FCOMMON var cn = getCn(); cn.Open(); var sql = "select isnull({1},''),isnull({2},'')" + - " from {0} where gcode = '" + FCOMMON.info.Login.gcode + "' "; + " from {0} "+ + " where gcode = '" + FCOMMON.info.Login.gcode + "' "; if (where != "") sql += " and " + where; if (order != "") sql += " order by " + order; sql = string.Format(sql,table, col1, col2); @@ -642,7 +643,8 @@ namespace FCOMMON int retval = -1; var cmd2 = new SqlCommand("", cn); - cmd2.CommandText = "select count(*) from Items where name ='" + pumname + "'"; + cmd2.CommandText = string.Format( "select count(*) from Items " + + " where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'",pumname.Trim().Replace("'","''") + model.Trim().Replace("'","''")); var cnt = int.Parse(cmd2.ExecuteScalar().ToString()); if (cnt == 0) { @@ -658,8 +660,6 @@ namespace FCOMMON cmd2.CommandText = "insert into items(gcode,cate,name,sid,model,scale,unit,supply,supplyidx,price,image,wuid,wdate)" + "values(@gcode,@cate,@name,@sid,@model,@scale,@unit,@supply,@supplyidx,@price,@image,@wuid,@wdate)"; } - - cmd2.Parameters.Clear(); cmd2.Parameters.Add(new SqlParameter("gcode", FCOMMON.info.Login.gcode)); @@ -684,13 +684,37 @@ namespace FCOMMON } else retval = -1; } - + else + { + cmd2.CommandText = string.Format("select idx from Items where ISNULL(REPLACE(name, ' ', '') + REPLACE(model, ' ', ''), '') = '{0}'", pumname.Trim().Replace("'", "''") + model.Trim().Replace("'", "''")); + retval = int.Parse(cmd2.ExecuteScalar().ToString()); + } cmd2.Dispose(); cn.Close(); cn.Dispose(); return retval; } + public static Boolean UpdateItemSID(int itemIdx,string sid) + { + var cn = getCn(); + cn.Open(); + + int retval = 0; + var cmd2 = new SqlCommand("", cn); + + cmd2.CommandText = string.Format("update Items set sid=@sid where idx=@idx"); + + cmd2.Parameters.Clear(); + cmd2.Parameters.Add(new SqlParameter("idx", itemIdx)); + cmd2.Parameters.Add(new SqlParameter("sid", sid)); + retval = cmd2.ExecuteNonQuery(); + cmd2.Dispose(); + cn.Close(); + cn.Dispose(); + return retval != 0; + } + public static List getGroupList(string GroupColumn, string table, string where = "",Boolean desc=false,Boolean useColumncover=true) { List retval = new List(); diff --git a/SubProject/FCOMMON/Info.cs b/SubProject/FCOMMON/Info.cs index 1c3d38b..2dc0993 100644 --- a/SubProject/FCOMMON/Info.cs +++ b/SubProject/FCOMMON/Info.cs @@ -25,6 +25,7 @@ namespace FCOMMON menu_jago, menu_equipment, menu_workday, + purchase_adv, } public static class info diff --git a/SubProject/FCOMMON/fBase.cs b/SubProject/FCOMMON/fBase.cs index 22aa4dc..2203518 100644 --- a/SubProject/FCOMMON/fBase.cs +++ b/SubProject/FCOMMON/fBase.cs @@ -41,6 +41,7 @@ namespace FCOMMON { var form = this as Form; FCOMMON.Util.SetFormStatus(ref form, this.Name, true); + } } } diff --git a/SubProject/FCOMMON/fFTPExplorer.cs b/SubProject/FCOMMON/fFTPExplorer.cs index 6955152..9800175 100644 --- a/SubProject/FCOMMON/fFTPExplorer.cs +++ b/SubProject/FCOMMON/fFTPExplorer.cs @@ -13,7 +13,7 @@ namespace FCOMMON { string homePath = string.Empty; string curPath = string.Empty; - arUtil.FTPClient ftp; + arUtil.FTPClient.FTPClient ftp; string fn = "ftpExplorer.ini"; public fFTPExplorer(string title,string path,string ip,string id,string pw,int port=21,Boolean passvie=true) { @@ -29,7 +29,7 @@ namespace FCOMMON btQuery.PerformClick(); }; this.FormClosed += __Closed; - ftp = new arUtil.FTPClient(ip, id, pw, port, passvie); + ftp = new arUtil.FTPClient.FTPClient(ip, id, pw, port, passvie); curPath = path; homePath = path; @@ -110,7 +110,7 @@ namespace FCOMMON { System.IO.FileInfo fi = new System.IO.FileInfo(fileName); string remote = tbpath.Text + "/" + fi.Name; - ftp.upload(remote, fi.FullName); + ftp.Upload(remote, fi.FullName); } btQuery.PerformClick(); } @@ -179,7 +179,7 @@ namespace FCOMMON lv.SubItems.Add(item.FileType.ToString()); lv.SubItems.Add(item.Size.ToString()); lv.SubItems.Add(item.FileDateTime.ToString()); - if (item.FileType == arUtil.FTPfileInfo.DirectoryEntryTypes.Directory) lv.ForeColor = Color.Blue; + if (item.FileType == arUtil.FTPClient.FTPfileInfo.DirectoryEntryTypes.Directory) lv.ForeColor = Color.Blue; } } @@ -195,7 +195,7 @@ namespace FCOMMON //이파일을 현재 위치에 업로드 한다. System.IO.FileInfo fi = new System.IO.FileInfo(od.FileName); string newfile = ftp.PathFileCombine(curPath, fi.Name); - if (!ftp.upload(newfile, od.FileName)) + if (!ftp.Upload(newfile, od.FileName)) Util.MsgE("upload error"); search(curPath); } @@ -218,10 +218,9 @@ namespace FCOMMON System.IO.FileInfo fi = new System.IO.FileInfo(od.FileName); string newfile = ftp.PathFileCombine(curPath, fi.Name); - if (!ftp.download(remotefile,od.FileName)) + if (!ftp.Download(remotefile,od.FileName)) Util.MsgE("Download error"); search(curPath); } - } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs index 4e01cbc..8f45c93 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.Designer.cs @@ -30,30 +30,30 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fPurchase)); - FarPoint.Win.Spread.CellType.TextCellType textCellType73 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType74 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType75 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType76 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType77 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType78 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType79 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType80 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType81 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType82 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType83 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType22 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType84 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType23 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType85 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType24 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType86 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType25 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType87 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType88 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType89 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType90 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType5 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.CheckBoxCellType checkBoxCellType1 = new FarPoint.Win.Spread.CellType.CheckBoxCellType(); this.dsPurchase = new FEQ0000.dsPurchase(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FEQ0000.dsPurchaseTableAdapters.PurchaseTableAdapter(); @@ -93,6 +93,10 @@ this.ㅕCustomDataCopyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripSeparator(); + this.추가ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.makeRepeatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.편집ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); + this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip1 = new System.Windows.Forms.ToolStrip(); this.cmDate = new System.Windows.Forms.ToolStripComboBox(); this.dtSD = new System.Windows.Forms.ToolStripTextBox(); @@ -111,13 +115,10 @@ this.금일입고품목ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.내가등록한자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.이번달자료ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); this.btViewDel = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); - this.makeRepeatToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.편집ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.추가ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -380,7 +381,7 @@ this.편집ToolStripMenuItem1, this.삭제ToolStripMenuItem}); this.cm1.Name = "contextMenuStrip1"; - this.cm1.Size = new System.Drawing.Size(317, 332); + this.cm1.Size = new System.Drawing.Size(317, 310); // // columnSizeToolStripMenuItem // @@ -457,9 +458,37 @@ this.toolStripMenuItem4.Name = "toolStripMenuItem4"; this.toolStripMenuItem4.Size = new System.Drawing.Size(313, 6); // + // 추가ToolStripMenuItem + // + this.추가ToolStripMenuItem.Name = "추가ToolStripMenuItem"; + this.추가ToolStripMenuItem.Size = new System.Drawing.Size(316, 42); + this.추가ToolStripMenuItem.Text = "추가"; + this.추가ToolStripMenuItem.Click += new System.EventHandler(this.추가ToolStripMenuItem_Click); + // + // makeRepeatToolStripMenuItem + // + this.makeRepeatToolStripMenuItem.Name = "makeRepeatToolStripMenuItem"; + this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(316, 42); + this.makeRepeatToolStripMenuItem.Text = "복사"; + this.makeRepeatToolStripMenuItem.Click += new System.EventHandler(this.makeRepeatToolStripMenuItem_Click); + // + // 편집ToolStripMenuItem1 + // + this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; + this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(316, 42); + this.편집ToolStripMenuItem1.Text = "편집"; + this.편집ToolStripMenuItem1.Click += new System.EventHandler(this.편집ToolStripMenuItem1_Click); + // + // 삭제ToolStripMenuItem + // + this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; + this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(316, 42); + this.삭제ToolStripMenuItem.Text = "삭제"; + this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); + // // toolStrip1 // - this.toolStrip1.ImageScalingSize = new System.Drawing.Size(24, 24); + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.cmDate, this.dtSD, @@ -475,10 +504,11 @@ this.btSearch, this.toolStripSeparator5, this.toolStripDropDownButton1, + this.toolStripButton2, this.btViewDel}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1074, 31); + this.toolStrip1.Size = new System.Drawing.Size(1074, 37); this.toolStrip1.TabIndex = 3; this.toolStrip1.Text = "toolStrip1"; // @@ -490,20 +520,20 @@ "입고일", "입고예정일"}); this.cmDate.Name = "cmDate"; - this.cmDate.Size = new System.Drawing.Size(75, 31); + this.cmDate.Size = new System.Drawing.Size(75, 37); // // dtSD // this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.dtSD.Name = "dtSD"; - this.dtSD.Size = new System.Drawing.Size(90, 31); + this.dtSD.Size = new System.Drawing.Size(90, 37); this.dtSD.Text = "1982-11-23"; this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // lbEnd // this.lbEnd.Name = "lbEnd"; - this.lbEnd.Size = new System.Drawing.Size(15, 28); + this.lbEnd.Size = new System.Drawing.Size(15, 34); this.lbEnd.Text = "~"; this.lbEnd.Click += new System.EventHandler(this.lbEnd_Click); // @@ -511,36 +541,36 @@ // this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.dtED.Name = "dtED"; - this.dtED.Size = new System.Drawing.Size(90, 31); + this.dtED.Size = new System.Drawing.Size(90, 37); this.dtED.Text = "1982-11-23"; this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 31); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); // // toolStripLabel1 // this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(31, 28); + this.toolStripLabel1.Size = new System.Drawing.Size(31, 34); this.toolStripLabel1.Text = "상태"; // // cmbState // this.cmbState.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbState.Name = "cmbState"; - this.cmbState.Size = new System.Drawing.Size(90, 31); + this.cmbState.Size = new System.Drawing.Size(90, 37); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(6, 31); + this.toolStripSeparator3.Size = new System.Drawing.Size(6, 37); // // toolStripLabel3 // this.toolStripLabel3.Name = "toolStripLabel3"; - this.toolStripLabel3.Size = new System.Drawing.Size(43, 28); + this.toolStripLabel3.Size = new System.Drawing.Size(43, 34); this.toolStripLabel3.Text = "사용자"; this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); // @@ -548,28 +578,28 @@ // this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.tbRequest.Name = "tbRequest"; - this.tbRequest.Size = new System.Drawing.Size(70, 31); + this.tbRequest.Size = new System.Drawing.Size(70, 37); this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(6, 31); + this.toolStripSeparator4.Size = new System.Drawing.Size(6, 37); // // btSearch // this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; this.btSearch.Name = "btSearch"; - this.btSearch.Size = new System.Drawing.Size(74, 28); + this.btSearch.Size = new System.Drawing.Size(80, 34); this.btSearch.Text = "조회(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(6, 31); + this.toolStripSeparator5.Size = new System.Drawing.Size(6, 37); // // toolStripDropDownButton1 // @@ -580,7 +610,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(110, 28); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(116, 34); this.toolStripDropDownButton1.Text = "Quick Menu"; // // 금일입고품목ToolStripMenuItem @@ -604,6 +634,16 @@ this.이번달자료ToolStripMenuItem.Text = "이번달 자료"; this.이번달자료ToolStripMenuItem.Click += new System.EventHandler(this.이번달자료ToolStripMenuItem_Click); // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + 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(65, 34); + this.toolStripButton2.Text = "닫기"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1); + // // btViewDel // this.btViewDel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -611,7 +651,7 @@ this.btViewDel.Image = ((System.Drawing.Image)(resources.GetObject("btViewDel.Image"))); this.btViewDel.ImageTransparentColor = System.Drawing.Color.Magenta; this.btViewDel.Name = "btViewDel"; - this.btViewDel.Size = new System.Drawing.Size(107, 28); + this.btViewDel.Size = new System.Drawing.Size(113, 34); this.btViewDel.Text = "삭제자료표시"; this.btViewDel.Click += new System.EventHandler(this.btViewDel_Click); // @@ -622,11 +662,11 @@ this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.EditModeReplace = true; this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); - this.fpSpread1.Location = new System.Drawing.Point(0, 31); + this.fpSpread1.Location = new System.Drawing.Point(0, 37); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1074, 608); + this.fpSpread1.Size = new System.Drawing.Size(1074, 602); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 4; // @@ -670,7 +710,7 @@ this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 37F; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(0).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType73; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(0).Label = "등록일"; @@ -678,7 +718,7 @@ this.fpSpread1_Sheet1.Columns.Get(0).Width = 82F; this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType74; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "state"; this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Label = "상태"; @@ -686,155 +726,155 @@ this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(1).Width = 66F; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType75; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Label = "공정"; this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(2).Width = 67F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType76; - this.fpSpread1_Sheet1.Columns.Get(3).DataField = "request"; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4; + this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestName"; this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 48F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType77; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "sc"; this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Label = "SC#"; this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(4).Width = 27F; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType78; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "orderno"; this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Label = "CR/CF#"; this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(5).Width = 44F; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType79; - this.fpSpread1_Sheet1.Columns.Get(6).DataField = "receive"; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7; + this.fpSpread1_Sheet1.Columns.Get(6).DataField = "receiveName"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "수령"; this.fpSpread1_Sheet1.Columns.Get(6).Width = 46F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoSort = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType80; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "sid"; this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Label = "SID#"; this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(7).Width = 55F; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType81; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pumname"; this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(8).Label = "품명"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 33F; this.fpSpread1_Sheet1.Columns.Get(9).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType21.DecimalPlaces = 0; - numberCellType21.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType21.MaximumValue = 2147483647D; - numberCellType21.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType21; + numberCellType1.DecimalPlaces = 0; + numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType1.MaximumValue = 2147483647D; + numberCellType1.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType1; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pumidx"; this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(9).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType82; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "pumscale"; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(10).Label = "규격"; this.fpSpread1_Sheet1.Columns.Get(10).Width = 43F; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType83; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "dept"; this.fpSpread1_Sheet1.Columns.Get(11).Label = "장비\r\n제조사"; - this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType83; + this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(12).DataField = "manuproc"; this.fpSpread1_Sheet1.Columns.Get(12).Label = "제조\r\n공정"; - this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType83; + this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(13).DataField = "asset"; this.fpSpread1_Sheet1.Columns.Get(13).Label = "장비\r\n모델"; - numberCellType22.DecimalPlaces = 0; - numberCellType22.NegativeRed = true; - numberCellType22.NullDisplay = "--"; - numberCellType22.Separator = ","; - numberCellType22.ShowSeparator = true; - numberCellType22.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType22; + numberCellType2.DecimalPlaces = 0; + numberCellType2.NegativeRed = true; + numberCellType2.NullDisplay = "--"; + numberCellType2.Separator = ","; + numberCellType2.ShowSeparator = true; + numberCellType2.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2; this.fpSpread1_Sheet1.Columns.Get(14).DataField = "pumqty"; this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(14).Label = "수량"; this.fpSpread1_Sheet1.Columns.Get(14).Width = 44F; - this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType84; + this.fpSpread1_Sheet1.Columns.Get(15).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(15).DataField = "pumunit"; this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(15).Label = "단위"; this.fpSpread1_Sheet1.Columns.Get(15).Width = 46F; - numberCellType23.DecimalPlaces = 0; - numberCellType23.NegativeRed = true; - numberCellType23.NullDisplay = "--"; - numberCellType23.Separator = ","; - numberCellType23.ShowSeparator = true; - numberCellType23.ShrinkToFit = true; - this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType23; + numberCellType3.DecimalPlaces = 0; + numberCellType3.NegativeRed = true; + numberCellType3.NullDisplay = "--"; + numberCellType3.Separator = ","; + numberCellType3.ShowSeparator = true; + numberCellType3.ShrinkToFit = true; + this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(16).DataField = "pumprice"; this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(16).Label = "단가"; this.fpSpread1_Sheet1.Columns.Get(16).Width = 35F; - this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType23; + this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType3; this.fpSpread1_Sheet1.Columns.Get(17).DataField = "pumamt"; this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right; this.fpSpread1_Sheet1.Columns.Get(17).Label = "합계금액"; this.fpSpread1_Sheet1.Columns.Get(17).Width = 32F; this.fpSpread1_Sheet1.Columns.Get(18).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType85; + this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(18).DataField = "supply"; this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(18).Label = "공급업체"; this.fpSpread1_Sheet1.Columns.Get(18).Width = 46F; this.fpSpread1_Sheet1.Columns.Get(19).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType24.DecimalPlaces = 0; - numberCellType24.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType24.MaximumValue = 2147483647D; - numberCellType24.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType24; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(19).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(19).DataField = "supplyidx"; this.fpSpread1_Sheet1.Columns.Get(19).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(19).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(19).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType86; + this.fpSpread1_Sheet1.Columns.Get(20).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(20).DataField = "project"; this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(20).Label = "관련프로젝트"; this.fpSpread1_Sheet1.Columns.Get(20).Width = 46F; this.fpSpread1_Sheet1.Columns.Get(21).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType25.DecimalPlaces = 0; - numberCellType25.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType25.MaximumValue = 2147483647D; - numberCellType25.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType25; + numberCellType5.DecimalPlaces = 0; + numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType5.MaximumValue = 2147483647D; + numberCellType5.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(21).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(21).DataField = "projectidx"; this.fpSpread1_Sheet1.Columns.Get(21).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(21).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(21).Width = 14F; - this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType87; + this.fpSpread1_Sheet1.Columns.Get(22).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(22).DataField = "edate"; this.fpSpread1_Sheet1.Columns.Get(22).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(22).Label = "입고예정"; this.fpSpread1_Sheet1.Columns.Get(22).Width = 38F; - this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType88; + this.fpSpread1_Sheet1.Columns.Get(23).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(23).DataField = "indate"; this.fpSpread1_Sheet1.Columns.Get(23).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(23).Label = "입고일"; this.fpSpread1_Sheet1.Columns.Get(23).Width = 42F; - this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType89; + this.fpSpread1_Sheet1.Columns.Get(24).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(24).DataField = "po"; this.fpSpread1_Sheet1.Columns.Get(24).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(24).Label = "PO#"; this.fpSpread1_Sheet1.Columns.Get(24).Width = 41F; - this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType90; + this.fpSpread1_Sheet1.Columns.Get(25).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(25).DataField = "bigo"; this.fpSpread1_Sheet1.Columns.Get(25).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(25).Label = "비고"; this.fpSpread1_Sheet1.Columns.Get(25).Width = 33F; - this.fpSpread1_Sheet1.Columns.Get(26).CellType = checkBoxCellType5; + this.fpSpread1_Sheet1.Columns.Get(26).CellType = checkBoxCellType1; this.fpSpread1_Sheet1.Columns.Get(26).DataField = "isdel"; this.fpSpread1_Sheet1.Columns.Get(26).Label = "삭제됨"; this.fpSpread1_Sheet1.Columns.Get(26).Tag = "isdel"; @@ -844,34 +884,6 @@ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // - // makeRepeatToolStripMenuItem - // - this.makeRepeatToolStripMenuItem.Name = "makeRepeatToolStripMenuItem"; - this.makeRepeatToolStripMenuItem.Size = new System.Drawing.Size(316, 42); - this.makeRepeatToolStripMenuItem.Text = "복사"; - this.makeRepeatToolStripMenuItem.Click += new System.EventHandler(this.makeRepeatToolStripMenuItem_Click); - // - // 편집ToolStripMenuItem1 - // - this.편집ToolStripMenuItem1.Name = "편집ToolStripMenuItem1"; - this.편집ToolStripMenuItem1.Size = new System.Drawing.Size(316, 42); - this.편집ToolStripMenuItem1.Text = "편집"; - this.편집ToolStripMenuItem1.Click += new System.EventHandler(this.편집ToolStripMenuItem1_Click); - // - // 삭제ToolStripMenuItem - // - this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem"; - this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(316, 42); - this.삭제ToolStripMenuItem.Text = "삭제"; - this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click); - // - // 추가ToolStripMenuItem - // - this.추가ToolStripMenuItem.Name = "추가ToolStripMenuItem"; - this.추가ToolStripMenuItem.Size = new System.Drawing.Size(316, 42); - this.추가ToolStripMenuItem.Text = "추가"; - this.추가ToolStripMenuItem.Click += new System.EventHandler(this.추가ToolStripMenuItem_Click); - // // fPurchase // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -882,7 +894,7 @@ this.Controls.Add(this.bn); this.DoubleBuffered = true; this.Name = "fPurchase"; - this.Text = "NR 구매 신청"; + this.Text = "구매 신청"; this.Load += new System.EventHandler(this.@__Load); ((System.ComponentModel.ISupportInitialize)(this.dsPurchase)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); @@ -956,7 +968,6 @@ private System.Windows.Forms.ToolStripMenuItem ㅕCustomDataCopyToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; private System.Windows.Forms.ToolStripSeparator toolStripMenuItem4; - private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; private System.Windows.Forms.ToolStripButton btCopy; private System.Windows.Forms.ToolStripSeparator toolStripSeparator6; private System.Windows.Forms.ToolStripDropDownButton toolStripButton1; @@ -965,5 +976,7 @@ private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1; private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 추가ToolStripMenuItem; + private System.Windows.Forms.ToolStripButton toolStripButton2; + private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1; } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index 025a7dc..ac27f0b 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -96,7 +96,7 @@ namespace FEQ0000 //this.cmbCr.SelectedIndex = 1; //일반사용자의경우에는 상태를 변경하지 못한다. - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.purchase)); + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase)); if (curLevel >= 5) { btSave.Visible = true; @@ -121,6 +121,16 @@ namespace FEQ0000 refreshData(); + //열표시여부를 설정 + var adv= FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.purchase_adv); + if(adv == false) + { + var hidecols = new string[] { "receivename", "receive","asset", "dept","manuproc","process", "cr", "orderno", "manuproc", "project", "projectidx", "edate", "po" }; + foreach(FarPoint.Win.Spread.Column col in fpSpread1_Sheet1.Columns) + { + if (hidecols.Contains(col.DataField.ToLower())) col.Visible = false; + } + } } @@ -131,17 +141,21 @@ namespace FEQ0000 { string state = "%"; if (cmbState.SelectedIndex > 0) state = cmbState.Text.Split(',')[0]; + string request = "%"; - if (tbRequest.Text.Trim() != "") request = "%" + this.tbRequest.Text.Trim() + "%"; + if (tbRequest.Text.Trim() != "") + request = "%" + tbRequest.Text.Trim() + "%";// tbRequest.Text.Substring(1, tbRequest.Text.IndexOf("]") - 1); + + string dateField = "pdate"; if (cmDate.SelectedIndex == 1) dateField = "indate"; else if (cmDate.SelectedIndex == 2) dateField = "expdate"; System.Data.SqlClient.SqlDataAdapter da = new System.Data.SqlClient.SqlDataAdapter(); System.Data.SqlClient.SqlCommand cmd = new System.Data.SqlClient.SqlCommand(); - cmd.CommandText = " select *" + + cmd.CommandText = " select *,dbo.getusername(request) as requestName,dbo.getusername(receive) as receiveName" + " from purchase " + - " where isnull(" + dateField + ",'') between @sd and @ed "; + " where gcode='"+ FCOMMON.info.Login.gcode + "' and isnull(" + dateField + ",'') between @sd and @ed "; @@ -149,7 +163,10 @@ namespace FEQ0000 cmd.CommandText += " and isnull(isdel,0) = 0"; if(tbRequest.Text.Trim() != "") - cmd.CommandText += " and (isnull(request,'') like @req or isnull(receive,'') like @req)"; + { + cmd.CommandText += " and (isnull(dbo.getusername(request),'') like @req or isnull(dbo.getusername(receive),'') like @req)"; + } + if (cmbState.SelectedIndex != 0) { @@ -318,6 +335,12 @@ namespace FEQ0000 void func_add() { var newdr = this.dsPurchase.Purchase.NewPurchaseRow(); + + if (FCOMMON.info.Login.no == "dev") + newdr.request = "395552";//string.Format("[{0}] {1}", "395552", "김치균"); + else + newdr.request = FCOMMON.info.Login.no; + repeat: fPurchase_Add f = new fPurchase_Add(newdr); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) @@ -366,7 +389,7 @@ namespace FEQ0000 var drv = bs.Current as DataRowView; if (drv == null) return; - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth( FCOMMON.DBM.eAutoType.purchase)); + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth( FCOMMON.DBM.eAuthType.purchase)); var dr = drv.Row as dsPurchase.PurchaseRow; if (dr.sc != "") { @@ -377,7 +400,7 @@ namespace FEQ0000 } } - if(dr.request != FCOMMON.info.Login.nameK) + if(dr.request != FCOMMON.info.Login.no) { if (curLevel < 5) { @@ -750,5 +773,10 @@ namespace FEQ0000 func_add(); } + private void toolStripButton2_Click_1(object sender, EventArgs e) + { + this.Close(); + } + } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase.resx b/SubProject/FEQ0000/Purchase/fPurchase.resx index e320ffd..c7465e1 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase.resx @@ -311,6 +311,16 @@ kBHypJw8OQKeD4C3u2Ww2XVDx9SAcJMmx1TKFMe7wNMOMNpSbkUO5MZbX9q5/LipXK0csMi3iphK+aH4 o8xnlLJi3IJdbKvsSg4L/MrpG8SVSzGitkGSyfQYdtNMV6YkkU3sEna+obyrS3TQ/y/lIGqEYgSRGChT wdMZXkp4+r8UxSdk1wcO0mb/TQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADlSURBVEhL7dQxCsIwFMbxnMrZWatzUXRUCo5ewSs4ewZR + DyDeQfEETsUbRL7YYNSXNC/UOiQP/kvzyE9KUcQ7y/VJtlHFvQYPjzf50xKsJsFmq81WHq538swMO9il + zhALxkWd7kAOJwsnjjPsYNeGs2B14fR5YTYq5O5c1u7sL987iAUjF+6LIjaMKJyDoiAYmVAvn8lsXHij + KBhGwDWof4APihqHqQ+OKhg2X3U/n7+9ah88CKY+pM9ndTgbplDbmQtnwS7UtmPDWfDf/jIRLnKhOuzY + UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs index 4fa2705..bf8cc8e 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.Designer.cs @@ -33,13 +33,10 @@ System.Windows.Forms.Label receiveLabel; System.Windows.Forms.Label scLabel; System.Windows.Forms.Label sidLabel; - System.Windows.Forms.Label pumnameLabel; System.Windows.Forms.Label pumscaleLabel; System.Windows.Forms.Label pumqtyLabel; System.Windows.Forms.Label pumpriceLabel; System.Windows.Forms.Label pumamtLabel; - System.Windows.Forms.Label supplyLabel; - System.Windows.Forms.Label projectLabel; System.Windows.Forms.Label assetLabel; System.Windows.Forms.Label poLabel; System.Windows.Forms.Label deptLabel; @@ -47,6 +44,8 @@ System.Windows.Forms.Label label2; System.Windows.Forms.Label label4; System.Windows.Forms.Label label5; + System.Windows.Forms.Label label3; + System.Windows.Forms.Label label6; this.tbSC = new System.Windows.Forms.TextBox(); this.tbSID = new System.Windows.Forms.TextBox(); this.tbPumName = new System.Windows.Forms.TextBox(); @@ -73,9 +72,11 @@ this.chkInDate = new System.Windows.Forms.CheckBox(); this.dtExpDate = new System.Windows.Forms.DateTimePicker(); this.chkExp = new System.Windows.Forms.CheckBox(); - this.label3 = new System.Windows.Forms.Label(); this.btSaveAdd = new System.Windows.Forms.Button(); this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.linkLabel7 = new System.Windows.Forms.LinkLabel(); + this.linkLabel6 = new System.Windows.Forms.LinkLabel(); + this.linkLabel5 = new System.Windows.Forms.LinkLabel(); this.linkLabel1 = new System.Windows.Forms.LinkLabel(); this.groupBox2 = new System.Windows.Forms.GroupBox(); this.tbOrderNo = new System.Windows.Forms.TextBox(); @@ -94,13 +95,10 @@ receiveLabel = new System.Windows.Forms.Label(); scLabel = new System.Windows.Forms.Label(); sidLabel = new System.Windows.Forms.Label(); - pumnameLabel = new System.Windows.Forms.Label(); pumscaleLabel = new System.Windows.Forms.Label(); pumqtyLabel = new System.Windows.Forms.Label(); pumpriceLabel = new System.Windows.Forms.Label(); pumamtLabel = new System.Windows.Forms.Label(); - supplyLabel = new System.Windows.Forms.Label(); - projectLabel = new System.Windows.Forms.Label(); assetLabel = new System.Windows.Forms.Label(); poLabel = new System.Windows.Forms.Label(); deptLabel = new System.Windows.Forms.Label(); @@ -108,6 +106,8 @@ label2 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label(); label5 = new System.Windows.Forms.Label(); + label3 = new System.Windows.Forms.Label(); + label6 = new System.Windows.Forms.Label(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); @@ -122,7 +122,7 @@ processLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); processLabel.Name = "processLabel"; processLabel.Size = new System.Drawing.Size(39, 20); - processLabel.TabIndex = 4; + processLabel.TabIndex = 6; processLabel.Text = "공정"; // // receiveLabel @@ -132,7 +132,7 @@ receiveLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); receiveLabel.Name = "receiveLabel"; receiveLabel.Size = new System.Drawing.Size(54, 20); - receiveLabel.TabIndex = 2; + receiveLabel.TabIndex = 4; receiveLabel.Text = "수령인"; // // scLabel @@ -142,38 +142,28 @@ scLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); scLabel.Name = "scLabel"; scLabel.Size = new System.Drawing.Size(27, 20); - scLabel.TabIndex = 6; + scLabel.TabIndex = 8; scLabel.Text = "SC"; // // sidLabel // sidLabel.AutoSize = true; - sidLabel.Location = new System.Drawing.Point(54, 68); + sidLabel.Location = new System.Drawing.Point(288, 210); sidLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); sidLabel.Name = "sidLabel"; sidLabel.Size = new System.Drawing.Size(32, 20); - sidLabel.TabIndex = 3; + sidLabel.TabIndex = 19; sidLabel.Text = "SID"; // - // pumnameLabel - // - pumnameLabel.AutoSize = true; - pumnameLabel.Location = new System.Drawing.Point(47, 105); - pumnameLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - pumnameLabel.Name = "pumnameLabel"; - pumnameLabel.Size = new System.Drawing.Size(39, 20); - pumnameLabel.TabIndex = 5; - pumnameLabel.Text = "품명"; - // // pumscaleLabel // pumscaleLabel.AutoSize = true; - pumscaleLabel.Location = new System.Drawing.Point(47, 142); + pumscaleLabel.Location = new System.Drawing.Point(10, 142); pumscaleLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumscaleLabel.Name = "pumscaleLabel"; - pumscaleLabel.Size = new System.Drawing.Size(39, 20); - pumscaleLabel.TabIndex = 8; - pumscaleLabel.Text = "규격"; + pumscaleLabel.Size = new System.Drawing.Size(75, 20); + pumscaleLabel.TabIndex = 9; + pumscaleLabel.Text = "모델/규격"; // // pumqtyLabel // @@ -182,7 +172,7 @@ pumqtyLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumqtyLabel.Name = "pumqtyLabel"; pumqtyLabel.Size = new System.Drawing.Size(39, 20); - pumqtyLabel.TabIndex = 11; + pumqtyLabel.TabIndex = 12; pumqtyLabel.Text = "수량"; // // pumpriceLabel @@ -192,7 +182,7 @@ pumpriceLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumpriceLabel.Name = "pumpriceLabel"; pumpriceLabel.Size = new System.Drawing.Size(39, 20); - pumpriceLabel.TabIndex = 13; + pumpriceLabel.TabIndex = 15; pumpriceLabel.Text = "단가"; // // pumamtLabel @@ -202,29 +192,9 @@ pumamtLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); pumamtLabel.Name = "pumamtLabel"; pumamtLabel.Size = new System.Drawing.Size(39, 20); - pumamtLabel.TabIndex = 15; + pumamtLabel.TabIndex = 17; pumamtLabel.Text = "합계"; // - // supplyLabel - // - supplyLabel.AutoSize = true; - supplyLabel.Location = new System.Drawing.Point(32, 251); - supplyLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - supplyLabel.Name = "supplyLabel"; - supplyLabel.Size = new System.Drawing.Size(54, 20); - supplyLabel.TabIndex = 17; - supplyLabel.Text = "공급처"; - // - // projectLabel - // - projectLabel.AutoSize = true; - projectLabel.Location = new System.Drawing.Point(17, 287); - projectLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - projectLabel.Name = "projectLabel"; - projectLabel.Size = new System.Drawing.Size(69, 20); - projectLabel.TabIndex = 20; - projectLabel.Text = "프로젝트"; - // // assetLabel // assetLabel.AutoSize = true; @@ -232,7 +202,7 @@ assetLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); assetLabel.Name = "assetLabel"; assetLabel.Size = new System.Drawing.Size(69, 20); - assetLabel.TabIndex = 10; + assetLabel.TabIndex = 18; assetLabel.Text = "장비모델"; // // poLabel @@ -242,7 +212,7 @@ poLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); poLabel.Name = "poLabel"; poLabel.Size = new System.Drawing.Size(30, 20); - poLabel.TabIndex = 8; + poLabel.TabIndex = 10; poLabel.Text = "PO"; // // deptLabel @@ -252,7 +222,7 @@ deptLabel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); deptLabel.Name = "deptLabel"; deptLabel.Size = new System.Drawing.Size(39, 20); - deptLabel.TabIndex = 26; + deptLabel.TabIndex = 27; deptLabel.Text = "비고"; // // label1 @@ -272,7 +242,7 @@ label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label2.Name = "label2"; label2.Size = new System.Drawing.Size(84, 20); - label2.TabIndex = 12; + label2.TabIndex = 16; label2.Text = "장비제조사"; // // label4 @@ -282,7 +252,7 @@ label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label4.Name = "label4"; label4.Size = new System.Drawing.Size(69, 20); - label4.TabIndex = 18; + label4.TabIndex = 14; label4.Text = "제조공정"; // // label5 @@ -292,25 +262,45 @@ label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); label5.Name = "label5"; label5.Size = new System.Drawing.Size(60, 20); - label5.TabIndex = 20; + label5.TabIndex = 12; label5.Text = "CR/CF#"; // + // label3 + // + label3.AutoSize = true; + label3.Location = new System.Drawing.Point(46, 69); + label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label3.Name = "label3"; + label3.Size = new System.Drawing.Size(39, 20); + label3.TabIndex = 2; + label3.Text = "요청"; + // + // label6 + // + label6.AutoSize = true; + label6.Location = new System.Drawing.Point(280, 69); + label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + label6.Name = "label6"; + label6.Size = new System.Drawing.Size(39, 20); + label6.TabIndex = 4; + label6.Text = "상태"; + // // tbSC // this.tbSC.Location = new System.Drawing.Point(104, 156); this.tbSC.Margin = new System.Windows.Forms.Padding(4); this.tbSC.Name = "tbSC"; this.tbSC.Size = new System.Drawing.Size(286, 27); - this.tbSC.TabIndex = 7; + this.tbSC.TabIndex = 9; // // tbSID // this.tbSID.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(192)))), ((int)(((byte)(255))))); - this.tbSID.Location = new System.Drawing.Point(93, 66); + this.tbSID.Location = new System.Drawing.Point(327, 208); this.tbSID.Margin = new System.Windows.Forms.Padding(4); this.tbSID.Name = "tbSID"; - this.tbSID.Size = new System.Drawing.Size(238, 27); - this.tbSID.TabIndex = 0; + this.tbSID.Size = new System.Drawing.Size(148, 27); + this.tbSID.TabIndex = 20; // // tbPumName // @@ -320,7 +310,7 @@ this.tbPumName.Margin = new System.Windows.Forms.Padding(4); this.tbPumName.Name = "tbPumName"; this.tbPumName.Size = new System.Drawing.Size(311, 27); - this.tbPumName.TabIndex = 1; + this.tbPumName.TabIndex = 7; // // tbPumModel // @@ -330,7 +320,7 @@ this.tbPumModel.Margin = new System.Windows.Forms.Padding(4); this.tbPumModel.Name = "tbPumModel"; this.tbPumModel.Size = new System.Drawing.Size(311, 27); - this.tbPumModel.TabIndex = 2; + this.tbPumModel.TabIndex = 10; // // tbPumUnit // @@ -339,7 +329,7 @@ this.tbPumUnit.Margin = new System.Windows.Forms.Padding(4); this.tbPumUnit.Name = "tbPumUnit"; this.tbPumUnit.Size = new System.Drawing.Size(64, 27); - this.tbPumUnit.TabIndex = 10; + this.tbPumUnit.TabIndex = 11; this.tbPumUnit.TabStop = false; this.tbPumUnit.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.toolTip1.SetToolTip(this.tbPumUnit, "단위"); @@ -351,7 +341,7 @@ this.tbPumQty.Margin = new System.Windows.Forms.Padding(4); this.tbPumQty.Name = "tbPumQty"; this.tbPumQty.Size = new System.Drawing.Size(111, 27); - this.tbPumQty.TabIndex = 3; + this.tbPumQty.TabIndex = 13; this.tbPumQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.tbPumQty.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); // @@ -361,7 +351,7 @@ this.tbPumPrice.Margin = new System.Windows.Forms.Padding(4); this.tbPumPrice.Name = "tbPumPrice"; this.tbPumPrice.Size = new System.Drawing.Size(148, 27); - this.tbPumPrice.TabIndex = 4; + this.tbPumPrice.TabIndex = 16; this.tbPumPrice.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; this.tbPumPrice.TextChanged += new System.EventHandler(this.tbPumQty_TextChanged); // @@ -371,8 +361,8 @@ this.tbPumAmt.Margin = new System.Windows.Forms.Padding(4); this.tbPumAmt.Name = "tbPumAmt"; this.tbPumAmt.ReadOnly = true; - this.tbPumAmt.Size = new System.Drawing.Size(382, 27); - this.tbPumAmt.TabIndex = 5; + this.tbPumAmt.Size = new System.Drawing.Size(179, 27); + this.tbPumAmt.TabIndex = 18; this.tbPumAmt.TabStop = false; this.tbPumAmt.TextAlign = System.Windows.Forms.HorizontalAlignment.Right; // @@ -383,7 +373,7 @@ this.tbSupply.Margin = new System.Windows.Forms.Padding(4); this.tbSupply.Name = "tbSupply"; this.tbSupply.Size = new System.Drawing.Size(311, 27); - this.tbSupply.TabIndex = 6; + this.tbSupply.TabIndex = 22; // // tbSupplyIndex // @@ -392,20 +382,20 @@ this.tbSupplyIndex.Name = "tbSupplyIndex"; this.tbSupplyIndex.ReadOnly = true; this.tbSupplyIndex.Size = new System.Drawing.Size(64, 27); - this.tbSupplyIndex.TabIndex = 19; + this.tbSupplyIndex.TabIndex = 23; this.tbSupplyIndex.TabStop = false; this.tbSupplyIndex.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.toolTip1.SetToolTip(this.tbSupplyIndex, "Database ID"); // // tbProject // - this.tbProject.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + this.tbProject.BackColor = System.Drawing.SystemColors.Window; this.tbProject.ImeMode = System.Windows.Forms.ImeMode.Hangul; this.tbProject.Location = new System.Drawing.Point(93, 285); this.tbProject.Margin = new System.Windows.Forms.Padding(4); this.tbProject.Name = "tbProject"; this.tbProject.Size = new System.Drawing.Size(311, 27); - this.tbProject.TabIndex = 7; + this.tbProject.TabIndex = 25; // // tbProjectIndex // @@ -414,7 +404,7 @@ this.tbProjectIndex.Name = "tbProjectIndex"; this.tbProjectIndex.ReadOnly = true; this.tbProjectIndex.Size = new System.Drawing.Size(64, 27); - this.tbProjectIndex.TabIndex = 22; + this.tbProjectIndex.TabIndex = 26; this.tbProjectIndex.TabStop = false; this.tbProjectIndex.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.toolTip1.SetToolTip(this.tbProjectIndex, "Database ID"); @@ -425,7 +415,7 @@ this.tbPO.Margin = new System.Windows.Forms.Padding(4); this.tbPO.Name = "tbPO"; this.tbPO.Size = new System.Drawing.Size(286, 27); - this.tbPO.TabIndex = 9; + this.tbPO.TabIndex = 11; // // tbBigo // @@ -435,8 +425,8 @@ this.tbBigo.MaxLength = 500; this.tbBigo.Multiline = true; this.tbBigo.Name = "tbBigo"; - this.tbBigo.Size = new System.Drawing.Size(381, 165); - this.tbBigo.TabIndex = 8; + this.tbBigo.Size = new System.Drawing.Size(381, 188); + this.tbBigo.TabIndex = 28; this.tbBigo.TabStop = false; // // dtPdate @@ -444,16 +434,16 @@ this.dtPdate.Location = new System.Drawing.Point(93, 29); this.dtPdate.Margin = new System.Windows.Forms.Padding(4); this.dtPdate.Name = "dtPdate"; - this.dtPdate.Size = new System.Drawing.Size(238, 27); + this.dtPdate.Size = new System.Drawing.Size(381, 27); this.dtPdate.TabIndex = 1; // // btSave // - this.btSave.Location = new System.Drawing.Point(11, 562); + this.btSave.Location = new System.Drawing.Point(11, 531); this.btSave.Margin = new System.Windows.Forms.Padding(4); this.btSave.Name = "btSave"; - this.btSave.Size = new System.Drawing.Size(492, 51); - this.btSave.TabIndex = 0; + this.btSave.Size = new System.Drawing.Size(490, 49); + this.btSave.TabIndex = 1; this.btSave.Text = "저장(&S)"; this.btSave.UseVisualStyleBackColor = true; this.btSave.Click += new System.EventHandler(this.button1_Click); @@ -462,11 +452,11 @@ // this.cmbState.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); this.cmbState.FormattingEnabled = true; - this.cmbState.Location = new System.Drawing.Point(336, 65); + this.cmbState.Location = new System.Drawing.Point(327, 66); this.cmbState.Margin = new System.Windows.Forms.Padding(4); this.cmbState.Name = "cmbState"; - this.cmbState.Size = new System.Drawing.Size(139, 28); - this.cmbState.TabIndex = 1; + this.cmbState.Size = new System.Drawing.Size(148, 28); + this.cmbState.TabIndex = 5; this.cmbState.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged); // // cbProcess @@ -480,31 +470,33 @@ this.cbProcess.Margin = new System.Windows.Forms.Padding(4); this.cbProcess.Name = "cbProcess"; this.cbProcess.Size = new System.Drawing.Size(286, 28); - this.cbProcess.TabIndex = 5; + this.cbProcess.TabIndex = 7; // // cmbRequest // this.cmbRequest.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cmbRequest.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbRequest.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbRequest.FormattingEnabled = true; this.cmbRequest.ImeMode = System.Windows.Forms.ImeMode.Hangul; - this.cmbRequest.Location = new System.Drawing.Point(336, 29); + this.cmbRequest.Location = new System.Drawing.Point(93, 66); this.cmbRequest.Margin = new System.Windows.Forms.Padding(4); this.cmbRequest.Name = "cmbRequest"; - this.cmbRequest.Size = new System.Drawing.Size(139, 28); - this.cmbRequest.TabIndex = 2; + this.cmbRequest.Size = new System.Drawing.Size(179, 28); + this.cmbRequest.TabIndex = 3; // // cmbReceive // this.cmbReceive.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend; this.cmbReceive.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems; + this.cmbReceive.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbReceive.FormattingEnabled = true; this.cmbReceive.ImeMode = System.Windows.Forms.ImeMode.Hangul; this.cmbReceive.Location = new System.Drawing.Point(104, 93); this.cmbReceive.Margin = new System.Windows.Forms.Padding(4); this.cmbReceive.Name = "cmbReceive"; this.cmbReceive.Size = new System.Drawing.Size(286, 28); - this.cmbReceive.TabIndex = 3; + this.cmbReceive.TabIndex = 5; // // tbPumIDX // @@ -513,7 +505,7 @@ this.tbPumIDX.Name = "tbPumIDX"; this.tbPumIDX.ReadOnly = true; this.tbPumIDX.Size = new System.Drawing.Size(64, 27); - this.tbPumIDX.TabIndex = 7; + this.tbPumIDX.TabIndex = 8; this.tbPumIDX.TabStop = false; this.tbPumIDX.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; this.toolTip1.SetToolTip(this.tbPumIDX, "Database ID"); @@ -536,7 +528,7 @@ this.dtInDate.Margin = new System.Windows.Forms.Padding(4); this.dtInDate.Name = "dtInDate"; this.dtInDate.Size = new System.Drawing.Size(286, 27); - this.dtInDate.TabIndex = 15; + this.dtInDate.TabIndex = 3; this.dtInDate.TabStop = false; // // chkInDate @@ -546,7 +538,7 @@ this.chkInDate.Margin = new System.Windows.Forms.Padding(4); this.chkInDate.Name = "chkInDate"; this.chkInDate.Size = new System.Drawing.Size(73, 24); - this.chkInDate.TabIndex = 25; + this.chkInDate.TabIndex = 2; this.chkInDate.TabStop = false; this.chkInDate.Text = "입고일"; this.chkInDate.UseVisualStyleBackColor = true; @@ -558,7 +550,7 @@ this.dtExpDate.Margin = new System.Windows.Forms.Padding(4); this.dtExpDate.Name = "dtExpDate"; this.dtExpDate.Size = new System.Drawing.Size(286, 27); - this.dtExpDate.TabIndex = 24; + this.dtExpDate.TabIndex = 1; this.dtExpDate.TabStop = false; // // chkExp @@ -568,37 +560,30 @@ this.chkExp.Margin = new System.Windows.Forms.Padding(4); this.chkExp.Name = "chkExp"; this.chkExp.Size = new System.Drawing.Size(73, 24); - this.chkExp.TabIndex = 23; + this.chkExp.TabIndex = 0; this.chkExp.TabStop = false; this.chkExp.Text = "예상일"; this.chkExp.UseVisualStyleBackColor = true; this.chkExp.CheckedChanged += new System.EventHandler(this.chkExp_CheckedChanged); // - // label3 - // - this.label3.BackColor = System.Drawing.Color.White; - this.label3.Dock = System.Windows.Forms.DockStyle.Top; - this.label3.Location = new System.Drawing.Point(0, 0); - this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(934, 29); - this.label3.TabIndex = 0; - this.label3.Text = "--"; - this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // btSaveAdd // - this.btSaveAdd.Location = new System.Drawing.Point(511, 562); + this.btSaveAdd.Location = new System.Drawing.Point(511, 531); this.btSaveAdd.Margin = new System.Windows.Forms.Padding(4); this.btSaveAdd.Name = "btSaveAdd"; this.btSaveAdd.Size = new System.Drawing.Size(410, 51); - this.btSaveAdd.TabIndex = 0; + this.btSaveAdd.TabIndex = 3; this.btSaveAdd.Text = "저장 및 추가(&A)"; this.btSaveAdd.UseVisualStyleBackColor = true; this.btSaveAdd.Click += new System.EventHandler(this.button2_Click); // // groupBox1 // + this.groupBox1.Controls.Add(this.linkLabel7); + this.groupBox1.Controls.Add(this.linkLabel6); + this.groupBox1.Controls.Add(this.linkLabel5); + this.groupBox1.Controls.Add(label6); + this.groupBox1.Controls.Add(label3); this.groupBox1.Controls.Add(this.dtPdate); this.groupBox1.Controls.Add(this.tbPumStock); this.groupBox1.Controls.Add(this.tbPumAmt); @@ -608,10 +593,8 @@ this.groupBox1.Controls.Add(pumamtLabel); this.groupBox1.Controls.Add(this.tbPumIDX); this.groupBox1.Controls.Add(this.cmbState); - this.groupBox1.Controls.Add(projectLabel); this.groupBox1.Controls.Add(this.tbSID); this.groupBox1.Controls.Add(this.tbPumQty); - this.groupBox1.Controls.Add(supplyLabel); this.groupBox1.Controls.Add(pumqtyLabel); this.groupBox1.Controls.Add(sidLabel); this.groupBox1.Controls.Add(this.tbProject); @@ -622,19 +605,54 @@ this.groupBox1.Controls.Add(label1); this.groupBox1.Controls.Add(this.tbPumName); this.groupBox1.Controls.Add(this.cmbRequest); - this.groupBox1.Controls.Add(pumnameLabel); this.groupBox1.Controls.Add(pumscaleLabel); this.groupBox1.Controls.Add(this.tbPumUnit); this.groupBox1.Controls.Add(this.tbPumModel); - this.groupBox1.Location = new System.Drawing.Point(12, 36); + this.groupBox1.Location = new System.Drawing.Point(11, 6); this.groupBox1.Margin = new System.Windows.Forms.Padding(4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(4); - this.groupBox1.Size = new System.Drawing.Size(492, 496); - this.groupBox1.TabIndex = 2; + this.groupBox1.Size = new System.Drawing.Size(490, 518); + this.groupBox1.TabIndex = 0; this.groupBox1.TabStop = false; this.groupBox1.Text = "필수입력"; // + // linkLabel7 + // + this.linkLabel7.AutoSize = true; + this.linkLabel7.Location = new System.Drawing.Point(17, 288); + this.linkLabel7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.linkLabel7.Name = "linkLabel7"; + this.linkLabel7.Size = new System.Drawing.Size(69, 20); + this.linkLabel7.TabIndex = 31; + this.linkLabel7.TabStop = true; + this.linkLabel7.Text = "프로젝트"; + this.linkLabel7.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel7_LinkClicked); + // + // linkLabel6 + // + this.linkLabel6.AutoSize = true; + this.linkLabel6.Location = new System.Drawing.Point(31, 251); + this.linkLabel6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.linkLabel6.Name = "linkLabel6"; + this.linkLabel6.Size = new System.Drawing.Size(54, 20); + this.linkLabel6.TabIndex = 30; + this.linkLabel6.TabStop = true; + this.linkLabel6.Text = "공급처"; + this.linkLabel6.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel6_LinkClicked); + // + // linkLabel5 + // + this.linkLabel5.AutoSize = true; + this.linkLabel5.Location = new System.Drawing.Point(46, 105); + this.linkLabel5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.linkLabel5.Name = "linkLabel5"; + this.linkLabel5.Size = new System.Drawing.Size(39, 20); + this.linkLabel5.TabIndex = 29; + this.linkLabel5.TabStop = true; + this.linkLabel5.Text = "품명"; + this.linkLabel5.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel5_LinkClicked); + // // linkLabel1 // this.linkLabel1.AutoSize = true; @@ -676,12 +694,12 @@ this.groupBox2.Controls.Add(this.cmbReceive); this.groupBox2.Controls.Add(processLabel); this.groupBox2.Controls.Add(this.cbProcess); - this.groupBox2.Location = new System.Drawing.Point(512, 38); + this.groupBox2.Location = new System.Drawing.Point(512, 7); this.groupBox2.Margin = new System.Windows.Forms.Padding(4); this.groupBox2.Name = "groupBox2"; this.groupBox2.Padding = new System.Windows.Forms.Padding(4); this.groupBox2.Size = new System.Drawing.Size(409, 516); - this.groupBox2.TabIndex = 4; + this.groupBox2.TabIndex = 2; this.groupBox2.TabStop = false; this.groupBox2.Text = "추가정보"; // @@ -692,7 +710,7 @@ this.tbOrderNo.Margin = new System.Windows.Forms.Padding(4); this.tbOrderNo.Name = "tbOrderNo"; this.tbOrderNo.Size = new System.Drawing.Size(286, 27); - this.tbOrderNo.TabIndex = 21; + this.tbOrderNo.TabIndex = 13; // // cbManuProc // @@ -705,7 +723,7 @@ this.cbManuProc.Margin = new System.Windows.Forms.Padding(4); this.cbManuProc.Name = "cbManuProc"; this.cbManuProc.Size = new System.Drawing.Size(286, 28); - this.cbManuProc.TabIndex = 19; + this.cbManuProc.TabIndex = 15; // // cbEQModel // @@ -718,7 +736,7 @@ this.cbEQModel.Margin = new System.Windows.Forms.Padding(4); this.cbEQModel.Name = "cbEQModel"; this.cbEQModel.Size = new System.Drawing.Size(286, 28); - this.cbEQModel.TabIndex = 11; + this.cbEQModel.TabIndex = 19; // // cbEQManu // @@ -731,7 +749,7 @@ this.cbEQManu.Margin = new System.Windows.Forms.Padding(4); this.cbEQManu.Name = "cbEQManu"; this.cbEQManu.Size = new System.Drawing.Size(286, 28); - this.cbEQManu.TabIndex = 13; + this.cbEQManu.TabIndex = 17; this.cbEQManu.SelectedIndexChanged += new System.EventHandler(this.cbEQManu_SelectedIndexChanged); // // linkLabel4 @@ -741,7 +759,7 @@ this.linkLabel4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.linkLabel4.Name = "linkLabel4"; this.linkLabel4.Size = new System.Drawing.Size(39, 20); - this.linkLabel4.TabIndex = 16; + this.linkLabel4.TabIndex = 21; this.linkLabel4.TabStop = true; this.linkLabel4.Text = "촬영"; this.linkLabel4.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel4_LinkClicked); @@ -753,7 +771,7 @@ this.linkLabel3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.linkLabel3.Name = "linkLabel3"; this.linkLabel3.Size = new System.Drawing.Size(69, 20); - this.linkLabel3.TabIndex = 15; + this.linkLabel3.TabIndex = 20; this.linkLabel3.TabStop = true; this.linkLabel3.Text = "붙여넣기"; this.linkLabel3.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.imgpase_LinkClicked); @@ -765,7 +783,7 @@ this.linkLabel2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.linkLabel2.Name = "linkLabel2"; this.linkLabel2.Size = new System.Drawing.Size(74, 20); - this.linkLabel2.TabIndex = 14; + this.linkLabel2.TabIndex = 22; this.linkLabel2.TabStop = true; this.linkLabel2.Text = "그림 선택"; this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); @@ -799,11 +817,10 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(934, 618); + this.ClientSize = new System.Drawing.Size(928, 589); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.btSaveAdd); - this.Controls.Add(this.label3); this.Controls.Add(this.btSave); this.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; @@ -852,7 +869,6 @@ private System.Windows.Forms.CheckBox chkInDate; private System.Windows.Forms.DateTimePicker dtExpDate; private System.Windows.Forms.CheckBox chkExp; - private System.Windows.Forms.Label label3; private System.Windows.Forms.Button btSaveAdd; private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox2; @@ -869,5 +885,8 @@ private System.Windows.Forms.ToolTip toolTip1; private System.Windows.Forms.ComboBox cbManuProc; private System.Windows.Forms.TextBox tbOrderNo; + private System.Windows.Forms.LinkLabel linkLabel5; + private System.Windows.Forms.LinkLabel linkLabel6; + private System.Windows.Forms.LinkLabel linkLabel7; } } \ No newline at end of file diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs index 997d238..5ef9722 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.cs @@ -27,6 +27,9 @@ namespace FEQ0000 { if (e1.KeyCode == Keys.Escape) this.Close(); }; + this.tbPumName.Leave += tbPumName_Leave; + this.tbSupply.Leave += tbSupply_Leave; + this.tbProject.Leave += tbProject_Leave; foreach (Control ctl in groupBox1.Controls) { @@ -36,13 +39,18 @@ namespace FEQ0000 } } } + + + + Boolean advInput = false; private void __Load(object sender, EventArgs e) { // TODO: 이 코드는 데이터를 'dsPurchase.Purchase' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. //this.purchaseTableAdapter.Fill(this.dsPurchase.Purchase); // this.Show(); // Application.DoEvents(); - + advInput = FCOMMON.Util.getBit(FCOMMON.info.Login.gpermission, (int)FCOMMON.eGroupPermission.purchase_adv); + //상태 var stateList = FCOMMON.DBM.getCodeTable("04"); this.cmbState.DisplayMember = "Value"; @@ -83,11 +91,11 @@ namespace FEQ0000 //this.cbProcess.DataSource = new BindingSource(procList, ""); //담당자목록 - var userList = FCOMMON.DBM.getGroupList("name", "Users", "[level] > 0 and [level] < 10"); + var userList = FCOMMON.DBM.getUserList(); //.getGroupList("name", "Users", "[level] > 0 and [level] < 10"); foreach (var user in userList) { - this.cmbReceive.Items.Add(user); - this.cmbRequest.Items.Add(user); + this.cmbReceive.Items.Add(string.Format("[{0}] {1}",user.Key,user.Value)); + this.cmbRequest.Items.Add(string.Format("[{0}] {1}", user.Key, user.Value)); } dtPdate.Value = DateTime.Parse(dr.pdate); @@ -113,8 +121,35 @@ namespace FEQ0000 ///입력된 데이터를 적용한다. dtPdate.Value = DateTime.Parse(dr.pdate); - cmbRequest.Text = dr.request; + if(cmbRequest.Items.Count > 0) + { + for(int i = 0; i< cmbRequest.Items.Count ;i++) + { + if (cmbRequest.Items[i].ToString().StartsWith("[" + dr.request + "]")) + { + cmbRequest.SelectedIndex = i; + break; + } + } + } else cmbRequest.Text = dr.request; + + if (cmbReceive.Items.Count > 0) + { + for (int i = 0; i < cmbReceive.Items.Count; i++) + { + if (cmbReceive.Items[i].ToString().StartsWith("[" + dr.receive + "]")) + { + cmbReceive.SelectedIndex = i; + break; + } + } + } + else cmbReceive.Text = dr.receive; + + + tbSID.Text = dr.sid; + tbSID.Tag = tbSID.Text; if (dr.manuproc == "") cbManuProc.SelectedIndex = -1; @@ -139,6 +174,8 @@ namespace FEQ0000 tbPumName.Text = dr.pumname; + tbPumName.Tag = tbPumName.Text; + tbPumModel.Text = dr.pumscale; tbPumQty.Text = dr.pumqty.ToString(); tbPumStock.Text = "--"; @@ -147,13 +184,17 @@ namespace FEQ0000 tbPumPrice.Text = dr.pumprice.ToString(); tbPumAmt.Text = dr.pumamt.ToString("N0"); //천단위 구분기호 추가 181222 tbPumUnit.Text = dr.pumunit; + tbSupply.Text = dr.supply; + tbSupply.Tag = tbSupply.Text; tbSupplyIndex.Text = dr.supplyidx.ToString(); + tbProject.Text = dr.project; + tbProject.Tag = tbProject.Text; tbProjectIndex.Text = dr.projectidx.ToString(); cmbState.Text = dr.state; - cmbReceive.Text = dr.receive; + if (dr.process == "") cbProcess.SelectedIndex = -1; else cbProcess.Text = dr.process; @@ -178,7 +219,7 @@ namespace FEQ0000 this.dtInDate.Enabled = chkInDate.Checked; //일반사용자의경우에는 상태를 변경하지 못한다. - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.purchase)); + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.purchase)); if (curLevel < 5) { if (dr.RowState == DataRowState.Detached || dr.RowState == DataRowState.Added) @@ -189,7 +230,7 @@ namespace FEQ0000 //데이터가 편집 상태인데 요청자가 내가 아닌경우에도 편집 불가 Boolean enb = true; - if (dr.RowState == DataRowState.Unchanged && dr.request != FCOMMON.info.Login.nameK) + if (dr.RowState == DataRowState.Unchanged && dr.request != FCOMMON.info.Login.no) enb = false; if (tbSC.Text.Trim() != "") enb = false; @@ -202,9 +243,13 @@ namespace FEQ0000 } } + if(advInput==false) + { + this.Width = 528; + } this.Show(); Application.DoEvents(); - tbSID.Focus(); + tbPumName.Focus(); //이미지를 불러온다. if (dr.RowState != DataRowState.Detached && dr.RowState != DataRowState.Deleted && dr.RowState != DataRowState.Added) @@ -219,6 +264,8 @@ namespace FEQ0000 } } + + } string sidTrim(string sid) @@ -243,145 +290,15 @@ namespace FEQ0000 var lastprocess = FCOMMON.DBM.getFirstValue("process", "purchase", "request like '%" + this.cmbRequest.Text + "%'", "pdate desc"); if (lastprocess != "") cbProcess.Text = lastprocess; tbSID.Focus(); - break; - case "tbsid": - if (search != "" && search != "신규") - { - //if (search.Length == 9 && search.IndexOf('-') == -1) - //{ - // search = string.Format("{0}-{1}-{2}", - // search.Substring(0, 3), - // search.Substring(3, 3), - // search.Substring(6, 3)); - // tbSID.Text = search; - //} - var f = new FCM0000.fLovItem("%" + sidTrim(search) + "%"); - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - tbSID.Text = sidTrim(f.SID); - tbPumIDX.Text = f.item.ToString(); - tbPumName.Text = f.itemName; - tbPumModel.Text = f.itemmodel; - tbPumPrice.Text = f.itemprice.ToString(); - tbPumQty.Text = "1"; - tbPumUnit.Text = f.itemUnit; //181214 - //pumamtTextBox.Text = tbPumPrice.Text;\ - //이 제품의 마지막 구매기록을 찾아서 업데이트 해준다. - var pcInfo = FCOMMON.DBM.getLastPurchaseInfo(f.item); - if (pcInfo.idx != -1) - { - tbSupply.Text = pcInfo.supply; - tbSupplyIndex.Text = pcInfo.supplyidx.ToString(); - if (pcInfo.project != "" && tbProject.Text == "") - tbProject.Text = pcInfo.project; - } - else - { - tbSupply.Text = f.itemSupply; - tbSupplyIndex.Text = f.itemSupplyidx.ToString(); - } - - if (tbPumIDX.Text != "") - { - var image = FCOMMON.DBM.GetImageData("Items", "image", int.Parse(tbPumIDX.Text)); - var oimage = this.pictureBox1.Image; - this.pictureBox1.Image = image; - if (oimage != null) oimage.Dispose(); - } - - FCOMMON.Util.MsgI("SID를 선택하면 품명&모델을 편집할 수 없습니다.\n\n해당 정보는 '품목' 정보에서 수정해야 합니다."); - - //이름을 선택되었으므로 모델을 선택한다. - tbPumName.Enabled = false; - tbPumModel.Enabled = false; - tbPumQty.Focus(); - this.Invalidate(); - return; - } - else - { - tbPumName.Enabled = true; - tbPumModel.Enabled = true; - tbPumName.Focus(); - } - } - else - { - tbPumName.Enabled = true; - tbPumModel.Enabled = true; - tbPumName.Focus(); - } - break; case "tbpumname": - if (search != "") - { - var f = new FCM0000.fLovItem("%" + search + "%"); - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - //인덱스값이 다르면 모델 및 가격을 업데이트 한다. - tbPumName.Text = f.itemName; - if (this.tbPumIDX.Text != f.item.ToString()) - { - this.tbPumIDX.Text = f.item.ToString(); - this.tbPumModel.Text = f.itemmodel; - this.tbPumPrice.Text = f.itemprice.ToString(); - this.tbSID.Text = f.SID; - this.tbPumUnit.Text = f.itemUnit; //181214 - - //제품을 찾앗다면 suppy 등을 업데이트 해준다. - var pcInfo = FCOMMON.DBM.getLastPurchaseInfo(f.item); - if (pcInfo.idx != -1) - { - tbSupply.Text = pcInfo.supply; - tbSupplyIndex.Text = pcInfo.supplyidx.ToString(); - if (pcInfo.project != "" && tbProject.Text == "") - tbProject.Text = pcInfo.project; - } - else - { - tbSupply.Text = f.itemSupply; - tbSupplyIndex.Text = f.itemSupplyidx.ToString(); - } - } - if (tbPumIDX.Text != "") - { - var image = FCOMMON.DBM.GetImageData("Items", "image", int.Parse(tbPumIDX.Text)); - var oimage = this.pictureBox1.Image; - this.pictureBox1.Image = image; - if (oimage != null) oimage.Dispose(); - } - } - else this.tbPumIDX.Text = "-1"; - } - tbPumModel.Focus(); + Lov_Item(search, false); break; case "tbproject": - if (search != "") - { - FCM0000.fLovProject f = new FCM0000.fLovProject("%" + search + "%"); - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - this.tbProject.Text = f.Title; - this.tbProjectIndex.Text = f.Index.ToString(); - } - } - this.btSave.Focus(); + Lov_Project(search, false); break; - case "tbsupply": - if (search != "") - { - FCM0000.fLovSupply f = new FCM0000.fLovSupply(search); - if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) - { - tbSupply.Text = f.Title; - tbSupplyIndex.Text = f.Index.ToString(); - this.tbProject.Focus(); - - } - } - tbProject.Focus(); + Lov_Supply(search, false); break; default: SendKeys.Send("{TAB}"); @@ -389,8 +306,104 @@ namespace FEQ0000 } } } + private void linkLabel5_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + Lov_Item("",true); + } + void Lov_Item( string search,Boolean allowAll) + { + if (search == "" && allowAll==false) + { + FCOMMON.Util.MsgE("품명은 필수 값 입니다"); + tbPumName.Focus(); + return; + } + else if (search.ToLower() != tbPumName.Tag.ToString().ToLower() || tbPumIDX.Text == "-1" || tbPumIDX.Text == "") //값이 바뀌엇다면 검색을 해준다. + { + var f = new FCM0000.fLovItem(search); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + //인덱스값이 다르면 모델 및 가격을 업데이트 한다. + tbPumName.Text = f.itemName; + tbPumName.Tag = f.itemName; + this.tbPumIDX.Text = f.item.ToString(); + this.tbPumModel.Text = f.itemmodel; + this.tbPumPrice.Text = f.itemprice.ToString(); + this.tbSID.Text = f.SID; + this.tbSID.Tag = f.SID; + this.tbPumUnit.Text = f.itemUnit; //181214 + + this.tbPumModel.Enabled = false; + this.tbPumUnit.Enabled = false; + if (tbSID.Text != "") tbSID.Enabled = false; + else tbSID.Enabled = true; + + //제품을 찾앗다면 suppy 등을 업데이트 해준다. + var pcInfo = FCOMMON.DBM.getLastPurchaseInfo(f.item); + if (pcInfo.idx != -1) + { + tbSupply.Text = pcInfo.supply; + tbSupplyIndex.Text = pcInfo.supplyidx.ToString(); + if (pcInfo.project != "" && tbProject.Text == "") + tbProject.Text = pcInfo.project; + } + else + { + tbSupply.Text = f.itemSupply; + tbSupplyIndex.Text = f.itemSupplyidx.ToString(); + } + + //display image + var image = FCOMMON.DBM.GetImageData("Items", "image", int.Parse(tbPumIDX.Text)); + var oimage = this.pictureBox1.Image; + this.pictureBox1.Image = image; + if (oimage != null) oimage.Dispose(); + } + } + this.tbPumQty.Focus(); + } + void Lov_Project(string search, Boolean allowAll) + { + if (search != "" || allowAll == true) + { + var f = new FCM0000.fLovProject(search); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + this.tbProject.Text = f.Title; + this.tbProject.Tag = f.Title; + this.tbProjectIndex.Text = f.Index.ToString(); + btSave.Focus(); + } + else + { + tbProject.SelectAll(); + tbProject.Focus(); + } + } + else this.btSave.Focus(); + } + void Lov_Supply(string search, Boolean allowAll) + { + if (search != "" || allowAll == true) + { + FCM0000.fLovSupply f = new FCM0000.fLovSupply(search); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + tbSupply.Text = f.Title; + tbSupply.Tag = f.Title; + tbSupplyIndex.Text = f.Index.ToString(); + this.tbProject.Focus(); + } + else + { + tbSupply.Focus(); + tbSupply.SelectAll(); + } + } + else tbProject.Focus(); + } private bool saveData() { this.Validate(); @@ -423,7 +436,7 @@ namespace FEQ0000 tbPumQty.Focus(); return false; } - if (tbProject.Text == "") + if ( advInput==true && tbProject.Text == "") { FCOMMON.Util.MsgE("프로젝트 정보를 입력하세요."); tbProject.Focus(); @@ -433,7 +446,7 @@ namespace FEQ0000 var overtime = DateTime.Now - DateTime.Parse("2019-01-09 00:00:00"); if (overtime.TotalSeconds > 0) { - if (this.cbProcess.Text.Trim()=="") + if (advInput == true && this.cbProcess.Text.Trim() == "") { if (FCOMMON.info.Login.level >= 5) { @@ -458,7 +471,7 @@ namespace FEQ0000 return false; } } - if (cbManuProc.Text.Trim() == "") + if (advInput == true && cbManuProc.Text.Trim() == "") { if (FCOMMON.info.Login.level >= 5) { @@ -483,7 +496,7 @@ namespace FEQ0000 return false; } } - if (this.cbEQManu.Text.Trim() == "") + if (advInput == true && this.cbEQManu.Text.Trim() == "") { if (FCOMMON.info.Login.level >= 5) { @@ -530,7 +543,17 @@ namespace FEQ0000 } } - + //품목정보에 없는 데이터이므로 자료를 추가한다. + if(tbPumIDX.Text == "-1") + { + var newidx = FCOMMON.DBM.addItem(tbPumName.Text, tbSID.Text, tbPumModel.Text.Trim(), decimal.Parse(tbPumPrice.Text), tbSupply.Text.Trim(), int.Parse(tbSupplyIndex.Text), null); + if (newidx > 0) tbPumIDX.Text = newidx.ToString(); + } + else if(tbSID.Text != "" && tbSID.Text != tbSID.Tag.ToString()) + { + //SID가 변경되었으므로 업데이트 해주낟. + FCOMMON.DBM.UpdateItemSID(int.Parse(tbPumIDX.Text), tbSID.Text); + } //수령을 했는데. 현재 상태가 04 미만이면 04(수령)으로 변경 한다. if (chkInDate.Checked) @@ -551,10 +574,7 @@ namespace FEQ0000 dr.pumamt = dr.pumqty * dr.pumprice; if (tbPumIDX.Text == "" || tbPumIDX.Text == "-1") dr.SetpumidxNull(); else dr.pumidx = int.Parse(tbPumIDX.Text); - - var sid = this.tbSID.Text.Replace("-", "").Replace(" ", "").Replace("-", "").Trim(); - //if (sid.Length == 9) sid = sid.Substring(0, 3) + "-" + sid.Substring(3, 3) + "-" + sid.Substring(6, 3); - dr.sid = sid; + dr.sid = tbSID.Text.Trim(); if (chkExp.Checked) dr.edate = this.dtExpDate.Value.ToShortDateString(); else dr.SetedateNull(); @@ -562,8 +582,12 @@ namespace FEQ0000 else dr.SetindateNull(); dr.pdate = this.dtPdate.Value.ToShortDateString(); + dr.gcode = FCOMMON.info.Login.gcode; + if (cmbRequest.Text.IndexOf("]") != -1) + dr.request = cmbRequest.Text.Substring(1, cmbRequest.Text.IndexOf("]") - 1); + else + dr.request = cmbRequest.Text.Trim(); - dr.request = cmbRequest.Text; dr.sid = tbSID.Text; dr.asset = cbEQModel.Text; @@ -587,7 +611,12 @@ namespace FEQ0000 else dr.projectidx = int.Parse(tbProjectIndex.Text); dr.state = cmbState.Text.Trim(); - dr.receive = cmbReceive.Text; + + if (cmbReceive.Text.IndexOf("]") != -1) + dr.receive = cmbReceive.Text.Substring(1, cmbReceive.Text.IndexOf("]") - 1); + else + dr.receive = cmbReceive.Text.Trim(); + dr.process = cbProcess.Text; dr.sc = tbSC.Text; dr.po = tbPO.Text; @@ -646,44 +675,44 @@ namespace FEQ0000 private void comboBox1_SelectedIndexChanged(object sender, EventArgs e) { - string code = ""; - if (cmbState.SelectedIndex < 0) label3.Text = "--"; - else - { - //var value = cmbState.DataSource as BindingSource; - //var list = value.DataSource as Dictionary; - //var item = list.Values - if (cmbState.Text.StartsWith("[") == false) return; - code = cmbState.Text.ToString().Substring(1, 2); - var desc = FCOMMON.DBM.getCodeSavlue("04", code); - label3.Text = desc; + //string code = ""; + //if (cmbState.SelectedIndex < 0) label3.Text = "--"; + //else + //{ + // //var value = cmbState.DataSource as BindingSource; + // //var list = value.DataSource as Dictionary; + // //var item = list.Values + // if (cmbState.Text.StartsWith("[") == false) return; + // code = cmbState.Text.ToString().Substring(1, 2); + // var desc = FCOMMON.DBM.getCodeSavlue("04", code); + // label3.Text = desc; - } - switch (code) - { - case "01": - label3.BackColor = Color.LightBlue; - break; - case "02": - label3.BackColor = Color.SkyBlue; - break; - case "03": - label3.BackColor = Color.Yellow; - break; - case "04": - label3.BackColor = Color.Green; - break; - case "06": - case "05": - label3.BackColor = Color.Red; - break; - case "07": - label3.BackColor = Color.Magenta; - break; - default: - label3.BackColor = Color.LightGray; - break; - } + //} + //switch (code) + //{ + // case "01": + // label3.BackColor = Color.LightBlue; + // break; + // case "02": + // label3.BackColor = Color.SkyBlue; + // break; + // case "03": + // label3.BackColor = Color.Yellow; + // break; + // case "04": + // label3.BackColor = Color.Green; + // break; + // case "06": + // case "05": + // label3.BackColor = Color.Red; + // break; + // case "07": + // label3.BackColor = Color.Magenta; + // break; + // default: + // label3.BackColor = Color.LightGray; + // break; + //} } @@ -770,5 +799,45 @@ namespace FEQ0000 else cbEQModel.SelectedIndex = -1; } + private void linkLabel6_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + //lov 공급처 + Lov_Supply("", true); + } + + private void linkLabel7_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e) + { + //lov 프로젝트 + Lov_Project("", true); + } + + void tbProject_Leave(object sender, EventArgs e) + { + //커서를 빠져나갈떄 사용자가 이름만 변경했다면 선택 idx를 제거해준다. + var tb = sender as TextBox; + if (tb.Text == "") tbProjectIndex.Text = "-1"; + else if (tb.Text != tb.Tag.ToString()) tbProjectIndex.Text = "-1"; + } + + void tbSupply_Leave(object sender, EventArgs e) + { + //커서를 빠져나갈떄 사용자가 이름만 변경했다면 선택 idx를 제거해준다.\ + var tb = sender as TextBox; + if (tb.Text == "") tbSupplyIndex.Text = "-1"; + else if (tb.Text != tb.Tag.ToString()) tbSupplyIndex.Text = "-1"; + } + + void tbPumName_Leave(object sender, EventArgs e) + { + //커서를 빠져나갈떄 사용자가 이름만 변경했다면 선택 idx를 제거해준다. + var tb = sender as TextBox; + if (tb.Text == "") tbPumIDX.Text = "-1"; + else if (tb.Text != tb.Tag.ToString()) tbPumIDX.Text = "-1"; + if(tbPumIDX.Text =="-1") + { + tbPumModel.Enabled = true; + tbPumUnit.Enabled = true; + } + } } } diff --git a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx index fb7564a..51236c2 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_Add.resx +++ b/SubProject/FEQ0000/Purchase/fPurchase_Add.resx @@ -129,9 +129,6 @@ False - - False - False @@ -144,12 +141,6 @@ False - - False - - - False - False @@ -171,11 +162,11 @@ False - - 490, 17 + + False - - 490, 17 + + False 490, 17 diff --git a/SubProject/FEQ0000/dsPurchase.Designer.cs b/SubProject/FEQ0000/dsPurchase.Designer.cs index 2c45e08..bc3b183 100644 --- a/SubProject/FEQ0000/dsPurchase.Designer.cs +++ b/SubProject/FEQ0000/dsPurchase.Designer.cs @@ -343,6 +343,10 @@ namespace FEQ0000 { private global::System.Data.DataColumn columngcode; + private global::System.Data.DataColumn columnreceiveName; + + private global::System.Data.DataColumn columnrequestName; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public PurchaseDataTable() { @@ -632,6 +636,22 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn receiveNameColumn { + get { + return this.columnreceiveName; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public global::System.Data.DataColumn requestNameColumn { + get { + return this.columnrequestName; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -700,7 +720,9 @@ namespace FEQ0000 { string bigo, string manuproc, string orderno, - string gcode) { + string gcode, + string receiveName, + string requestName) { PurchaseRow rowPurchaseRow = ((PurchaseRow)(this.NewRow())); object[] columnValuesArray = new object[] { null, @@ -734,7 +756,9 @@ namespace FEQ0000 { bigo, manuproc, orderno, - gcode}; + gcode, + receiveName, + requestName}; rowPurchaseRow.ItemArray = columnValuesArray; this.Rows.Add(rowPurchaseRow); return rowPurchaseRow; @@ -796,6 +820,8 @@ namespace FEQ0000 { this.columnmanuproc = base.Columns["manuproc"]; this.columnorderno = base.Columns["orderno"]; this.columngcode = base.Columns["gcode"]; + this.columnreceiveName = base.Columns["receiveName"]; + this.columnrequestName = base.Columns["requestName"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -865,6 +891,10 @@ namespace FEQ0000 { base.Columns.Add(this.columnorderno); this.columngcode = new global::System.Data.DataColumn("gcode", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columngcode); + this.columnreceiveName = new global::System.Data.DataColumn("receiveName", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnreceiveName); + this.columnrequestName = new global::System.Data.DataColumn("requestName", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnrequestName); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columnidx}, true)); this.columnidx.AutoIncrement = true; @@ -898,6 +928,10 @@ namespace FEQ0000 { this.columnorderno.MaxLength = 50; this.columngcode.AllowDBNull = false; this.columngcode.MaxLength = 10; + this.columnreceiveName.ReadOnly = true; + this.columnreceiveName.MaxLength = 200; + this.columnrequestName.ReadOnly = true; + this.columnrequestName.MaxLength = 200; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1530,6 +1564,38 @@ namespace FEQ0000 { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string receiveName { + get { + if (this.IsreceiveNameNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablePurchase.receiveNameColumn])); + } + } + set { + this[this.tablePurchase.receiveNameColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public string requestName { + get { + if (this.IsrequestNameNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tablePurchase.requestNameColumn])); + } + } + set { + this[this.tablePurchase.requestNameColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] public bool IspdateNull() { @@ -1865,6 +1931,30 @@ namespace FEQ0000 { public void SetordernoNull() { this[this.tablePurchase.ordernoColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsreceiveNameNull() { + return this.IsNull(this.tablePurchase.receiveNameColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetreceiveNameNull() { + this[this.tablePurchase.receiveNameColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public bool IsrequestNameNull() { + return this.IsNull(this.tablePurchase.requestNameColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] + public void SetrequestNameNull() { + this[this.tablePurchase.requestNameColumn] = global::System.Convert.DBNull; + } } /// @@ -2058,6 +2148,8 @@ namespace FEQ0000.dsPurchaseTableAdapters { tableMapping.ColumnMappings.Add("manuproc", "manuproc"); tableMapping.ColumnMappings.Add("orderno", "orderno"); tableMapping.ColumnMappings.Add("gcode", "gcode"); + tableMapping.ColumnMappings.Add("receiveName", "receiveName"); + tableMapping.ColumnMappings.Add("requestName", "requestName"); this._adapter.TableMappings.Add(tableMapping); this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand(); this._adapter.DeleteCommand.Connection = this.Connection; @@ -2160,8 +2252,8 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, this._commandCollection = new global::System.Data.SqlClient.SqlCommand[3]; this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[0].Connection = this.Connection; - this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode + this._commandCollection[0].CommandText = @"SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, + pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode FROM Purchase WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; @@ -2179,7 +2271,7 @@ ORDER BY pdate DESC, idx DESC"; this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand(); this._commandCollection[2].Connection = this.Connection; this._commandCollection[2].CommandText = @"SELECT asset, bigo, dept, edate, idx, import, indate, isdel, manuproc, orderno, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive, - request, sc, sid, state, supply, supplyidx, wdate, wuid + request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC"; diff --git a/SubProject/FEQ0000/dsPurchase.xsd b/SubProject/FEQ0000/dsPurchase.xsd index c2b33a0..fb6a50a 100644 --- a/SubProject/FEQ0000/dsPurchase.xsd +++ b/SubProject/FEQ0000/dsPurchase.xsd @@ -21,51 +21,51 @@ WHERE (idx = @Original_idx) - + INSERT INTO Purchase (pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode) VALUES (@pdate,@state,@process,@receive,@sc,@request,@sid,@pumname,@pumscale,@pumunit,@pumqty,@pumprice,@pumamt,@supply,@supplyidx,@project,@projectidx,@asset,@edate,@indate,@po,@dept,@wuid,@wdate,@import,@pumidx,@isdel,@bigo,@manuproc,@orderno,@gcode); SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo FROM Purchase WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC, idx DESC - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, pumunit, pumqty, pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, - wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode + SELECT idx, pdate, state, process, receive, dbo.getUserName(receive) AS receiveName, sc, request, dbo.getUserName(request) AS requestName, sid, pumname, pumscale, pumunit, pumqty, + pumprice, pumamt, supply, supplyidx, project, projectidx, asset, edate, indate, po, dept, wuid, wdate, import, pumidx, isdel, bigo, manuproc, orderno, gcode FROM Purchase WHERE (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC @@ -154,6 +154,8 @@ SELECT idx, pdate, state, process, receive, sc, request, sid, pumname, pumscale, + + @@ -180,7 +182,7 @@ WHERE (import = 1) AND (pdate BETWEEN @sd AND @ed) AND (wuid = @userid) AND (gc SELECT asset, bigo, dept, edate, idx, import, indate, isdel, manuproc, orderno, pdate, po, process, project, projectidx, pumamt, pumidx, pumname, pumprice, pumqty, pumscale, pumunit, receive, - request, sc, sid, state, supply, supplyidx, wdate, wuid + request, sc, sid, state, supply, supplyidx, wdate, wuid, dbo.getUserName(receive) AS receiveName, dbo.getUserName(request) AS requestName FROM Purchase WHERE (pdate BETWEEN @sd AND @ed) AND (ISNULL(isdel, 0) = 0) AND (gcode = @gcode) ORDER BY pdate DESC, idx DESC @@ -202,7 +204,7 @@ ORDER BY pdate DESC, idx DESC - + @@ -369,6 +371,20 @@ ORDER BY pdate DESC, idx DESC + + + + + + + + + + + + + + diff --git a/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs b/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs index ececb71..0f63788 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.Designer.cs @@ -30,18 +30,18 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport)); - FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType(); - FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType(); + FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bs = new System.Windows.Forms.BindingSource(this.components); this.dsMSSQL = new FPJ0000.dsPRJ(); @@ -95,6 +95,7 @@ this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel(); this.cmbUser = new System.Windows.Forms.ToolStripComboBox(); this.btSearch = new System.Windows.Forms.ToolStripButton(); + this.toolStripButton2 = new System.Windows.Forms.ToolStripButton(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); @@ -465,11 +466,11 @@ this.fpSpread1.ContextMenuStrip = this.cm; this.fpSpread1.Dock = System.Windows.Forms.DockStyle.Fill; this.fpSpread1.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.fpSpread1.Location = new System.Drawing.Point(0, 25); + this.fpSpread1.Location = new System.Drawing.Point(0, 37); this.fpSpread1.Name = "fpSpread1"; this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] { this.fpSpread1_Sheet1}); - this.fpSpread1.Size = new System.Drawing.Size(1142, 539); + this.fpSpread1.Size = new System.Drawing.Size(1142, 527); this.fpSpread1.StatusBarVisible = true; this.fpSpread1.TabIndex = 2; // @@ -496,68 +497,68 @@ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "초과"; this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "비고"; this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F; - this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType19; + this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType10; this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate"; this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜"; this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F; this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType20; + this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType11; this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww"; this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW"; this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType21; + this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType12; this.fpSpread1_Sheet1.Columns.Get(2).DataField = "requestpart"; this.fpSpread1_Sheet1.Columns.Get(2).Label = "요청부서"; this.fpSpread1_Sheet1.Columns.Get(2).Width = 78F; this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType22; + this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType13; this.fpSpread1_Sheet1.Columns.Get(3).DataField = "package"; this.fpSpread1_Sheet1.Columns.Get(3).Label = "패키지"; this.fpSpread1_Sheet1.Columns.Get(3).Width = 86F; - this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType23; + this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType14; this.fpSpread1_Sheet1.Columns.Get(4).DataField = "status"; this.fpSpread1_Sheet1.Columns.Get(4).Label = "상태"; this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType24; + this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType15; this.fpSpread1_Sheet1.Columns.Get(5).DataField = "type"; this.fpSpread1_Sheet1.Columns.Get(5).Label = "업무형태"; this.fpSpread1_Sheet1.Columns.Get(5).Width = 84F; this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType25; + this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType16; this.fpSpread1_Sheet1.Columns.Get(6).DataField = "process"; this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무분류"; this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(6).Width = 80F; this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true; - this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType26; + this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType17; this.fpSpread1_Sheet1.Columns.Get(7).DataField = "projectName"; this.fpSpread1_Sheet1.Columns.Get(7).Label = "프로젝트(아이템)"; this.fpSpread1_Sheet1.Columns.Get(7).Width = 158F; this.fpSpread1_Sheet1.Columns.Get(8).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - numberCellType7.DecimalPlaces = 0; - numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; - numberCellType7.MaximumValue = 2147483647D; - numberCellType7.MinimumValue = -2147483648D; - this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType7; + numberCellType4.DecimalPlaces = 0; + numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes; + numberCellType4.MaximumValue = 2147483647D; + numberCellType4.MinimumValue = -2147483648D; + this.fpSpread1_Sheet1.Columns.Get(8).CellType = numberCellType4; this.fpSpread1_Sheet1.Columns.Get(8).DataField = "pidx"; this.fpSpread1_Sheet1.Columns.Get(8).Label = "*"; this.fpSpread1_Sheet1.Columns.Get(8).Width = 39F; - numberCellType8.MaximumValue = 999999999999999D; - numberCellType8.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType8; + numberCellType5.MaximumValue = 999999999999999D; + numberCellType5.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType5; this.fpSpread1_Sheet1.Columns.Get(9).DataField = "hrs"; this.fpSpread1_Sheet1.Columns.Get(9).Label = "시간"; this.fpSpread1_Sheet1.Columns.Get(9).Width = 52F; - numberCellType9.MaximumValue = 999999999999999D; - numberCellType9.MinimumValue = -999999999999999D; - this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType9; + numberCellType6.MaximumValue = 999999999999999D; + numberCellType6.MinimumValue = -999999999999999D; + this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType6; this.fpSpread1_Sheet1.Columns.Get(10).DataField = "ot"; this.fpSpread1_Sheet1.Columns.Get(10).ForeColor = System.Drawing.Color.Red; this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center; this.fpSpread1_Sheet1.Columns.Get(10).Label = "초과"; this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center; - this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType27; + this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType18; this.fpSpread1_Sheet1.Columns.Get(11).DataField = "description"; this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left; this.fpSpread1_Sheet1.Columns.Get(11).Label = "비고"; @@ -570,6 +571,7 @@ // // toolStrip1 // + this.toolStrip1.ImageScalingSize = new System.Drawing.Size(30, 30); this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.lbStt, this.dtSD, @@ -579,10 +581,11 @@ this.toolStripSeparator2, this.toolStripLabel3, this.cmbUser, - this.btSearch}); + this.btSearch, + this.toolStripButton2}); this.toolStrip1.Location = new System.Drawing.Point(0, 0); this.toolStrip1.Name = "toolStrip1"; - this.toolStrip1.Size = new System.Drawing.Size(1142, 25); + this.toolStrip1.Size = new System.Drawing.Size(1142, 37); this.toolStrip1.TabIndex = 4; this.toolStrip1.Text = "toolStrip1"; // @@ -591,7 +594,7 @@ this.lbStt.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.lbStt.ForeColor = System.Drawing.Color.Blue; this.lbStt.Name = "lbStt"; - this.lbStt.Size = new System.Drawing.Size(31, 22); + this.lbStt.Size = new System.Drawing.Size(31, 34); this.lbStt.Text = "기간"; this.lbStt.Click += new System.EventHandler(this.lbStt_Click); // @@ -600,14 +603,14 @@ this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.dtSD.Name = "dtSD"; this.dtSD.ReadOnly = true; - this.dtSD.Size = new System.Drawing.Size(90, 25); + this.dtSD.Size = new System.Drawing.Size(90, 37); this.dtSD.Text = "1982-11-23"; this.dtSD.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // lbEnd // this.lbEnd.Name = "lbEnd"; - this.lbEnd.Size = new System.Drawing.Size(15, 22); + this.lbEnd.Size = new System.Drawing.Size(15, 34); this.lbEnd.Text = "~"; // // dtED @@ -615,25 +618,25 @@ this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.dtED.Name = "dtED"; this.dtED.ReadOnly = true; - this.dtED.Size = new System.Drawing.Size(90, 25); + this.dtED.Size = new System.Drawing.Size(90, 37); this.dtED.Text = "1982-11-23"; this.dtED.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center; // // lbTime // this.lbTime.Name = "lbTime"; - this.lbTime.Size = new System.Drawing.Size(29, 22); + this.lbTime.Size = new System.Drawing.Size(29, 34); this.lbTime.Text = "{0}h"; // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 37); // // toolStripLabel3 // this.toolStripLabel3.Name = "toolStripLabel3"; - this.toolStripLabel3.Size = new System.Drawing.Size(43, 22); + this.toolStripLabel3.Size = new System.Drawing.Size(43, 34); this.toolStripLabel3.Text = "사용자"; this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click); // @@ -641,7 +644,7 @@ // this.cmbUser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbUser.Name = "cmbUser"; - this.cmbUser.Size = new System.Drawing.Size(200, 25); + this.cmbUser.Size = new System.Drawing.Size(200, 37); this.cmbUser.SelectedIndexChanged += new System.EventHandler(this.cmbUser_SelectedIndexChanged); this.cmbUser.Click += new System.EventHandler(this.cmbUser_Click); // @@ -650,10 +653,20 @@ this.btSearch.Image = ((System.Drawing.Image)(resources.GetObject("btSearch.Image"))); this.btSearch.ImageTransparentColor = System.Drawing.Color.Magenta; this.btSearch.Name = "btSearch"; - this.btSearch.Size = new System.Drawing.Size(66, 22); + this.btSearch.Size = new System.Drawing.Size(80, 34); this.btSearch.Text = "조회(&R)"; this.btSearch.Click += new System.EventHandler(this.btSearch_Click); // + // toolStripButton2 + // + this.toolStripButton2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + 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(65, 34); + this.toolStripButton2.Text = "닫기"; + this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click); + // // fJobReport // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -736,5 +749,6 @@ private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem; private System.Windows.Forms.ToolStripButton btReportDay; private System.Windows.Forms.ToolStripButton toolStripButton1; + private System.Windows.Forms.ToolStripButton toolStripButton2; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/JobReport/fJobReport.cs b/SubProject/FPJ0000/JobReport/fJobReport.cs index a3400fd..fcd5e28 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.cs +++ b/SubProject/FPJ0000/JobReport/fJobReport.cs @@ -46,10 +46,10 @@ namespace FPJ0000 cn.Open(); string sql = "select uid,dbo.getUserName(uid) as uname " + " from JobReport" + - " where uid <> '{0}'" + + " where gcode='{1}' and uid <> '{0}'" + " group by uid " + " order by uname"; - sql = string.Format(sql, FCOMMON.info.Login.no); + sql = string.Format(sql, FCOMMON.info.Login.no, FCOMMON.info.Login.gcode); var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); var rdr = cmd.ExecuteReader(); while (rdr.Read()) @@ -84,7 +84,7 @@ namespace FPJ0000 //일반사용자의경우에는 상태를 변경하지 못한다. - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.jobreport)); + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.jobreport)); if (curLevel >= 5) { btSave.Visible = true; @@ -493,5 +493,10 @@ namespace FPJ0000 var f = new JobReport.fJobChartMenu(name, request); f.ShowDialog(); } + + private void toolStripButton2_Click(object sender, EventArgs e) + { + this.Close(); + } } } diff --git a/SubProject/FPJ0000/JobReport/fJobReport.resx b/SubProject/FPJ0000/JobReport/fJobReport.resx index e575b96..5e04b29 100644 --- a/SubProject/FPJ0000/JobReport/fJobReport.resx +++ b/SubProject/FPJ0000/JobReport/fJobReport.resx @@ -312,6 +312,16 @@ GsiYJ/vPdX5qPK3bVJ25VFukafztGQNsKHJ791I3w+8KcpNth8XDz5YxACI/gsR1J8sTYcO4UIzwv1gG cTshgJ5IT8hChTMHsHi+v+fvffmxywVwN2FDkdsGEOK2ceu4feQ0tDqKyKMGqDfqjvprLzyswuX7Tf4E dBo6zn/3OB7XHovRyuhQ6+hhYKA9DpL+A1keRebNAhkaJH0OHOcP031C4EjYr6wAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAADlSURBVEhL7dQxCsIwFMbxnMrZWatzUXRUCo5ewSs4ewZR + DyDeQfEETsUbRL7YYNSXNC/UOiQP/kvzyE9KUcQ7y/VJtlHFvQYPjzf50xKsJsFmq81WHq538swMO9il + zhALxkWd7kAOJwsnjjPsYNeGs2B14fR5YTYq5O5c1u7sL987iAUjF+6LIjaMKJyDoiAYmVAvn8lsXHij + KBhGwDWof4APihqHqQ+OKhg2X3U/n7+9ah88CKY+pM9ndTgbplDbmQtnwS7UtmPDWfDf/jIRLnKhOuzY + UMSGmyrBauKE26jiohshHicE2B3dbRrmAAAAAElFTkSuQmCC \ No newline at end of file diff --git a/SubProject/FPJ0000/Project/fProjectData.cs b/SubProject/FPJ0000/Project/fProjectData.cs index 91a2330..14cdda7 100644 --- a/SubProject/FPJ0000/Project/fProjectData.cs +++ b/SubProject/FPJ0000/Project/fProjectData.cs @@ -80,7 +80,7 @@ namespace FPJ0000 btSendMail.Enabled = btPart.Enabled; //일반사용자의경우에는 상태를 변경하지 못한다. - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project)); + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.project)); if (curLevel >= 5) { diff --git a/SubProject/FPJ0000/Project/fProjectList.cs b/SubProject/FPJ0000/Project/fProjectList.cs index 4a196a1..567132d 100644 --- a/SubProject/FPJ0000/Project/fProjectList.cs +++ b/SubProject/FPJ0000/Project/fProjectList.cs @@ -54,7 +54,7 @@ namespace FPJ0000 refreshData(); //일반사용자의경우에는 상태를 변경하지 못한다. - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project)); + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.project)); if (curLevel >= 5) { btSave.Visible = true; @@ -347,7 +347,7 @@ namespace FPJ0000 var f = new fProjectData(newdr); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project)); + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.project)); if (curLevel < 5) { funcSave(false); //자동저장 @@ -419,7 +419,7 @@ namespace FPJ0000 bs.RemoveCurrent(); //일반사용자는 바로 저장되도록 함 - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project)); + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.project)); if (curLevel < 5) { funcSave(false); //자동저장 @@ -524,7 +524,7 @@ namespace FPJ0000 var f = new fProjectData(dr); if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAutoType.project)); + int curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.project)); if (curLevel < 5) { funcSave(false); //자동저장