From 2d737c82569a75a912a88d1ad684353ad68f7ab4 Mon Sep 17 00:00:00 2001 From: chi Date: Sun, 1 May 2022 21:27:46 +0900 Subject: [PATCH] .... --- Project/Dialog/fLogin.Designer.cs | 322 +++++++++++++++--------------- Project/Dialog/fLogin.cs | 21 ++ Project/dsMSSQL.Designer.cs | 313 ++++++++++++++++++++++++++--- Project/dsMSSQL.xsd | 72 +++++-- 4 files changed, 516 insertions(+), 212 deletions(-) diff --git a/Project/Dialog/fLogin.Designer.cs b/Project/Dialog/fLogin.Designer.cs index fad6595..189c55c 100644 --- a/Project/Dialog/fLogin.Designer.cs +++ b/Project/Dialog/fLogin.Designer.cs @@ -28,166 +28,164 @@ /// private void InitializeComponent() { - 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.cmbDept = new System.Windows.Forms.ComboBox(); - this.label3 = new System.Windows.Forms.Label(); - this.linkLabel2 = new System.Windows.Forms.LinkLabel(); - 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(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.panel1.SuspendLayout(); - this.panel2.SuspendLayout(); - this.SuspendLayout(); - // - // pictureBox1 - // - this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(295, 25); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(80, 80); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; - this.pictureBox1.TabIndex = 3; - this.pictureBox1.TabStop = false; - // - // panel1 - // - this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244))))); - this.panel1.Controls.Add(this.cmbDept); - this.panel1.Controls.Add(this.label3); - this.panel1.Controls.Add(this.linkLabel2); - this.panel1.Controls.Add(this.tbID); - this.panel1.Controls.Add(this.label2); - this.panel1.Controls.Add(this.label1); - this.panel1.Controls.Add(this.tbPW); - this.panel1.Controls.Add(this.pictureBox1); - 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(675, 377); - this.panel1.TabIndex = 0; - // - // 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(16, 136); - this.cmbDept.Name = "cmbDept"; - this.cmbDept.Size = new System.Drawing.Size(645, 41); - this.cmbDept.TabIndex = 9; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.label3.ForeColor = System.Drawing.Color.Gray; - this.label3.Location = new System.Drawing.Point(13, 119); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(31, 15); - this.label3.TabIndex = 8; - this.label3.Text = "부서"; - // - // linkLabel2 - // - this.linkLabel2.AutoSize = true; - this.linkLabel2.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.linkLabel2.ForeColor = System.Drawing.Color.DodgerBlue; - this.linkLabel2.LinkColor = System.Drawing.Color.DodgerBlue; - this.linkLabel2.Location = new System.Drawing.Point(13, 335); - this.linkLabel2.Name = "linkLabel2"; - this.linkLabel2.Size = new System.Drawing.Size(243, 15); - this.linkLabel2.TabIndex = 7; - this.linkLabel2.TabStop = true; - this.linkLabel2.Text = "문의 ) Chickyun.kim@amkor.co.kr, T.8567"; - this.linkLabel2.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel2_LinkClicked); - // - // tbID - // - this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F); - this.tbID.FormattingEnabled = true; - this.tbID.Location = new System.Drawing.Point(16, 213); - this.tbID.Name = "tbID"; - this.tbID.Size = new System.Drawing.Size(645, 41); - this.tbID.TabIndex = 3; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F); - this.label2.ForeColor = System.Drawing.Color.Gray; - this.label2.Location = new System.Drawing.Point(13, 269); - this.label2.Name = "label2"; - 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("맑은 고딕", 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(13, 196); - this.label1.Name = "label1"; - 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(16, 287); - this.tbPW.Name = "tbPW"; - this.tbPW.PasswordChar = '●'; - this.tbPW.Size = new System.Drawing.Size(645, 40); - this.tbPW.TabIndex = 5; - this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // panel2 - // - 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, 377); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(675, 34); - this.panel2.TabIndex = 6; - // - // btLogin - // - 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(675, 34); - this.btLogin.TabIndex = 0; - this.btLogin.Text = "접속"; - this.btLogin.UseVisualStyleBackColor = true; - this.btLogin.Click += new System.EventHandler(this.button1_Click); - // - // fLogin - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.BackColor = System.Drawing.Color.OrangeRed; - this.ClientSize = new System.Drawing.Size(675, 411); - 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))); - this.MaximizeBox = false; - this.MinimizeBox = false; - this.Name = "fLogin"; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "사용자확인"; - this.Load += new System.EventHandler(this.fLogin_Load); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.panel1.ResumeLayout(false); - this.panel1.PerformLayout(); - this.panel2.ResumeLayout(false); - this.ResumeLayout(false); + 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.cmbDept = new System.Windows.Forms.ComboBox(); + this.label3 = new System.Windows.Forms.Label(); + 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.label4 = new System.Windows.Forms.Label(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); + this.pictureBox1.Location = new System.Drawing.Point(295, 25); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(80, 80); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize; + this.pictureBox1.TabIndex = 3; + this.pictureBox1.TabStop = false; + // + // panel1 + // + this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(245)))), ((int)(((byte)(245)))), ((int)(((byte)(244))))); + this.panel1.Controls.Add(this.label4); + 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); + this.panel1.Controls.Add(this.tbPW); + this.panel1.Controls.Add(this.pictureBox1); + 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(675, 377); + this.panel1.TabIndex = 0; + // + // 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(16, 136); + this.cmbDept.Name = "cmbDept"; + this.cmbDept.Size = new System.Drawing.Size(645, 41); + this.cmbDept.TabIndex = 9; + this.cmbDept.SelectedIndexChanged += new System.EventHandler(this.cmbDept_SelectedIndexChanged); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label3.ForeColor = System.Drawing.Color.Gray; + this.label3.Location = new System.Drawing.Point(13, 119); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(31, 15); + this.label3.TabIndex = 8; + this.label3.Text = "부서"; + // + // tbID + // + this.tbID.Font = new System.Drawing.Font("Calibri", 20.25F); + this.tbID.FormattingEnabled = true; + this.tbID.Location = new System.Drawing.Point(16, 213); + this.tbID.Name = "tbID"; + this.tbID.Size = new System.Drawing.Size(645, 41); + this.tbID.TabIndex = 3; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.label2.ForeColor = System.Drawing.Color.Gray; + this.label2.Location = new System.Drawing.Point(13, 269); + this.label2.Name = "label2"; + 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("맑은 고딕", 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(13, 196); + this.label1.Name = "label1"; + 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(16, 287); + this.tbPW.Name = "tbPW"; + this.tbPW.PasswordChar = '●'; + this.tbPW.Size = new System.Drawing.Size(645, 40); + this.tbPW.TabIndex = 5; + this.tbPW.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // panel2 + // + 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, 377); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(675, 34); + this.panel2.TabIndex = 6; + // + // btLogin + // + 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(675, 34); + this.btLogin.TabIndex = 0; + this.btLogin.Text = "접속"; + this.btLogin.UseVisualStyleBackColor = true; + this.btLogin.Click += new System.EventHandler(this.button1_Click); + // + // label4 + // + this.label4.AutoSize = true; + this.label4.Font = new System.Drawing.Font("맑은 고딕", 9F); + this.label4.ForeColor = System.Drawing.Color.Teal; + this.label4.Location = new System.Drawing.Point(13, 342); + this.label4.Name = "label4"; + this.label4.Size = new System.Drawing.Size(243, 15); + this.label4.TabIndex = 10; + this.label4.Text = "문의 ) Chickyun.kim@amkor.co.kr, T.8567"; + // + // fLogin + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.BackColor = System.Drawing.Color.OrangeRed; + this.ClientSize = new System.Drawing.Size(675, 411); + 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))); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "fLogin"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "사용자확인"; + this.Load += new System.EventHandler(this.fLogin_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + this.ResumeLayout(false); } @@ -201,8 +199,8 @@ private System.Windows.Forms.Label label1; private System.Windows.Forms.Label label2; private System.Windows.Forms.ComboBox tbID; - private System.Windows.Forms.LinkLabel linkLabel2; private System.Windows.Forms.ComboBox cmbDept; private System.Windows.Forms.Label label3; - } + private System.Windows.Forms.Label label4; + } } \ No newline at end of file diff --git a/Project/Dialog/fLogin.cs b/Project/Dialog/fLogin.cs index 6b57cec..8684e8c 100644 --- a/Project/Dialog/fLogin.cs +++ b/Project/Dialog/fLogin.cs @@ -378,5 +378,26 @@ namespace Project.Dialog { FCOMMON.Util.RunExplorer("mailto:chikyun.kim@amkor.co.kr"); } + + private void cmbDept_SelectedIndexChanged(object sender, EventArgs e) + { + //부서명이 변경되었다 + label4.Text = "문의) 정보없음(?)"; + var sel = cmbDept.SelectedItem as DataRowView; + if (sel == null) return; + var dr = sel.Row as dsMSSQL.UserGroupRow; + if (dr == null) return; + + var admin = dr.managerinfo; + if (string.IsNullOrEmpty(admin)) + admin = "--"; + + var dev = dr.devinfo; + if (string.IsNullOrEmpty(dev)) + dev = "chikyun.kim@amkor.co.kr(T8567)"; + + label4.Text = $"문의) 관리:{admin},개발:{dev}"; + + } } } diff --git a/Project/dsMSSQL.Designer.cs b/Project/dsMSSQL.Designer.cs index bae509a..9399bd4 100644 --- a/Project/dsMSSQL.Designer.cs +++ b/Project/dsMSSQL.Designer.cs @@ -2874,6 +2874,12 @@ namespace Project { private global::System.Data.DataColumn columnpermission; + private global::System.Data.DataColumn columnadvkisul; + + private global::System.Data.DataColumn columnmanagerinfo; + + private global::System.Data.DataColumn columndevinfo; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public UserGroupDataTable() { @@ -2947,6 +2953,30 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn advkisulColumn { + get { + return this.columnadvkisul; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn managerinfoColumn { + get { + return this.columnmanagerinfo; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn devinfoColumn { + get { + return this.columndevinfo; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.Browsable(false)] @@ -2984,14 +3014,17 @@ namespace Project { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public UserGroupRow AddUserGroupRow(string dept, string gcode, string path_kj, bool advpurchase, int permission) { + public UserGroupRow AddUserGroupRow(string dept, string gcode, string path_kj, bool advpurchase, int permission, bool advkisul, string managerinfo, string devinfo) { UserGroupRow rowUserGroupRow = ((UserGroupRow)(this.NewRow())); object[] columnValuesArray = new object[] { dept, gcode, path_kj, advpurchase, - permission}; + permission, + advkisul, + managerinfo, + devinfo}; rowUserGroupRow.ItemArray = columnValuesArray; this.Rows.Add(rowUserGroupRow); return rowUserGroupRow; @@ -3026,6 +3059,9 @@ namespace Project { this.columnpath_kj = base.Columns["path_kj"]; this.columnadvpurchase = base.Columns["advpurchase"]; this.columnpermission = base.Columns["permission"]; + this.columnadvkisul = base.Columns["advkisul"]; + this.columnmanagerinfo = base.Columns["managerinfo"]; + this.columndevinfo = base.Columns["devinfo"]; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -3041,6 +3077,12 @@ namespace Project { 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.columnadvkisul = new global::System.Data.DataColumn("advkisul", typeof(bool), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnadvkisul); + this.columnmanagerinfo = new global::System.Data.DataColumn("managerinfo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnmanagerinfo); + this.columndevinfo = new global::System.Data.DataColumn("devinfo", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columndevinfo); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { this.columndept}, true)); this.columndept.AllowDBNull = false; @@ -3048,6 +3090,8 @@ namespace Project { this.columndept.MaxLength = 100; this.columngcode.MaxLength = 10; this.columnpath_kj.MaxLength = 100; + this.columnmanagerinfo.MaxLength = 255; + this.columndevinfo.MaxLength = 255; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -7086,6 +7130,54 @@ namespace Project { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool advkisul { + get { + try { + return ((bool)(this[this.tableUserGroup.advkisulColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("\'UserGroup\' 테이블의 \'advkisul\' 열의 값이 DBNull입니다.", e); + } + } + set { + this[this.tableUserGroup.advkisulColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string managerinfo { + get { + if (this.IsmanagerinfoNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableUserGroup.managerinfoColumn])); + } + } + set { + this[this.tableUserGroup.managerinfoColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string devinfo { + get { + if (this.IsdevinfoNull()) { + return string.Empty; + } + else { + return ((string)(this[this.tableUserGroup.devinfoColumn])); + } + } + set { + this[this.tableUserGroup.devinfoColumn] = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsgcodeNull() { @@ -7133,6 +7225,42 @@ namespace Project { public void SetpermissionNull() { this[this.tableUserGroup.permissionColumn] = global::System.Convert.DBNull; } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsadvkisulNull() { + return this.IsNull(this.tableUserGroup.advkisulColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetadvkisulNull() { + this[this.tableUserGroup.advkisulColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsmanagerinfoNull() { + return this.IsNull(this.tableUserGroup.managerinfoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetmanagerinfoNull() { + this[this.tableUserGroup.managerinfoColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsdevinfoNull() { + return this.IsNull(this.tableUserGroup.devinfoColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetdevinfoNull() { + this[this.tableUserGroup.devinfoColumn] = global::System.Convert.DBNull; + } } /// @@ -13322,10 +13450,13 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant, grp2 FROM Line tableMapping.ColumnMappings.Add("path_kj", "path_kj"); tableMapping.ColumnMappings.Add("advpurchase", "advpurchase"); tableMapping.ColumnMappings.Add("permission", "permission"); + tableMapping.ColumnMappings.Add("advkisul", "advkisul"); + tableMapping.ColumnMappings.Add("managerinfo", "managerinfo"); + tableMapping.ColumnMappings.Add("devinfo", "devinfo"); 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.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)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo)))"; 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, "", "", "")); @@ -13336,27 +13467,38 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant, grp2 FROM Line 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.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_advkisul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_advkisul", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_managerinfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_devinfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", 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.CommandText = @"INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [advpurchase], [permission], [advkisul], [managerinfo], [devinfo]) VALUES (@dept, @gcode, @path_kj, @advpurchase, @permission, @advkisul, @managerinfo, @devinfo); +SELECT dept, gcode, path_kj, advpurchase, permission, advkisul, managerinfo, devinfo 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.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@advkisul", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", 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.CommandText = @"UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [advpurchase] = @advpurchase, [permission] = @permission, [advkisul] = @advkisul, [managerinfo] = @managerinfo, [devinfo] = @devinfo 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)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo))); +SELECT dept, gcode, path_kj, advpurchase, permission, advkisul, managerinfo, devinfo 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("@advkisul", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", 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, "", "", "")); @@ -13366,6 +13508,12 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept 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, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_advkisul", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_advkisul", global::System.Data.SqlDbType.Bit, 0, global::System.Data.ParameterDirection.Input, 0, 0, "advkisul", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_managerinfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_managerinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "managerinfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_devinfo", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Original, true, null, "", "", "")); + this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_devinfo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "devinfo", global::System.Data.DataRowVersion.Original, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -13381,8 +13529,9 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept 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].CommandText = "SELECT dept, gcode, path_kj, advpurchase, permission, advkisul, managerinfo, dev" + + "info\r\nFROM UserGroup\r\nWHERE (ISNULL(gcode, \'\') <> \'\') AND (ISNULL(permissio" + + "n, 0) > 0)"; this._commandCollection[0].CommandType = global::System.Data.CommandType.Text; } @@ -13443,7 +13592,7 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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) { + public virtual int Delete(string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable Original_advpurchase, global::System.Nullable Original_permission, global::System.Nullable Original_advkisul, string Original_managerinfo, string Original_devinfo) { if ((Original_dept == null)) { throw new global::System.ArgumentNullException("Original_dept"); } @@ -13482,6 +13631,30 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept this.Adapter.DeleteCommand.Parameters[7].Value = ((object)(1)); this.Adapter.DeleteCommand.Parameters[8].Value = global::System.DBNull.Value; } + if ((Original_advkisul.HasValue == true)) { + this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(0)); + this.Adapter.DeleteCommand.Parameters[10].Value = ((bool)(Original_advkisul.Value)); + } + else { + this.Adapter.DeleteCommand.Parameters[9].Value = ((object)(1)); + this.Adapter.DeleteCommand.Parameters[10].Value = global::System.DBNull.Value; + } + if ((Original_managerinfo == 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_managerinfo)); + } + if ((Original_devinfo == 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_devinfo)); + } 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)) { @@ -13502,7 +13675,7 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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) { + public virtual int Insert(string dept, string gcode, string path_kj, global::System.Nullable advpurchase, global::System.Nullable permission, global::System.Nullable advkisul, string managerinfo, string devinfo) { if ((dept == null)) { throw new global::System.ArgumentNullException("dept"); } @@ -13533,6 +13706,24 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept else { this.Adapter.InsertCommand.Parameters[4].Value = global::System.DBNull.Value; } + if ((advkisul.HasValue == true)) { + this.Adapter.InsertCommand.Parameters[5].Value = ((bool)(advkisul.Value)); + } + else { + this.Adapter.InsertCommand.Parameters[5].Value = global::System.DBNull.Value; + } + if ((managerinfo == null)) { + this.Adapter.InsertCommand.Parameters[6].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[6].Value = ((string)(managerinfo)); + } + if ((devinfo == null)) { + this.Adapter.InsertCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.InsertCommand.Parameters[7].Value = ((string)(devinfo)); + } 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)) { @@ -13553,7 +13744,23 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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) { + public virtual int Update( + string dept, + string gcode, + string path_kj, + global::System.Nullable advpurchase, + global::System.Nullable permission, + global::System.Nullable advkisul, + string managerinfo, + string devinfo, + string Original_dept, + string Original_gcode, + string Original_path_kj, + global::System.Nullable Original_advpurchase, + global::System.Nullable Original_permission, + global::System.Nullable Original_advkisul, + string Original_managerinfo, + string Original_devinfo) { if ((dept == null)) { throw new global::System.ArgumentNullException("dept"); } @@ -13584,43 +13791,85 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept else { this.Adapter.UpdateCommand.Parameters[4].Value = global::System.DBNull.Value; } + if ((advkisul.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[5].Value = ((bool)(advkisul.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[5].Value = global::System.DBNull.Value; + } + if ((managerinfo == null)) { + this.Adapter.UpdateCommand.Parameters[6].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[6].Value = ((string)(managerinfo)); + } + if ((devinfo == null)) { + this.Adapter.UpdateCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(devinfo)); + } if ((Original_dept == null)) { throw new global::System.ArgumentNullException("Original_dept"); } else { - this.Adapter.UpdateCommand.Parameters[5].Value = ((string)(Original_dept)); + this.Adapter.UpdateCommand.Parameters[8].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; + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[10].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[6].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[7].Value = ((string)(Original_gcode)); + this.Adapter.UpdateCommand.Parameters[9].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[10].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; + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[12].Value = global::System.DBNull.Value; } else { - this.Adapter.UpdateCommand.Parameters[8].Value = ((object)(0)); - this.Adapter.UpdateCommand.Parameters[9].Value = ((string)(Original_path_kj)); + this.Adapter.UpdateCommand.Parameters[11].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[12].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)); + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[14].Value = ((bool)(Original_advpurchase.Value)); } else { - this.Adapter.UpdateCommand.Parameters[10].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[11].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[13].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[14].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)); + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[16].Value = ((int)(Original_permission.Value)); } else { - this.Adapter.UpdateCommand.Parameters[12].Value = ((object)(1)); - this.Adapter.UpdateCommand.Parameters[13].Value = global::System.DBNull.Value; + this.Adapter.UpdateCommand.Parameters[15].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[16].Value = global::System.DBNull.Value; + } + if ((Original_advkisul.HasValue == true)) { + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[18].Value = ((bool)(Original_advkisul.Value)); + } + else { + this.Adapter.UpdateCommand.Parameters[17].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[18].Value = global::System.DBNull.Value; + } + if ((Original_managerinfo == null)) { + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[20].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[19].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[20].Value = ((string)(Original_managerinfo)); + } + if ((Original_devinfo == null)) { + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(1)); + this.Adapter.UpdateCommand.Parameters[22].Value = global::System.DBNull.Value; + } + else { + this.Adapter.UpdateCommand.Parameters[21].Value = ((object)(0)); + this.Adapter.UpdateCommand.Parameters[22].Value = ((string)(Original_devinfo)); } global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State; if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open) @@ -13642,8 +13891,8 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.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); + public virtual int Update(string gcode, string path_kj, global::System.Nullable advpurchase, global::System.Nullable permission, global::System.Nullable advkisul, string managerinfo, string devinfo, string Original_dept, string Original_gcode, string Original_path_kj, global::System.Nullable Original_advpurchase, global::System.Nullable Original_permission, global::System.Nullable Original_advkisul, string Original_managerinfo, string Original_devinfo) { + return this.Update(Original_dept, gcode, path_kj, advpurchase, permission, advkisul, managerinfo, devinfo, Original_dept, Original_gcode, Original_path_kj, Original_advpurchase, Original_permission, Original_advkisul, Original_managerinfo, Original_devinfo); } } diff --git a/Project/dsMSSQL.xsd b/Project/dsMSSQL.xsd index 441822e..aa074f2 100644 --- a/Project/dsMSSQL.xsd +++ b/Project/dsMSSQL.xsd @@ -690,10 +690,10 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant, grp2 FROM Line - + - 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))) + 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)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo))) @@ -704,25 +704,34 @@ SELECT idx, code, team, part, [except], memo, wuid, wdate, plant, grp2 FROM Line + + + + + + - 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) + INSERT INTO [UserGroup] ([dept], [gcode], [path_kj], [advpurchase], [permission], [advkisul], [managerinfo], [devinfo]) VALUES (@dept, @gcode, @path_kj, @advpurchase, @permission, @advkisul, @managerinfo, @devinfo); +SELECT dept, gcode, path_kj, advpurchase, permission, advkisul, managerinfo, devinfo FROM UserGroup WHERE (dept = @dept) + + + - - SELECT dept, gcode, path_kj, advpurchase, permission + + SELECT dept, gcode, path_kj, advpurchase, permission, advkisul, managerinfo, devinfo FROM UserGroup WHERE (ISNULL(gcode, '') <> '') AND (ISNULL(permission, 0) > 0) @@ -730,14 +739,17 @@ 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) + UPDATE [UserGroup] SET [dept] = @dept, [gcode] = @gcode, [path_kj] = @path_kj, [advpurchase] = @advpurchase, [permission] = @permission, [advkisul] = @advkisul, [managerinfo] = @managerinfo, [devinfo] = @devinfo 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)) AND ((@IsNull_advkisul = 1 AND [advkisul] IS NULL) OR ([advkisul] = @Original_advkisul)) AND ((@IsNull_managerinfo = 1 AND [managerinfo] IS NULL) OR ([managerinfo] = @Original_managerinfo)) AND ((@IsNull_devinfo = 1 AND [devinfo] IS NULL) OR ([devinfo] = @Original_devinfo))); +SELECT dept, gcode, path_kj, advpurchase, permission, advkisul, managerinfo, devinfo FROM UserGroup WHERE (dept = @dept) + + + @@ -747,6 +759,12 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept + + + + + + @@ -758,6 +776,9 @@ SELECT dept, gcode, path_kj, advpurchase, permission FROM UserGroup WHERE (dept + + + @@ -1348,7 +1369,7 @@ WHERE (idx = @idx) - + @@ -1489,7 +1510,7 @@ WHERE (idx = @idx) - + @@ -1560,7 +1581,7 @@ WHERE (idx = @idx) - + @@ -1618,7 +1639,7 @@ WHERE (idx = @idx) - + @@ -1688,7 +1709,7 @@ WHERE (idx = @idx) - + @@ -1746,7 +1767,7 @@ WHERE (idx = @idx) - + @@ -1772,10 +1793,25 @@ WHERE (idx = @idx) + + + + + + + + + + + + + + + - + @@ -1891,7 +1927,7 @@ WHERE (idx = @idx) - + @@ -1930,7 +1966,7 @@ WHERE (idx = @idx) - + @@ -2072,7 +2108,7 @@ WHERE (idx = @idx) - +