From 481d6bf78d97c41a64171631e30e0d0c68d16f08 Mon Sep 17 00:00:00 2001 From: "chikyun.kim" Date: Wed, 19 Sep 2018 09:35:08 +0900 Subject: [PATCH] =?UTF-8?q?personal=20inventory=20:=20=EB=82=A0=EC=A7=9C?= =?UTF-8?q?=20=EC=84=A0=ED=83=9D=ED=95=98=EB=8F=84=EB=A1=9D=20lov=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Project/Properties/AssemblyInfo.cs | 4 +- Project/_Management/fLineCode.Designer.cs | 101 +++---- Project/_Management/fLineCode.cs | 16 +- SubProject/FCM0000/fInventory.Designer.cs | 69 +++-- SubProject/FCM0000/fInventory.cs | 22 ++ SubProject/FCOMMON/DataBaseManager.cs | 9 +- SubProject/FCOMMON/FCOMMON.csproj | 11 + SubProject/FPJ0000/dsPRJ.Designer.cs | 287 +++++++++++++------- SubProject/FPJ0000/dsPRJ.xsd | 30 +- SubProject/FPJ0000/dsPRJ.xss | 13 +- SubProject/FPJ0000/fProjectList.Designer.cs | 129 ++++----- SubProject/FPJ0000/fProjectList.cs | 30 +- SubProject/FPJ0000/fProjectList.resx | 27 +- 13 files changed, 453 insertions(+), 295 deletions(-) diff --git a/Project/Properties/AssemblyInfo.cs b/Project/Properties/AssemblyInfo.cs index f2d6687..13ce6d1 100644 --- a/Project/Properties/AssemblyInfo.cs +++ b/Project/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로 // 지정되도록 할 수 있습니다. // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("18.09.17.1700")] -[assembly: AssemblyFileVersion("18.09.17.1700")] +[assembly: AssemblyVersion("18.09.19.0000")] +[assembly: AssemblyFileVersion("18.09.19.0000")] diff --git a/Project/_Management/fLineCode.Designer.cs b/Project/_Management/fLineCode.Designer.cs index 705cb57..ce855b1 100644 --- a/Project/_Management/fLineCode.Designer.cs +++ b/Project/_Management/fLineCode.Designer.cs @@ -30,6 +30,7 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fLineCode)); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bs = new System.Windows.Forms.BindingSource(this.components); @@ -45,22 +46,20 @@ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.lineCodeBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); - this.lineCodeDataGridView = new System.Windows.Forms.DataGridView(); + this.dv = new System.Windows.Forms.DataGridView(); + this.ta = new Project.dsMSSQLTableAdapters.LineCodeTableAdapter(); + this.tam = new Project.dsMSSQLTableAdapters.TableAdapterManager(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.except = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.ta = new Project.dsMSSQLTableAdapters.LineCodeTableAdapter(); - this.tam = new Project.dsMSSQLTableAdapters.TableAdapterManager(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.lineCodeDataGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit(); this.SuspendLayout(); // // bn @@ -69,6 +68,7 @@ this.bn.BindingSource = this.bs; this.bn.CountItem = this.bindingNavigatorCountItem; this.bn.DeleteItem = this.bindingNavigatorDeleteItem; + this.bn.Dock = System.Windows.Forms.DockStyle.Bottom; this.bn.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.bindingNavigatorMoveFirstItem, this.bindingNavigatorMovePreviousItem, @@ -82,14 +82,14 @@ this.bindingNavigatorAddNewItem, this.bindingNavigatorDeleteItem, this.lineCodeBindingNavigatorSaveItem}); - this.bn.Location = new System.Drawing.Point(0, 0); + this.bn.Location = new System.Drawing.Point(0, 392); this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem; this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem; this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem; this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem; this.bn.Name = "bn"; this.bn.PositionItem = this.bindingNavigatorPositionItem; - this.bn.Size = new System.Drawing.Size(603, 25); + this.bn.Size = new System.Drawing.Size(588, 25); this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // @@ -197,32 +197,47 @@ this.lineCodeBindingNavigatorSaveItem.Text = "데이터 저장"; this.lineCodeBindingNavigatorSaveItem.Click += new System.EventHandler(this.lineCodeBindingNavigatorSaveItem_Click); // - // lineCodeDataGridView + // dv // - this.lineCodeDataGridView.AutoGenerateColumns = false; - this.lineCodeDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; - this.lineCodeDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; - this.lineCodeDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.lineCodeDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dv.AllowUserToAddRows = false; + this.dv.AutoGenerateColumns = false; + this.dv.ColumnHeadersHeight = 30; + this.dv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, this.dataGridViewTextBoxColumn2, this.dataGridViewTextBoxColumn3, this.dataGridViewTextBoxColumn4, this.except, - this.dataGridViewTextBoxColumn5, - this.dataGridViewTextBoxColumn6, - this.dataGridViewTextBoxColumn7}); - this.lineCodeDataGridView.DataSource = this.bs; - this.lineCodeDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; - this.lineCodeDataGridView.Location = new System.Drawing.Point(0, 25); - this.lineCodeDataGridView.Name = "lineCodeDataGridView"; - this.lineCodeDataGridView.RowTemplate.Height = 23; - this.lineCodeDataGridView.Size = new System.Drawing.Size(603, 313); - this.lineCodeDataGridView.TabIndex = 1; + this.dataGridViewTextBoxColumn5}); + this.dv.DataSource = this.bs; + this.dv.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv.Location = new System.Drawing.Point(0, 0); + this.dv.Name = "dv"; + this.dv.RowTemplate.Height = 23; + this.dv.Size = new System.Drawing.Size(588, 392); + this.dv.TabIndex = 1; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // tam + // + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.InventoryTableAdapter = null; + this.tam.ItemsTableAdapter = null; + this.tam.LineCodeTableAdapter = this.ta; + this.tam.ProjectsTableAdapter = null; + this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; + this.tam.UsersTableAdapter = null; // // dataGridViewTextBoxColumn1 // this.dataGridViewTextBoxColumn1.DataPropertyName = "idx"; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1; this.dataGridViewTextBoxColumn1.HeaderText = "idx"; this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1"; this.dataGridViewTextBoxColumn1.ReadOnly = true; @@ -263,40 +278,12 @@ this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5"; this.dataGridViewTextBoxColumn5.Width = 66; // - // dataGridViewTextBoxColumn6 - // - this.dataGridViewTextBoxColumn6.DataPropertyName = "wuid"; - this.dataGridViewTextBoxColumn6.HeaderText = "wuid"; - this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; - this.dataGridViewTextBoxColumn6.Width = 57; - // - // dataGridViewTextBoxColumn7 - // - this.dataGridViewTextBoxColumn7.DataPropertyName = "wdate"; - this.dataGridViewTextBoxColumn7.HeaderText = "wdate"; - this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; - this.dataGridViewTextBoxColumn7.Width = 64; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // tam - // - this.tam.BackupDataSetBeforeUpdate = false; - this.tam.InventoryTableAdapter = null; - this.tam.ItemsTableAdapter = null; - this.tam.LineCodeTableAdapter = this.ta; - this.tam.ProjectsTableAdapter = null; - this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - this.tam.UsersTableAdapter = null; - // // fLineCode // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(603, 338); - this.Controls.Add(this.lineCodeDataGridView); + this.ClientSize = new System.Drawing.Size(588, 417); + this.Controls.Add(this.dv); this.Controls.Add(this.bn); this.Name = "fLineCode"; this.Text = "fLineCode"; @@ -306,7 +293,7 @@ this.bn.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.lineCodeDataGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -331,14 +318,12 @@ private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; private System.Windows.Forms.ToolStripButton lineCodeBindingNavigatorSaveItem; - private System.Windows.Forms.DataGridView lineCodeDataGridView; + private System.Windows.Forms.DataGridView dv; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; private System.Windows.Forms.DataGridViewCheckBoxColumn except; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; } } \ No newline at end of file diff --git a/Project/_Management/fLineCode.cs b/Project/_Management/fLineCode.cs index 28b0a31..20b2786 100644 --- a/Project/_Management/fLineCode.cs +++ b/Project/_Management/fLineCode.cs @@ -14,6 +14,13 @@ namespace Project._Management public fLineCode() { InitializeComponent(); + this.FormClosed += fLineCode_FormClosed; + } + + void fLineCode_FormClosed(object sender, FormClosedEventArgs e) + { + var form = this as Form; + FCOMMON.Util.SetFormStatus(ref form, this.Name, false); } private void lineCodeBindingNavigatorSaveItem_Click(object sender, EventArgs e) @@ -26,10 +33,17 @@ namespace Project._Management private void fLineCode_Load(object sender, EventArgs e) { - // TODO: 이 코드는 데이터를 'dsMSSQL.LineCode' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. + var form = this as Form; + FCOMMON.Util.SetFormStatus(ref form, this.Name, true); + this.Show(); + Application.DoEvents(); + + this.ta.Fill(this.dsMSSQL.LineCode); this.dsMSSQL.LineCode.TableNewRow += LineCode_TableNewRow; + + } void LineCode_TableNewRow(object sender, DataTableNewRowEventArgs e) diff --git a/SubProject/FCM0000/fInventory.Designer.cs b/SubProject/FCM0000/fInventory.Designer.cs index b7b4eeb..2ddece0 100644 --- a/SubProject/FCM0000/fInventory.Designer.cs +++ b/SubProject/FCM0000/fInventory.Designer.cs @@ -30,12 +30,12 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fInventory)); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle27 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle28 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle29 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle30 = new System.Windows.Forms.DataGridViewCellStyle(); this.dsMSSQL = new FCM0000.dsMSSQL(); this.bs = new System.Windows.Forms.BindingSource(this.components); this.ta = new FCM0000.dsMSSQLTableAdapters.InventoryTableAdapter(); @@ -67,7 +67,6 @@ this.btSearch = new System.Windows.Forms.ToolStripButton(); this.taItem = new FCM0000.dsMSSQLTableAdapters.ItemsTableAdapter(); this.dv1 = new arCtl.arDatagridView(); - this.taPrj = new FCM0000.dsMSSQLTableAdapters.ProjectsTableAdapter(); this.dvc_iffnvtype = new System.Windows.Forms.DataGridViewComboBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dvc_projectname = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -78,6 +77,8 @@ this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.taPrj = new FCM0000.dsMSSQLTableAdapters.ProjectsTableAdapter(); + this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel(); ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); @@ -283,6 +284,7 @@ this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripLabel1, this.dtSD, + this.toolStripLabel4, this.toolStripLabel2, this.dtED, this.btSearch}); @@ -295,8 +297,9 @@ // toolStripLabel1 // this.toolStripLabel1.Name = "toolStripLabel1"; - this.toolStripLabel1.Size = new System.Drawing.Size(41, 22); - this.toolStripLabel1.Text = "Period"; + this.toolStripLabel1.Size = new System.Drawing.Size(32, 22); + this.toolStripLabel1.Text = "Start"; + this.toolStripLabel1.Click += new System.EventHandler(this.toolStripLabel1_Click); // // dtSD // @@ -307,8 +310,9 @@ // toolStripLabel2 // this.toolStripLabel2.Name = "toolStripLabel2"; - this.toolStripLabel2.Size = new System.Drawing.Size(15, 22); - this.toolStripLabel2.Text = "~"; + this.toolStripLabel2.Size = new System.Drawing.Size(27, 22); + this.toolStripLabel2.Text = "End"; + this.toolStripLabel2.Click += new System.EventHandler(this.toolStripLabel2_Click); // // dtED // @@ -362,10 +366,6 @@ this.dv1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dv1_CellEndEdit); this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.inventoryDataGridView_DataError); // - // taPrj - // - this.taPrj.ClearBeforeFill = true; - // // dvc_iffnvtype // this.dvc_iffnvtype.DataPropertyName = "invtype"; @@ -385,8 +385,8 @@ // dvc_projectname // this.dvc_projectname.DataPropertyName = "projectName"; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - this.dvc_projectname.DefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + this.dvc_projectname.DefaultCellStyle = dataGridViewCellStyle25; this.dvc_projectname.HeaderText = "Project"; this.dvc_projectname.Name = "dvc_projectname"; this.dvc_projectname.Width = 69; @@ -394,9 +394,9 @@ // dvc_project // this.dvc_project.DataPropertyName = "project"; - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dvc_project.DefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle26.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dvc_project.DefaultCellStyle = dataGridViewCellStyle26; this.dvc_project.HeaderText = "idx"; this.dvc_project.Name = "dvc_project"; this.dvc_project.Width = 47; @@ -404,8 +404,8 @@ // dvc_itemName // this.dvc_itemName.DataPropertyName = "itemName"; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); - this.dvc_itemName.DefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle27.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192))))); + this.dvc_itemName.DefaultCellStyle = dataGridViewCellStyle27; this.dvc_itemName.HeaderText = "Item"; this.dvc_itemName.Name = "dvc_itemName"; this.dvc_itemName.Width = 54; @@ -413,9 +413,9 @@ // dvc_item // this.dvc_item.DataPropertyName = "item"; - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.dvc_item.DefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle28.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle28.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); + this.dvc_item.DefaultCellStyle = dataGridViewCellStyle28; this.dvc_item.HeaderText = "idx"; this.dvc_item.Name = "dvc_item"; this.dvc_item.Width = 47; @@ -430,8 +430,8 @@ // dataGridViewTextBoxColumn6 // this.dataGridViewTextBoxColumn6.DataPropertyName = "dr_qty"; - dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle29.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.dataGridViewTextBoxColumn6.DefaultCellStyle = dataGridViewCellStyle29; this.dataGridViewTextBoxColumn6.HeaderText = "Qty"; this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6"; this.dataGridViewTextBoxColumn6.Width = 64; @@ -439,8 +439,8 @@ // dataGridViewTextBoxColumn7 // this.dataGridViewTextBoxColumn7.DataPropertyName = "dr_amt"; - dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; - this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle30.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleRight; + this.dataGridViewTextBoxColumn7.DefaultCellStyle = dataGridViewCellStyle30; this.dataGridViewTextBoxColumn7.HeaderText = "Amt"; this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7"; this.dataGridViewTextBoxColumn7.Width = 68; @@ -452,6 +452,16 @@ this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.Width = 66; // + // taPrj + // + this.taPrj.ClearBeforeFill = true; + // + // toolStripLabel4 + // + this.toolStripLabel4.Name = "toolStripLabel4"; + this.toolStripLabel4.Size = new System.Drawing.Size(15, 22); + this.toolStripLabel4.Text = "~"; + // // fInventory // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -521,5 +531,6 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; + private System.Windows.Forms.ToolStripLabel toolStripLabel4; } } \ No newline at end of file diff --git a/SubProject/FCM0000/fInventory.cs b/SubProject/FCM0000/fInventory.cs index d666602..4014aa7 100644 --- a/SubProject/FCM0000/fInventory.cs +++ b/SubProject/FCM0000/fInventory.cs @@ -295,6 +295,28 @@ namespace FCM0000 } } + private void toolStripLabel1_Click(object sender, EventArgs e) + { + //시작일(inventory 에 uid 가 내것인 데이터) + var dataList = FCOMMON.DBM.getDateList("inventory", "uid='" + FCOMMON.info.Login.no + "'", true); + var f = new FCOMMON.fLovDateList(dataList); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + dtSD.Text = f.selectedDate; + } + } + + private void toolStripLabel2_Click(object sender, EventArgs e) + { + var dataList = FCOMMON.DBM.getDateList("inventory", "uid='" + FCOMMON.info.Login.no + "'", true); + var f = new FCOMMON.fLovDateList(dataList); + if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK) + { + dtED.Text = f.selectedDate; + btSearch.PerformClick(); + } + } + } } diff --git a/SubProject/FCOMMON/DataBaseManager.cs b/SubProject/FCOMMON/DataBaseManager.cs index 142da38..99f74a7 100644 --- a/SubProject/FCOMMON/DataBaseManager.cs +++ b/SubProject/FCOMMON/DataBaseManager.cs @@ -16,7 +16,7 @@ namespace FCOMMON } - public static List getGroupList(string GroupColumn, string table, string where = "") + public static List getGroupList(string GroupColumn, string table, string where = "",Boolean desc=false) { List retval = new List(); var cn = getCn(); @@ -28,7 +28,8 @@ namespace FCOMMON if (where != "") sql += " and " + where; sql += " group by {0} " + - " order by {0}"; + " order by {0} "; + if (desc) sql += " desc"; sql = string.Format(sql, "[" + GroupColumn + "]", table); var cmd = new System.Data.SqlClient.SqlCommand(sql, cn); @@ -42,9 +43,9 @@ namespace FCOMMON cn.Dispose(); return retval; } - public static List getDateList(string table, string where = "") + public static List getDateList(string table, string where = "",Boolean desc =false) { - return getGroupList("pdate", table, where); + return getGroupList("pdate", table, where,desc); } } } diff --git a/SubProject/FCOMMON/FCOMMON.csproj b/SubProject/FCOMMON/FCOMMON.csproj index cdf245c..7d23f9b 100644 --- a/SubProject/FCOMMON/FCOMMON.csproj +++ b/SubProject/FCOMMON/FCOMMON.csproj @@ -46,12 +46,23 @@ + + Form + + + fLovDateList.cs + + + + fLovDateList.cs + + + + + + + + \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.Designer.cs b/SubProject/FPJ0000/fProjectList.Designer.cs index f24887f..652e9c3 100644 --- a/SubProject/FPJ0000/fProjectList.Designer.cs +++ b/SubProject/FPJ0000/fProjectList.Designer.cs @@ -31,10 +31,7 @@ this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList)); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.dsMSSQL = new FPJ0000.dsPRJ(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); - this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); @@ -48,8 +45,13 @@ this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.projectsBindingNavigatorSaveItem = new System.Windows.Forms.ToolStripButton(); - this.projectsDataGridView = new System.Windows.Forms.DataGridView(); + this.dv1 = new System.Windows.Forms.DataGridView(); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dsMSSQL = new FPJ0000.dsPRJ(); + this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter(); + this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager(); this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.status = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -58,35 +60,13 @@ this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewTextBoxColumn9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewTextBoxColumn11 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.projectsDataGridView)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit(); this.SuspendLayout(); // - // dsMSSQL - // - this.dsMSSQL.DataSetName = "dsMSSQL"; - this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // - // bs - // - this.bs.DataMember = "Projects"; - this.bs.DataSource = this.dsMSSQL; - // - // ta - // - this.ta.ClearBeforeFill = true; - // - // tam - // - this.tam.BackupDataSetBeforeUpdate = false; - this.tam.ProjectsTableAdapter = this.ta; - this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; - // // bn // this.bn.AddNewItem = this.bindingNavigatorAddNewItem; @@ -212,15 +192,15 @@ this.projectsBindingNavigatorSaveItem.Text = "데이터 저장"; this.projectsBindingNavigatorSaveItem.Click += new System.EventHandler(this.projectsBindingNavigatorSaveItem_Click); // - // projectsDataGridView + // dv1 // - this.projectsDataGridView.AllowUserToAddRows = false; - this.projectsDataGridView.AutoGenerateColumns = false; - this.projectsDataGridView.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.AllCells; - this.projectsDataGridView.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells; - this.projectsDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.projectsDataGridView.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.dv1.AllowUserToAddRows = false; + this.dv1.AutoGenerateColumns = false; + this.dv1.ColumnHeadersHeight = 30; + this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; + this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.dataGridViewTextBoxColumn1, + this.status, this.dataGridViewTextBoxColumn2, this.dataGridViewTextBoxColumn3, this.dataGridViewTextBoxColumn4, @@ -228,16 +208,34 @@ this.dataGridViewTextBoxColumn6, this.dataGridViewTextBoxColumn7, this.dataGridViewTextBoxColumn8, - this.dataGridViewTextBoxColumn9, - this.dataGridViewTextBoxColumn10, - this.dataGridViewTextBoxColumn11}); - this.projectsDataGridView.DataSource = this.bs; - this.projectsDataGridView.Dock = System.Windows.Forms.DockStyle.Fill; - this.projectsDataGridView.Location = new System.Drawing.Point(0, 0); - this.projectsDataGridView.Name = "projectsDataGridView"; - this.projectsDataGridView.RowTemplate.Height = 23; - this.projectsDataGridView.Size = new System.Drawing.Size(738, 364); - this.projectsDataGridView.TabIndex = 1; + this.dataGridViewTextBoxColumn9}); + this.dv1.DataSource = this.bs; + this.dv1.Dock = System.Windows.Forms.DockStyle.Fill; + this.dv1.Location = new System.Drawing.Point(0, 0); + this.dv1.Name = "dv1"; + this.dv1.RowTemplate.Height = 23; + this.dv1.Size = new System.Drawing.Size(738, 364); + this.dv1.TabIndex = 1; + // + // bs + // + this.bs.DataMember = "Projects"; + this.bs.DataSource = this.dsMSSQL; + // + // dsMSSQL + // + this.dsMSSQL.DataSetName = "dsMSSQL"; + this.dsMSSQL.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // + // ta + // + this.ta.ClearBeforeFill = true; + // + // tam + // + this.tam.BackupDataSetBeforeUpdate = false; + this.tam.ProjectsTableAdapter = this.ta; + this.tam.UpdateOrder = FPJ0000.dsPRJTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete; // // dataGridViewTextBoxColumn1 // @@ -250,6 +248,14 @@ this.dataGridViewTextBoxColumn1.ReadOnly = true; this.dataGridViewTextBoxColumn1.Width = 47; // + // status + // + this.status.DataPropertyName = "status"; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + this.status.DefaultCellStyle = dataGridViewCellStyle2; + this.status.HeaderText = "status"; + this.status.Name = "status"; + // // dataGridViewTextBoxColumn2 // this.dataGridViewTextBoxColumn2.DataPropertyName = "name"; @@ -306,37 +312,23 @@ this.dataGridViewTextBoxColumn9.Name = "dataGridViewTextBoxColumn9"; this.dataGridViewTextBoxColumn9.Width = 66; // - // dataGridViewTextBoxColumn10 - // - this.dataGridViewTextBoxColumn10.DataPropertyName = "wuid"; - this.dataGridViewTextBoxColumn10.HeaderText = "wuid"; - this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; - this.dataGridViewTextBoxColumn10.Width = 57; - // - // dataGridViewTextBoxColumn11 - // - this.dataGridViewTextBoxColumn11.DataPropertyName = "wdate"; - this.dataGridViewTextBoxColumn11.HeaderText = "wdate"; - this.dataGridViewTextBoxColumn11.Name = "dataGridViewTextBoxColumn11"; - this.dataGridViewTextBoxColumn11.Width = 64; - // // fProjectList // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(738, 389); - this.Controls.Add(this.projectsDataGridView); + this.Controls.Add(this.dv1); this.Controls.Add(this.bn); this.Name = "fProjectList"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "fProjectList"; - this.Load += new System.EventHandler(this.fProjectList_Load); - ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + this.Load += new System.EventHandler(this.__Load); ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); this.bn.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.projectsDataGridView)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -361,8 +353,9 @@ private System.Windows.Forms.ToolStripButton bindingNavigatorMoveLastItem; private System.Windows.Forms.ToolStripSeparator bindingNavigatorSeparator2; private System.Windows.Forms.ToolStripButton projectsBindingNavigatorSaveItem; - private System.Windows.Forms.DataGridView projectsDataGridView; + private System.Windows.Forms.DataGridView dv1; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1; + private System.Windows.Forms.DataGridViewTextBoxColumn status; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4; @@ -371,7 +364,5 @@ private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8; private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn10; - private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn11; } } \ No newline at end of file diff --git a/SubProject/FPJ0000/fProjectList.cs b/SubProject/FPJ0000/fProjectList.cs index a891a67..d2b2a9b 100644 --- a/SubProject/FPJ0000/fProjectList.cs +++ b/SubProject/FPJ0000/fProjectList.cs @@ -14,6 +14,27 @@ namespace FPJ0000 public fProjectList() { InitializeComponent(); + this.FormClosed += __Closed; + } + + void __Closed(object sender, FormClosedEventArgs e) + { + var form = this as Form; + FCOMMON.Util.SetFormStatus(ref form, this.Name, false); + } + + + private void __Load(object sender, EventArgs e) + { + var form = this as Form; + FCOMMON.Util.SetFormStatus(ref form, this.Name, true); + this.Show(); + Application.DoEvents(); + + + this.ta.Fill(this.dsMSSQL.Projects); + this.dsMSSQL.Projects.TableNewRow += Projects_TableNewRow; + dv1.AutoResizeColumns(); } private void projectsBindingNavigatorSaveItem_Click(object sender, EventArgs e) @@ -23,15 +44,6 @@ namespace FPJ0000 this.tam.UpdateAll(this.dsMSSQL); } - - private void fProjectList_Load(object sender, EventArgs e) - { - // TODO: 이 코드는 데이터를 'dsMSSQL.Projects' 테이블에 로드합니다. 필요한 경우 이 코드를 이동하거나 제거할 수 있습니다. - this.ta.Fill(this.dsMSSQL.Projects); - this.dsMSSQL.Projects.TableNewRow += Projects_TableNewRow; - - } - void Projects_TableNewRow(object sender, DataTableNewRowEventArgs e) { e.Row["wuid"] = FCOMMON.info.Login.no; diff --git a/SubProject/FPJ0000/fProjectList.resx b/SubProject/FPJ0000/fProjectList.resx index 1ed356c..5929378 100644 --- a/SubProject/FPJ0000/fProjectList.resx +++ b/SubProject/FPJ0000/fProjectList.resx @@ -117,18 +117,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 17, 17 - - - 122, 17 - - - 186, 17 - - - 248, 17 - 321, 17 @@ -145,6 +133,12 @@ rkJggg== + + 122, 17 + + + 17, 17 + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO @@ -204,4 +198,13 @@ dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= + + True + + + 186, 17 + + + 248, 17 + \ No newline at end of file