공정 항목 추가 (업무일지, 프로젝트)

구매내역에 s/c 정렬 기능 추가
This commit is contained in:
chi
2020-01-06 16:27:21 +09:00
parent d73a2e212a
commit 178c295587
80 changed files with 12686 additions and 9599 deletions

View File

@@ -43,6 +43,7 @@
System.Windows.Forms.Label label2;
System.Windows.Forms.Label label3;
System.Windows.Forms.Label label4;
System.Windows.Forms.Label label5;
this.idTextBox = new System.Windows.Forms.TextBox();
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new Project.dsMSSQL();
@@ -62,6 +63,7 @@
this.textBox2 = new System.Windows.Forms.TextBox();
this.textBox3 = new System.Windows.Forms.TextBox();
this.tbKJPath = new System.Windows.Forms.TextBox();
this.textBox4 = new System.Windows.Forms.TextBox();
idLabel = new System.Windows.Forms.Label();
passwordLabel = new System.Windows.Forms.Label();
nameLabel = new System.Windows.Forms.Label();
@@ -76,6 +78,7 @@
label2 = new System.Windows.Forms.Label();
label3 = new System.Windows.Forms.Label();
label4 = new System.Windows.Forms.Label();
label5 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
this.SuspendLayout();
@@ -287,9 +290,8 @@
//
this.memoTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "memo", true));
this.memoTextBox.Location = new System.Drawing.Point(407, 156);
this.memoTextBox.Multiline = true;
this.memoTextBox.Name = "memoTextBox";
this.memoTextBox.Size = new System.Drawing.Size(189, 63);
this.memoTextBox.Size = new System.Drawing.Size(189, 29);
this.memoTextBox.TabIndex = 25;
//
// button1
@@ -324,6 +326,7 @@
this.tam.LineCodeTableAdapter = null;
this.tam.ProjectsTableAdapter = null;
this.tam.UpdateOrder = Project.dsMSSQLTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
this.tam.UserGroupTableAdapter = null;
this.tam.UsersTableAdapter = this.ta;
//
// textBox1
@@ -359,10 +362,29 @@
this.tbKJPath.Size = new System.Drawing.Size(177, 29);
this.tbKJPath.TabIndex = 28;
//
// label5
//
label5.AutoSize = true;
label5.Location = new System.Drawing.Point(360, 193);
label5.Name = "label5";
label5.Size = new System.Drawing.Size(42, 21);
label5.TabIndex = 29;
label5.Text = "공정";
//
// textBox4
//
this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "processs", true));
this.textBox4.Location = new System.Drawing.Point(407, 190);
this.textBox4.Name = "textBox4";
this.textBox4.Size = new System.Drawing.Size(189, 29);
this.textBox4.TabIndex = 30;
//
// fUserInfo
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(601, 326);
this.Controls.Add(label5);
this.Controls.Add(this.textBox4);
this.Controls.Add(label4);
this.Controls.Add(this.tbKJPath);
this.Controls.Add(label3);
@@ -426,5 +448,6 @@
private System.Windows.Forms.TextBox textBox2;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.TextBox tbKJPath;
private System.Windows.Forms.TextBox textBox4;
}
}

View File

@@ -177,4 +177,7 @@
<metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>248, 17</value>
</metadata>
<metadata name="label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
</root>

View File

@@ -53,19 +53,6 @@
this.btDevel = new System.Windows.Forms.ToolStripDropDownButton();
this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.dv1 = new System.Windows.Forms.DataGridView();
this.dvc_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_level = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.nameEDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.deptDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.gradeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.emailDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.indateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.outdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
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();
@@ -78,6 +65,22 @@
this.cmbdept = new System.Windows.Forms.ToolStripComboBox();
this.btRef = new System.Windows.Forms.ToolStripButton();
this.textBox1 = new System.Windows.Forms.TextBox();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.tbProcess = new System.Windows.Forms.ToolStripTextBox();
this.dvc_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.processs = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_level = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.nameEDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.deptDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.gradeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.emailDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.indateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.outdateDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.telDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.hpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.placeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
@@ -134,14 +137,14 @@
this.usersBindingNavigatorSaveItem,
this.toolStripSeparator1,
this.btDevel});
this.bn.Location = new System.Drawing.Point(0, 419);
this.bn.Location = new System.Drawing.Point(0, 540);
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(755, 25);
this.bn.Size = new System.Drawing.Size(908, 25);
this.bn.TabIndex = 0;
this.bn.Text = "bindingNavigator1";
//
@@ -267,6 +270,7 @@
this.dv1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
this.dv1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.dvc_id,
this.processs,
this.dvc_level,
this.nameDataGridViewTextBoxColumn,
this.nameEDataGridViewTextBoxColumn,
@@ -285,9 +289,116 @@
this.dv1.Location = new System.Drawing.Point(0, 25);
this.dv1.Name = "dv1";
this.dv1.RowTemplate.Height = 23;
this.dv1.Size = new System.Drawing.Size(755, 373);
this.dv1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.CellSelect;
this.dv1.Size = new System.Drawing.Size(908, 494);
this.dv1.TabIndex = 1;
//
// cm1
//
this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.autoResizeColumnToolStripMenuItem,
this.toolStripMenuItem2,
this.iDChangeToolStripMenuItem,
this.passwordChangeToolStripMenuItem,
this.toolStripMenuItem1,
this.mailToolStripMenuItem});
this.cm1.Name = "cm1";
this.cm1.Size = new System.Drawing.Size(181, 104);
//
// autoResizeColumnToolStripMenuItem
//
this.autoResizeColumnToolStripMenuItem.Name = "autoResizeColumnToolStripMenuItem";
this.autoResizeColumnToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.autoResizeColumnToolStripMenuItem.Text = "AutoResize Column";
this.autoResizeColumnToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnToolStripMenuItem_Click);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6);
//
// iDChangeToolStripMenuItem
//
this.iDChangeToolStripMenuItem.Name = "iDChangeToolStripMenuItem";
this.iDChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.iDChangeToolStripMenuItem.Text = "ID Change";
this.iDChangeToolStripMenuItem.Click += new System.EventHandler(this.iDChangeToolStripMenuItem_Click);
//
// passwordChangeToolStripMenuItem
//
this.passwordChangeToolStripMenuItem.Name = "passwordChangeToolStripMenuItem";
this.passwordChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.passwordChangeToolStripMenuItem.Text = "Password Change";
this.passwordChangeToolStripMenuItem.Click += new System.EventHandler(this.passwordChangeToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6);
//
// mailToolStripMenuItem
//
this.mailToolStripMenuItem.Name = "mailToolStripMenuItem";
this.mailToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.mailToolStripMenuItem.Text = "Mail";
this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel1,
this.cmbdept,
this.toolStripLabel2,
this.tbProcess,
this.btRef});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(908, 25);
this.toolStrip1.TabIndex = 2;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(31, 22);
this.toolStripLabel1.Text = "소속";
//
// cmbdept
//
this.cmbdept.Name = "cmbdept";
this.cmbdept.Size = new System.Drawing.Size(400, 25);
//
// btRef
//
this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image")));
this.btRef.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btRef.Name = "btRef";
this.btRef.Size = new System.Drawing.Size(66, 22);
this.btRef.Text = "Refresh";
this.btRef.Click += new System.EventHandler(this.btRef_Click);
//
// textBox1
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ads_title", true));
this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.textBox1.Location = new System.Drawing.Point(0, 519);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(908, 21);
this.textBox1.TabIndex = 3;
//
// toolStripLabel2
//
this.toolStripLabel2.Name = "toolStripLabel2";
this.toolStripLabel2.Size = new System.Drawing.Size(31, 22);
this.toolStripLabel2.Text = "공정";
//
// tbProcess
//
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(100, 25);
this.tbProcess.Text = "%";
this.tbProcess.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// dvc_id
//
this.dvc_id.DataPropertyName = "id";
@@ -298,6 +409,12 @@
this.dvc_id.Name = "dvc_id";
this.dvc_id.Width = 40;
//
// processs
//
this.processs.DataPropertyName = "processs";
this.processs.HeaderText = "processs";
this.processs.Name = "processs";
//
// dvc_level
//
this.dvc_level.DataPropertyName = "level";
@@ -385,102 +502,11 @@
this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn";
this.memoDataGridViewTextBoxColumn.Width = 66;
//
// cm1
//
this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.autoResizeColumnToolStripMenuItem,
this.toolStripMenuItem2,
this.iDChangeToolStripMenuItem,
this.passwordChangeToolStripMenuItem,
this.toolStripMenuItem1,
this.mailToolStripMenuItem});
this.cm1.Name = "cm1";
this.cm1.Size = new System.Drawing.Size(181, 104);
//
// autoResizeColumnToolStripMenuItem
//
this.autoResizeColumnToolStripMenuItem.Name = "autoResizeColumnToolStripMenuItem";
this.autoResizeColumnToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.autoResizeColumnToolStripMenuItem.Text = "AutoResize Column";
this.autoResizeColumnToolStripMenuItem.Click += new System.EventHandler(this.autoResizeColumnToolStripMenuItem_Click);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(177, 6);
//
// iDChangeToolStripMenuItem
//
this.iDChangeToolStripMenuItem.Name = "iDChangeToolStripMenuItem";
this.iDChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.iDChangeToolStripMenuItem.Text = "ID Change";
this.iDChangeToolStripMenuItem.Click += new System.EventHandler(this.iDChangeToolStripMenuItem_Click);
//
// passwordChangeToolStripMenuItem
//
this.passwordChangeToolStripMenuItem.Name = "passwordChangeToolStripMenuItem";
this.passwordChangeToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.passwordChangeToolStripMenuItem.Text = "Password Change";
this.passwordChangeToolStripMenuItem.Click += new System.EventHandler(this.passwordChangeToolStripMenuItem_Click);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(177, 6);
//
// mailToolStripMenuItem
//
this.mailToolStripMenuItem.Name = "mailToolStripMenuItem";
this.mailToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
this.mailToolStripMenuItem.Text = "Mail";
this.mailToolStripMenuItem.Click += new System.EventHandler(this.mailToolStripMenuItem_Click);
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripLabel1,
this.cmbdept,
this.btRef});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(755, 25);
this.toolStrip1.TabIndex = 2;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripLabel1
//
this.toolStripLabel1.Name = "toolStripLabel1";
this.toolStripLabel1.Size = new System.Drawing.Size(43, 22);
this.toolStripLabel1.Text = "Depart";
//
// cmbdept
//
this.cmbdept.Name = "cmbdept";
this.cmbdept.Size = new System.Drawing.Size(300, 25);
//
// btRef
//
this.btRef.Image = ((System.Drawing.Image)(resources.GetObject("btRef.Image")));
this.btRef.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btRef.Name = "btRef";
this.btRef.Size = new System.Drawing.Size(66, 22);
this.btRef.Text = "Refresh";
this.btRef.Click += new System.EventHandler(this.btRef_Click);
//
// textBox1
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ads_title", true));
this.textBox1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.textBox1.Location = new System.Drawing.Point(0, 398);
this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(755, 21);
this.textBox1.TabIndex = 3;
//
// fUserList
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(755, 444);
this.ClientSize = new System.Drawing.Size(908, 565);
this.Controls.Add(this.dv1);
this.Controls.Add(this.textBox1);
this.Controls.Add(this.toolStrip1);
@@ -536,7 +562,11 @@
private System.Windows.Forms.ToolStripButton btRef;
private System.Windows.Forms.ToolStripMenuItem autoResizeColumnToolStripMenuItem;
private System.Windows.Forms.TextBox textBox1;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripTextBox tbProcess;
private System.Windows.Forms.DataGridViewTextBoxColumn dvc_id;
private System.Windows.Forms.DataGridViewTextBoxColumn processs;
private System.Windows.Forms.DataGridViewTextBoxColumn dvc_level;
private System.Windows.Forms.DataGridViewTextBoxColumn nameDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn nameEDataGridViewTextBoxColumn;
@@ -549,6 +579,5 @@
private System.Windows.Forms.DataGridViewTextBoxColumn hpDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn placeDataGridViewTextBoxColumn;
private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
}
}

View File

@@ -155,8 +155,9 @@ namespace Project._Common
private void btRef_Click(object sender, EventArgs e)
{
//read data
if (tbProcess.Text.Trim() == "") tbProcess.Text = "%";
this.dsMSSQL.Users.Clear();
this.ta.Fill(this.dsMSSQL.Users, this.cmbdept.Text );
this.ta.Fill(this.dsMSSQL.Users, this.cmbdept.Text, tbProcess.Text.Trim());
this.dsMSSQL.Users.AcceptChanges();
}

View File

@@ -219,6 +219,9 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="processs.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>387, 17</value>
</metadata>