From ae92e22f8c570046700f85e5537a7b50b857caf4 Mon Sep 17 00:00:00 2001 From: chi Date: Wed, 14 Oct 2020 17:46:22 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AC=EB=A7=A4=20hold=20=EC=83=89=EC=83=81?= =?UTF-8?q?=20=EC=A7=80=EC=A0=95=20=3D>=20hotpink?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/DataClasses1.dbml | 36 + Project/DataClasses1.dbml.layout | 20 +- Project/DataClasses1.designer.cs | 770 ++++++++++++++++++ Project/EETGW.csproj | 9 + Project/_Common/fUserList.Designer.cs | 247 +++--- Project/_Common/fUserList.cs | 26 +- Project/_Common/fUserList.resx | 48 +- SubProject/FEQ0000/Purchase/fPurchase.cs | 3 + .../FEQ0000/Purchase/fPurchase_excelimport.cs | 36 +- 9 files changed, 1025 insertions(+), 170 deletions(-) diff --git a/Project/DataClasses1.dbml b/Project/DataClasses1.dbml index eff27d6..4483b3e 100644 --- a/Project/DataClasses1.dbml +++ b/Project/DataClasses1.dbml @@ -31,4 +31,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + +
\ No newline at end of file diff --git a/Project/DataClasses1.dbml.layout b/Project/DataClasses1.dbml.layout index ff833d2..7785523 100644 --- a/Project/DataClasses1.dbml.layout +++ b/Project/DataClasses1.dbml.layout @@ -2,16 +2,28 @@ - + - + - + - + + + + + + + + + + + + + diff --git a/Project/DataClasses1.designer.cs b/Project/DataClasses1.designer.cs index dcfe32c..a749871 100644 --- a/Project/DataClasses1.designer.cs +++ b/Project/DataClasses1.designer.cs @@ -33,6 +33,12 @@ namespace Project partial void InsertUserGroup(UserGroup instance); partial void UpdateUserGroup(UserGroup instance); partial void DeleteUserGroup(UserGroup instance); + partial void InsertUsers(Users instance); + partial void UpdateUsers(Users instance); + partial void DeleteUsers(Users instance); + partial void InsertEETGW_GroupUser(EETGW_GroupUser instance); + partial void UpdateEETGW_GroupUser(EETGW_GroupUser instance); + partial void DeleteEETGW_GroupUser(EETGW_GroupUser instance); #endregion public DataClasses1DataContext() : @@ -80,6 +86,22 @@ namespace Project return this.GetTable(); } } + + public System.Data.Linq.Table Users + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table EETGW_GroupUser + { + get + { + return this.GetTable(); + } + } } [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.UserGroup")] @@ -572,5 +594,753 @@ namespace Project } } } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Users")] + public partial class Users : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _id; + + private string _gcode; + + private string _password; + + private string _nameE; + + private string _name; + + private string _dept; + + private string _grade; + + private string _email; + + private System.Nullable _level; + + private string _indate; + + private string _outdate; + + private string _tel; + + private string _hp; + + private string _place; + + private string _ads_employNo; + + private string _ads_title; + + private string _ads_created; + + private string _memo; + + private string _wuid; + + private System.DateTime _wdate; + + private string _processs; + + #region 확장성 메서드 정의 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnidChanging(string value); + partial void OnidChanged(); + partial void OngcodeChanging(string value); + partial void OngcodeChanged(); + partial void OnpasswordChanging(string value); + partial void OnpasswordChanged(); + partial void OnnameEChanging(string value); + partial void OnnameEChanged(); + partial void OnnameChanging(string value); + partial void OnnameChanged(); + partial void OndeptChanging(string value); + partial void OndeptChanged(); + partial void OngradeChanging(string value); + partial void OngradeChanged(); + partial void OnemailChanging(string value); + partial void OnemailChanged(); + partial void OnlevelChanging(System.Nullable value); + partial void OnlevelChanged(); + partial void OnindateChanging(string value); + partial void OnindateChanged(); + partial void OnoutdateChanging(string value); + partial void OnoutdateChanged(); + partial void OntelChanging(string value); + partial void OntelChanged(); + partial void OnhpChanging(string value); + partial void OnhpChanged(); + partial void OnplaceChanging(string value); + partial void OnplaceChanged(); + partial void Onads_employNoChanging(string value); + partial void Onads_employNoChanged(); + partial void Onads_titleChanging(string value); + partial void Onads_titleChanged(); + partial void Onads_createdChanging(string value); + partial void Onads_createdChanged(); + partial void OnmemoChanging(string value); + partial void OnmemoChanged(); + partial void OnwuidChanging(string value); + partial void OnwuidChanged(); + partial void OnwdateChanging(System.DateTime value); + partial void OnwdateChanged(); + partial void OnprocesssChanging(string value); + partial void OnprocesssChanged(); + #endregion + + public Users() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_id", DbType="VarChar(20) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string id + { + get + { + return this._id; + } + set + { + if ((this._id != value)) + { + this.OnidChanging(value); + this.SendPropertyChanging(); + this._id = value; + this.SendPropertyChanged("id"); + this.OnidChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_gcode", DbType="VarChar(10)")] + public string gcode + { + get + { + return this._gcode; + } + set + { + if ((this._gcode != value)) + { + this.OngcodeChanging(value); + this.SendPropertyChanging(); + this._gcode = value; + this.SendPropertyChanged("gcode"); + this.OngcodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_password", DbType="VarChar(50)")] + public string password + { + get + { + return this._password; + } + set + { + if ((this._password != value)) + { + this.OnpasswordChanging(value); + this.SendPropertyChanging(); + this._password = value; + this.SendPropertyChanged("password"); + this.OnpasswordChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_nameE", DbType="NVarChar(100)")] + public string nameE + { + get + { + return this._nameE; + } + set + { + if ((this._nameE != value)) + { + this.OnnameEChanging(value); + this.SendPropertyChanging(); + this._nameE = value; + this.SendPropertyChanged("nameE"); + this.OnnameEChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_name", DbType="NVarChar(100)")] + public string name + { + get + { + return this._name; + } + set + { + if ((this._name != value)) + { + this.OnnameChanging(value); + this.SendPropertyChanging(); + this._name = value; + this.SendPropertyChanged("name"); + this.OnnameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_dept", DbType="VarChar(100)")] + public string dept + { + get + { + return this._dept; + } + set + { + if ((this._dept != value)) + { + this.OndeptChanging(value); + this.SendPropertyChanging(); + this._dept = value; + this.SendPropertyChanged("dept"); + this.OndeptChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_grade", DbType="VarChar(10)")] + public string grade + { + get + { + return this._grade; + } + set + { + if ((this._grade != value)) + { + this.OngradeChanging(value); + this.SendPropertyChanging(); + this._grade = value; + this.SendPropertyChanged("grade"); + this.OngradeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_email", DbType="VarChar(100)")] + public string email + { + get + { + return this._email; + } + set + { + if ((this._email != value)) + { + this.OnemailChanging(value); + this.SendPropertyChanging(); + this._email = value; + this.SendPropertyChanged("email"); + this.OnemailChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="[level]", Storage="_level", DbType="SmallInt")] + public System.Nullable level + { + get + { + return this._level; + } + set + { + if ((this._level != value)) + { + this.OnlevelChanging(value); + this.SendPropertyChanging(); + this._level = value; + this.SendPropertyChanged("level"); + this.OnlevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_indate", DbType="VarChar(20)")] + public string indate + { + get + { + return this._indate; + } + set + { + if ((this._indate != value)) + { + this.OnindateChanging(value); + this.SendPropertyChanging(); + this._indate = value; + this.SendPropertyChanged("indate"); + this.OnindateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_outdate", DbType="VarChar(20)")] + public string outdate + { + get + { + return this._outdate; + } + set + { + if ((this._outdate != value)) + { + this.OnoutdateChanging(value); + this.SendPropertyChanging(); + this._outdate = value; + this.SendPropertyChanged("outdate"); + this.OnoutdateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_tel", DbType="VarChar(20)")] + public string tel + { + get + { + return this._tel; + } + set + { + if ((this._tel != value)) + { + this.OntelChanging(value); + this.SendPropertyChanging(); + this._tel = value; + this.SendPropertyChanged("tel"); + this.OntelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_hp", DbType="VarChar(20)")] + public string hp + { + get + { + return this._hp; + } + set + { + if ((this._hp != value)) + { + this.OnhpChanging(value); + this.SendPropertyChanging(); + this._hp = value; + this.SendPropertyChanged("hp"); + this.OnhpChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_place", DbType="VarChar(100)")] + public string place + { + get + { + return this._place; + } + set + { + if ((this._place != value)) + { + this.OnplaceChanging(value); + this.SendPropertyChanging(); + this._place = value; + this.SendPropertyChanged("place"); + this.OnplaceChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ads_employNo", DbType="VarChar(50)")] + public string ads_employNo + { + get + { + return this._ads_employNo; + } + set + { + if ((this._ads_employNo != value)) + { + this.Onads_employNoChanging(value); + this.SendPropertyChanging(); + this._ads_employNo = value; + this.SendPropertyChanged("ads_employNo"); + this.Onads_employNoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ads_title", DbType="NVarChar(100)")] + public string ads_title + { + get + { + return this._ads_title; + } + set + { + if ((this._ads_title != value)) + { + this.Onads_titleChanging(value); + this.SendPropertyChanging(); + this._ads_title = value; + this.SendPropertyChanged("ads_title"); + this.Onads_titleChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ads_created", DbType="VarChar(50)")] + public string ads_created + { + get + { + return this._ads_created; + } + set + { + if ((this._ads_created != value)) + { + this.Onads_createdChanging(value); + this.SendPropertyChanging(); + this._ads_created = value; + this.SendPropertyChanged("ads_created"); + this.Onads_createdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_memo", DbType="NVarChar(255)")] + public string memo + { + get + { + return this._memo; + } + set + { + if ((this._memo != value)) + { + this.OnmemoChanging(value); + this.SendPropertyChanging(); + this._memo = value; + this.SendPropertyChanged("memo"); + this.OnmemoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_wuid", DbType="VarChar(20) NOT NULL", CanBeNull=false)] + public string wuid + { + get + { + return this._wuid; + } + set + { + if ((this._wuid != value)) + { + this.OnwuidChanging(value); + this.SendPropertyChanging(); + this._wuid = value; + this.SendPropertyChanged("wuid"); + this.OnwuidChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_wdate", DbType="SmallDateTime NOT NULL")] + public System.DateTime wdate + { + get + { + return this._wdate; + } + set + { + if ((this._wdate != value)) + { + this.OnwdateChanging(value); + this.SendPropertyChanging(); + this._wdate = value; + this.SendPropertyChanged("wdate"); + this.OnwdateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_processs", DbType="NVarChar(100)")] + public string processs + { + get + { + return this._processs; + } + set + { + if ((this._processs != value)) + { + this.OnprocesssChanging(value); + this.SendPropertyChanging(); + this._processs = value; + this.SendPropertyChanged("processs"); + this.OnprocesssChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.EETGW_GroupUser")] + public partial class EETGW_GroupUser : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private int _idx; + + private string _gcode; + + private string _uid; + + private System.Nullable _level; + + private string _Process; + + private string _wuid; + + private System.DateTime _wdate; + + #region 확장성 메서드 정의 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnidxChanging(int value); + partial void OnidxChanged(); + partial void OngcodeChanging(string value); + partial void OngcodeChanged(); + partial void OnuidChanging(string value); + partial void OnuidChanged(); + partial void OnlevelChanging(System.Nullable value); + partial void OnlevelChanged(); + partial void OnProcessChanging(string value); + partial void OnProcessChanged(); + partial void OnwuidChanging(string value); + partial void OnwuidChanged(); + partial void OnwdateChanging(System.DateTime value); + partial void OnwdateChanged(); + #endregion + + public EETGW_GroupUser() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_idx", AutoSync=AutoSync.OnInsert, DbType="Int NOT NULL IDENTITY", IsPrimaryKey=true, IsDbGenerated=true)] + public int idx + { + get + { + return this._idx; + } + set + { + if ((this._idx != value)) + { + this.OnidxChanging(value); + this.SendPropertyChanging(); + this._idx = value; + this.SendPropertyChanged("idx"); + this.OnidxChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_gcode", DbType="VarChar(10) NOT NULL", CanBeNull=false)] + public string gcode + { + get + { + return this._gcode; + } + set + { + if ((this._gcode != value)) + { + this.OngcodeChanging(value); + this.SendPropertyChanging(); + this._gcode = value; + this.SendPropertyChanged("gcode"); + this.OngcodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_uid", DbType="VarChar(20) NOT NULL", CanBeNull=false)] + public string uid + { + get + { + return this._uid; + } + set + { + if ((this._uid != value)) + { + this.OnuidChanging(value); + this.SendPropertyChanging(); + this._uid = value; + this.SendPropertyChanged("uid"); + this.OnuidChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="[level]", Storage="_level", DbType="SmallInt")] + public System.Nullable level + { + get + { + return this._level; + } + set + { + if ((this._level != value)) + { + this.OnlevelChanging(value); + this.SendPropertyChanging(); + this._level = value; + this.SendPropertyChanged("level"); + this.OnlevelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Process", DbType="VarChar(50)")] + public string Process + { + get + { + return this._Process; + } + set + { + if ((this._Process != value)) + { + this.OnProcessChanging(value); + this.SendPropertyChanging(); + this._Process = value; + this.SendPropertyChanged("Process"); + this.OnProcessChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_wuid", DbType="VarChar(20) NOT NULL", CanBeNull=false)] + public string wuid + { + get + { + return this._wuid; + } + set + { + if ((this._wuid != value)) + { + this.OnwuidChanging(value); + this.SendPropertyChanging(); + this._wuid = value; + this.SendPropertyChanged("wuid"); + this.OnwuidChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_wdate", DbType="SmallDateTime NOT NULL")] + public System.DateTime wdate + { + get + { + return this._wdate; + } + set + { + if ((this._wdate != value)) + { + this.OnwdateChanging(value); + this.SendPropertyChanging(); + this._wdate = value; + this.SendPropertyChanged("wdate"); + this.OnwdateChanged(); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } } #pragma warning restore 1591 diff --git a/Project/EETGW.csproj b/Project/EETGW.csproj index aad7926..6c8948f 100644 --- a/Project/EETGW.csproj +++ b/Project/EETGW.csproj @@ -270,6 +270,12 @@ fNewPassword.cs + + Form + + + fAddNewUser.cs + Form @@ -347,6 +353,9 @@ fNewPassword.cs + + fAddNewUser.cs + fUserInfo.cs diff --git a/Project/_Common/fUserList.Designer.cs b/Project/_Common/fUserList.Designer.cs index e33f607..1776548 100644 --- a/Project/_Common/fUserList.Designer.cs +++ b/Project/_Common/fUserList.Designer.cs @@ -30,8 +30,8 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fUserList)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); this.dsMSSQL = new Project.dsMSSQL(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new Project.dsMSSQLTableAdapters.UsersTableAdapter(); @@ -53,20 +53,6 @@ this.btDevel = new System.Windows.Forms.ToolStripDropDownButton(); this.한글이름분리ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.dv1 = new System.Windows.Forms.DataGridView(); - this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.autoResizeColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); - this.iDChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.passwordChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); - this.mailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStrip1 = new System.Windows.Forms.ToolStrip(); - this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); - this.cmbdept = new System.Windows.Forms.ToolStripComboBox(); - this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); - this.tbProcess = new System.Windows.Forms.ToolStripTextBox(); - this.btRef = new System.Windows.Forms.ToolStripButton(); - this.textBox1 = new System.Windows.Forms.TextBox(); this.dvc_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.processs = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dvc_level = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -81,6 +67,20 @@ this.hpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.placeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.autoResizeColumnToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); + this.iDChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.passwordChangeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.mailToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStrip1 = new System.Windows.Forms.ToolStrip(); + this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); + this.cmbdept = new System.Windows.Forms.ToolStripComboBox(); + this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel(); + this.tbProcess = new System.Windows.Forms.ToolStripTextBox(); + this.btRef = new System.Windows.Forms.ToolStripButton(); + this.textBox1 = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -107,6 +107,7 @@ // tam // this.tam.BackupDataSetBeforeUpdate = false; + this.tam.EETGW_GroupUserTableAdapter = null; this.tam.InventoryTableAdapter = null; this.tam.ItemsTableAdapter = null; this.tam.LineCodeTableAdapter = null; @@ -118,10 +119,10 @@ // // bn // - this.bn.AddNewItem = this.bindingNavigatorAddNewItem; + this.bn.AddNewItem = null; this.bn.BindingSource = this.bs; this.bn.CountItem = this.bindingNavigatorCountItem; - this.bn.DeleteItem = this.bindingNavigatorDeleteItem; + this.bn.DeleteItem = null; this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, @@ -156,6 +157,7 @@ this.bindingNavigatorAddNewItem.RightToLeftAutoMirrorImage = true; this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22); this.bindingNavigatorAddNewItem.Text = "Add(&A)"; + this.bindingNavigatorAddNewItem.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click); // // bindingNavigatorCountItem // @@ -171,6 +173,7 @@ this.bindingNavigatorDeleteItem.RightToLeftAutoMirrorImage = true; this.bindingNavigatorDeleteItem.Size = new System.Drawing.Size(78, 22); this.bindingNavigatorDeleteItem.Text = "Delete(&D)"; + this.bindingNavigatorDeleteItem.Click += new System.EventHandler(this.bindingNavigatorDeleteItem_Click); // // bindingNavigatorMoveFirstItem // @@ -294,6 +297,110 @@ this.dv1.Size = new System.Drawing.Size(908, 494); this.dv1.TabIndex = 1; // + // dvc_id + // + this.dvc_id.DataPropertyName = "id"; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dvc_id.DefaultCellStyle = dataGridViewCellStyle3; + this.dvc_id.HeaderText = "ID"; + this.dvc_id.Name = "dvc_id"; + this.dvc_id.Width = 40; + // + // processs + // + this.processs.DataPropertyName = "processs"; + this.processs.HeaderText = "공정"; + this.processs.Name = "processs"; + // + // dvc_level + // + this.dvc_level.DataPropertyName = "level"; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); + this.dvc_level.DefaultCellStyle = dataGridViewCellStyle4; + this.dvc_level.HeaderText = "레벨"; + this.dvc_level.Name = "dvc_level"; + this.dvc_level.Width = 56; + // + // nameDataGridViewTextBoxColumn + // + this.nameDataGridViewTextBoxColumn.DataPropertyName = "name"; + this.nameDataGridViewTextBoxColumn.HeaderText = "성명"; + this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn"; + this.nameDataGridViewTextBoxColumn.Width = 62; + // + // nameEDataGridViewTextBoxColumn + // + this.nameEDataGridViewTextBoxColumn.DataPropertyName = "nameE"; + this.nameEDataGridViewTextBoxColumn.HeaderText = "성명(영문)"; + this.nameEDataGridViewTextBoxColumn.Name = "nameEDataGridViewTextBoxColumn"; + this.nameEDataGridViewTextBoxColumn.Width = 70; + // + // deptDataGridViewTextBoxColumn + // + this.deptDataGridViewTextBoxColumn.DataPropertyName = "dept"; + this.deptDataGridViewTextBoxColumn.HeaderText = "부서"; + this.deptDataGridViewTextBoxColumn.Name = "deptDataGridViewTextBoxColumn"; + this.deptDataGridViewTextBoxColumn.Visible = false; + this.deptDataGridViewTextBoxColumn.Width = 54; + // + // gradeDataGridViewTextBoxColumn + // + this.gradeDataGridViewTextBoxColumn.DataPropertyName = "grade"; + this.gradeDataGridViewTextBoxColumn.HeaderText = "직책"; + this.gradeDataGridViewTextBoxColumn.Name = "gradeDataGridViewTextBoxColumn"; + this.gradeDataGridViewTextBoxColumn.Width = 62; + // + // emailDataGridViewTextBoxColumn + // + this.emailDataGridViewTextBoxColumn.DataPropertyName = "email"; + this.emailDataGridViewTextBoxColumn.HeaderText = "email"; + this.emailDataGridViewTextBoxColumn.Name = "emailDataGridViewTextBoxColumn"; + this.emailDataGridViewTextBoxColumn.Width = 61; + // + // indateDataGridViewTextBoxColumn + // + this.indateDataGridViewTextBoxColumn.DataPropertyName = "indate"; + this.indateDataGridViewTextBoxColumn.HeaderText = "입사일"; + this.indateDataGridViewTextBoxColumn.Name = "indateDataGridViewTextBoxColumn"; + this.indateDataGridViewTextBoxColumn.Width = 64; + // + // outdateDataGridViewTextBoxColumn + // + this.outdateDataGridViewTextBoxColumn.DataPropertyName = "outdate"; + this.outdateDataGridViewTextBoxColumn.HeaderText = "퇴사일"; + this.outdateDataGridViewTextBoxColumn.Name = "outdateDataGridViewTextBoxColumn"; + this.outdateDataGridViewTextBoxColumn.Width = 71; + // + // telDataGridViewTextBoxColumn + // + this.telDataGridViewTextBoxColumn.DataPropertyName = "tel"; + this.telDataGridViewTextBoxColumn.HeaderText = "내선"; + this.telDataGridViewTextBoxColumn.Name = "telDataGridViewTextBoxColumn"; + this.telDataGridViewTextBoxColumn.Width = 43; + // + // hpDataGridViewTextBoxColumn + // + this.hpDataGridViewTextBoxColumn.DataPropertyName = "hp"; + this.hpDataGridViewTextBoxColumn.HeaderText = "전화"; + this.hpDataGridViewTextBoxColumn.Name = "hpDataGridViewTextBoxColumn"; + this.hpDataGridViewTextBoxColumn.Width = 44; + // + // placeDataGridViewTextBoxColumn + // + this.placeDataGridViewTextBoxColumn.DataPropertyName = "place"; + this.placeDataGridViewTextBoxColumn.HeaderText = "place"; + this.placeDataGridViewTextBoxColumn.Name = "placeDataGridViewTextBoxColumn"; + this.placeDataGridViewTextBoxColumn.Width = 61; + // + // memoDataGridViewTextBoxColumn + // + this.memoDataGridViewTextBoxColumn.DataPropertyName = "memo"; + this.memoDataGridViewTextBoxColumn.HeaderText = "비고"; + this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; + this.memoDataGridViewTextBoxColumn.Width = 66; + // // cm1 // this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { @@ -400,110 +507,6 @@ this.textBox1.Size = new System.Drawing.Size(908, 21); this.textBox1.TabIndex = 3; // - // dvc_id - // - this.dvc_id.DataPropertyName = "id"; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dvc_id.DefaultCellStyle = dataGridViewCellStyle1; - this.dvc_id.HeaderText = "ID"; - this.dvc_id.Name = "dvc_id"; - this.dvc_id.Width = 40; - // - // processs - // - this.processs.DataPropertyName = "processs"; - this.processs.HeaderText = "공정"; - this.processs.Name = "processs"; - // - // dvc_level - // - this.dvc_level.DataPropertyName = "level"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(192)))), ((int)(((byte)(192))))); - this.dvc_level.DefaultCellStyle = dataGridViewCellStyle2; - this.dvc_level.HeaderText = "레벨"; - this.dvc_level.Name = "dvc_level"; - this.dvc_level.Width = 56; - // - // nameDataGridViewTextBoxColumn - // - this.nameDataGridViewTextBoxColumn.DataPropertyName = "name"; - this.nameDataGridViewTextBoxColumn.HeaderText = "성명"; - this.nameDataGridViewTextBoxColumn.Name = "nameDataGridViewTextBoxColumn"; - this.nameDataGridViewTextBoxColumn.Width = 62; - // - // nameEDataGridViewTextBoxColumn - // - this.nameEDataGridViewTextBoxColumn.DataPropertyName = "nameE"; - this.nameEDataGridViewTextBoxColumn.HeaderText = "성명(영문)"; - this.nameEDataGridViewTextBoxColumn.Name = "nameEDataGridViewTextBoxColumn"; - this.nameEDataGridViewTextBoxColumn.Width = 70; - // - // deptDataGridViewTextBoxColumn - // - this.deptDataGridViewTextBoxColumn.DataPropertyName = "dept"; - this.deptDataGridViewTextBoxColumn.HeaderText = "부서"; - this.deptDataGridViewTextBoxColumn.Name = "deptDataGridViewTextBoxColumn"; - this.deptDataGridViewTextBoxColumn.Visible = false; - this.deptDataGridViewTextBoxColumn.Width = 54; - // - // gradeDataGridViewTextBoxColumn - // - this.gradeDataGridViewTextBoxColumn.DataPropertyName = "grade"; - this.gradeDataGridViewTextBoxColumn.HeaderText = "직책"; - this.gradeDataGridViewTextBoxColumn.Name = "gradeDataGridViewTextBoxColumn"; - this.gradeDataGridViewTextBoxColumn.Width = 62; - // - // emailDataGridViewTextBoxColumn - // - this.emailDataGridViewTextBoxColumn.DataPropertyName = "email"; - this.emailDataGridViewTextBoxColumn.HeaderText = "email"; - this.emailDataGridViewTextBoxColumn.Name = "emailDataGridViewTextBoxColumn"; - this.emailDataGridViewTextBoxColumn.Width = 61; - // - // indateDataGridViewTextBoxColumn - // - this.indateDataGridViewTextBoxColumn.DataPropertyName = "indate"; - this.indateDataGridViewTextBoxColumn.HeaderText = "입사일"; - this.indateDataGridViewTextBoxColumn.Name = "indateDataGridViewTextBoxColumn"; - this.indateDataGridViewTextBoxColumn.Width = 64; - // - // outdateDataGridViewTextBoxColumn - // - this.outdateDataGridViewTextBoxColumn.DataPropertyName = "outdate"; - this.outdateDataGridViewTextBoxColumn.HeaderText = "퇴사일"; - this.outdateDataGridViewTextBoxColumn.Name = "outdateDataGridViewTextBoxColumn"; - this.outdateDataGridViewTextBoxColumn.Width = 71; - // - // telDataGridViewTextBoxColumn - // - this.telDataGridViewTextBoxColumn.DataPropertyName = "tel"; - this.telDataGridViewTextBoxColumn.HeaderText = "내선"; - this.telDataGridViewTextBoxColumn.Name = "telDataGridViewTextBoxColumn"; - this.telDataGridViewTextBoxColumn.Width = 43; - // - // hpDataGridViewTextBoxColumn - // - this.hpDataGridViewTextBoxColumn.DataPropertyName = "hp"; - this.hpDataGridViewTextBoxColumn.HeaderText = "전화"; - this.hpDataGridViewTextBoxColumn.Name = "hpDataGridViewTextBoxColumn"; - this.hpDataGridViewTextBoxColumn.Width = 44; - // - // placeDataGridViewTextBoxColumn - // - this.placeDataGridViewTextBoxColumn.DataPropertyName = "place"; - this.placeDataGridViewTextBoxColumn.HeaderText = "place"; - this.placeDataGridViewTextBoxColumn.Name = "placeDataGridViewTextBoxColumn"; - this.placeDataGridViewTextBoxColumn.Width = 61; - // - // memoDataGridViewTextBoxColumn - // - this.memoDataGridViewTextBoxColumn.DataPropertyName = "memo"; - this.memoDataGridViewTextBoxColumn.HeaderText = "비고"; - this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn"; - this.memoDataGridViewTextBoxColumn.Width = 66; - // // fUserList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); diff --git a/Project/_Common/fUserList.cs b/Project/_Common/fUserList.cs index e6fb57c..50aa8a5 100644 --- a/Project/_Common/fUserList.cs +++ b/Project/_Common/fUserList.cs @@ -70,7 +70,7 @@ namespace Project._Common //var grplist = tagrp.GetData(); this.cmbdept.Items.Clear(); - + //var deptList = FCOMMON.DBM.getGroupList("dept", "users"); foreach (var item in GrpList) this.cmbdept.Items.Add(item.dept); @@ -164,13 +164,20 @@ namespace Project._Common } private void btRef_Click(object sender, EventArgs e) + { + RefreshList(); + + + } + + void RefreshList() { //read data if (tbProcess.Text.Trim() == "") tbProcess.Text = "%"; this.dsMSSQL.Users.Clear(); var db = new DataClasses1DataContext(); - if(tbProcess.Text.Trim() != "" && tbProcess.Text.Trim() != "%") + if (tbProcess.Text.Trim() != "" && tbProcess.Text.Trim() != "%") this.bs.DataSource = db.vGroupUser.Where(t => t.dept == this.cmbdept.Text && t.processs.Contains(tbProcess.Text.Trim())); else this.bs.DataSource = db.vGroupUser.Where(t => t.dept == this.cmbdept.Text); @@ -181,11 +188,24 @@ namespace Project._Common //this.dsMSSQL.Users.AcceptChanges(); this.dv1.AutoResizeColumns(); } - private void autoResizeColumnToolStripMenuItem_Click(object sender, EventArgs e) { this.dv1.AutoResizeColumns(); } + private void bindingNavigatorDeleteItem_Click(object sender, EventArgs e) + { + //삭제 + } + + private void bindingNavigatorAddNewItem_Click(object sender, EventArgs e) + { + //추가 + var f = new fAddNewUser(this.cmbdept.Text.Trim()); + if (f.ShowDialog() == DialogResult.OK) + { + RefreshList(); + } + } } } diff --git a/Project/_Common/fUserList.resx b/Project/_Common/fUserList.resx index d895777..df9221f 100644 --- a/Project/_Common/fUserList.resx +++ b/Project/_Common/fUserList.resx @@ -133,30 +133,6 @@ 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== - - - - - 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 @@ -195,6 +171,30 @@ kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + + 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== + + + + + 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= diff --git a/SubProject/FEQ0000/Purchase/fPurchase.cs b/SubProject/FEQ0000/Purchase/fPurchase.cs index 5152121..3166412 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase.cs @@ -267,6 +267,9 @@ namespace FEQ0000 case "received": this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Gray; break; + case "hold": + this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.HotPink; + break; default: this.fpSpread1.ActiveSheet.Rows[i].ForeColor = Color.Black; break; diff --git a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs index 27783a9..a809ed2 100644 --- a/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs +++ b/SubProject/FEQ0000/Purchase/fPurchase_excelimport.cs @@ -368,23 +368,7 @@ namespace FEQ0000 MinRow = (int)Math.Max(MinRow, nudS.Value - 1); - string SID = string.Empty; - string SC = string.Empty; - string CRCF = string.Empty; - string 품명 = string.Empty; - string 규격 = string.Empty; - string 수량 = string.Empty; - string 단위 = string.Empty; - string 단가 = string.Empty; - string 공급처 = string.Empty; - string PO = string.Empty; - string 비고 = string.Empty; - - string 요청일 = string.Empty; - string 입고일 = string.Empty; - - string 요청인 = string.Empty; - string 수령인 = string.Empty; + this.progressBar1.Value = 0; this.progressBar1.Maximum = MaxRow - MinRow + 1; @@ -404,6 +388,24 @@ namespace FEQ0000 { progressBar1.Value += 1; + string SID = string.Empty; + string SC = string.Empty; + string CRCF = string.Empty; + string 품명 = string.Empty; + string 규격 = string.Empty; + string 수량 = string.Empty; + string 단위 = string.Empty; + string 단가 = string.Empty; + string 공급처 = string.Empty; + string PO = string.Empty; + string 비고 = string.Empty; + + string 요청일 = string.Empty; + string 입고일 = string.Empty; + + string 요청인 = string.Empty; + string 수령인 = string.Empty; + var cf_qty = sheet.cellType(r, (int)nudQty.Value - 1); var cf_price = sheet.cellType(r, (int)nudPrice.Value - 1); var cf_sid = sheet.cellType(r, (int)nudSid.Value - 1);