NR구매일괄등록 -> PO -> PR 로 기본 상태값 변경

프로젝트모록 -> 우클릭 삭제 버튼 기능 추가
프로젝트목록 -> 하단 메세지창을 richTextbox 로 변경 함 (휠 줌을 수정 함)
NR구매목록 -> 하단에 비고칸 표시되도록 추가
This commit is contained in:
chi
2020-04-23 10:23:38 +09:00
parent 315d6f6bef
commit 7026136e93
7 changed files with 229 additions and 161 deletions

View File

@@ -125,9 +125,7 @@
this.label11 = new System.Windows.Forms.Label();
this.label4 = new System.Windows.Forms.Label();
this.bsHist = new System.Windows.Forms.BindingSource(this.components);
this.textBox4 = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.textBox3 = new System.Windows.Forms.TextBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.label6 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
@@ -147,6 +145,10 @@
this.taHist = new FPJ0000.dsPRJTableAdapters.ProjectsHistoryTableAdapter();
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.panel3 = new System.Windows.Forms.Panel();
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.sbCount = new System.Windows.Forms.ToolStripLabel();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.richTextBox2 = new System.Windows.Forms.RichTextBox();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -190,7 +192,9 @@
this.toolStripSeparator5,
this.toolStripLabel1,
this.tbFind,
this.btFind});
this.btFind,
this.toolStripSeparator6,
this.sbCount});
this.bn.Location = new System.Drawing.Point(0, 528);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
@@ -495,6 +499,7 @@
this.ToolStripMenuItem.Name = "삭제ToolStripMenuItem";
this.ToolStripMenuItem.Size = new System.Drawing.Size(304, 36);
this.ToolStripMenuItem.Text = "삭제";
this.ToolStripMenuItem.Click += new System.EventHandler(this.ToolStripMenuItem_Click);
//
// 편집ToolStripMenuItem1
//
@@ -962,7 +967,6 @@
//
// label1
//
this.label1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "name", true));
this.label1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.label1.Font = new System.Drawing.Font("맑은 고딕", 11.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.label1.Location = new System.Drawing.Point(0, 287);
@@ -979,9 +983,9 @@
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.Controls.Add(this.panel4, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.textBox4, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.textBox3, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.richTextBox1, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.richTextBox2, 1, 1);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 47);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
@@ -1032,19 +1036,6 @@
this.bsHist.DataSource = this.dsMSSQL;
this.bsHist.Sort = "pdate desc";
//
// textBox4
//
this.textBox4.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true));
this.textBox4.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox4.Location = new System.Drawing.Point(692, 25);
this.textBox4.Margin = new System.Windows.Forms.Padding(0);
this.textBox4.Multiline = true;
this.textBox4.Name = "textBox4";
this.textBox4.ReadOnly = true;
this.textBox4.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.textBox4.Size = new System.Drawing.Size(692, 146);
this.textBox4.TabIndex = 10;
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1057,19 +1048,6 @@
this.label2.Text = "요청 사항";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// textBox3
//
this.textBox3.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true));
this.textBox3.Dock = System.Windows.Forms.DockStyle.Fill;
this.textBox3.Location = new System.Drawing.Point(0, 25);
this.textBox3.Margin = new System.Windows.Forms.Padding(0);
this.textBox3.Multiline = true;
this.textBox3.Name = "textBox3";
this.textBox3.ReadOnly = true;
this.textBox3.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
this.textBox3.Size = new System.Drawing.Size(692, 146);
this.textBox3.TabIndex = 8;
//
// tableLayoutPanel2
//
this.tableLayoutPanel2.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
@@ -1306,6 +1284,41 @@
this.panel3.Size = new System.Drawing.Size(1384, 218);
this.panel3.TabIndex = 7;
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(6, 25);
//
// sbCount
//
this.sbCount.Name = "sbCount";
this.sbCount.Size = new System.Drawing.Size(83, 22);
this.sbCount.Text = "프로젝트 수량";
//
// richTextBox1
//
this.richTextBox1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.richTextBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "remark_req", true));
this.richTextBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.richTextBox1.Location = new System.Drawing.Point(3, 28);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.ReadOnly = true;
this.richTextBox1.Size = new System.Drawing.Size(686, 140);
this.richTextBox1.TabIndex = 1;
this.richTextBox1.Text = "";
//
// richTextBox2
//
this.richTextBox2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.richTextBox2.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsHist, "remark", true));
this.richTextBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.richTextBox2.Location = new System.Drawing.Point(695, 28);
this.richTextBox2.Name = "richTextBox2";
this.richTextBox2.ReadOnly = true;
this.richTextBox2.Size = new System.Drawing.Size(686, 140);
this.richTextBox2.TabIndex = 1;
this.richTextBox2.Text = "";
//
// fProjectList
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1330,7 +1343,6 @@
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.panel4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.bsHist)).EndInit();
this.tableLayoutPanel2.ResumeLayout(false);
@@ -1389,8 +1401,6 @@
private System.Windows.Forms.ToolStripButton btFind;
private System.Windows.Forms.ToolStripButton chk대기;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.TextBox textBox4;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripComboBox cmbYearS;
@@ -1441,5 +1451,9 @@
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator5;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
private System.Windows.Forms.ToolStripLabel sbCount;
private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.RichTextBox richTextBox2;
}
}

View File

@@ -477,8 +477,15 @@ namespace FPJ0000
{
//히스토리 데이터를 업데이트하고 첫번재 자료를 표시한다.
var drv = this.bs.Current as DataRowView;
if (drv == null) return;
if (drv == null)
{
this.label1.Text = "프로젝트가 선택되지 않았습니다";
return;
}
var dr = drv.Row as dsPRJ.ProjectsRow;
this.label1.Text = string.Format("[{0}] {1}",dr.name,dr.memo);
try
{
taHist.Fill(this.dsMSSQL.ProjectsHistory, dr.idx);
@@ -635,5 +642,10 @@ namespace FPJ0000
{
menu_iomap();
}
private void ToolStripMenuItem_Click(object sender, EventArgs e)
{
funcDelete();
}
}
}

View File

@@ -211,35 +211,35 @@
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
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
</value>
</data>
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/TxJxHMbvP2prU1c612iLylIJXKQu2myz
1ZyrGWtYiERijlWrVgihO01KR0Q0VqMEFYaahhrZd/uifYEjEIigbN3T3XFTjvypXtuz2+79PM/e++xN
/DcG50d03l6EzvYemsEFnBp4A1Xfq0f8WED/WFxNji4v9Y7EYPFEYXoYBZHO/kKhWnqf0XxGADkS/17o
Jc4GtND51NCMqnDSo+R+Npufgs8I6PF+5eYD89dAhoywzF4GgQJYw+Grc+sWmIej3DwfwuqLIF+s4eCl
oKCgziqR1ZC7UdUthtwkEfgJ23iY78oRTWahOD+1WlBnrZRJLRV0+3Ar9GPtqL6wkwuyDPrDuQLHZASO
iTBc02G8/ZLCvq4JrkDeXymTmHbQqvst2GuuRvnpEog7tmIoEIGN1Tj19wavPyVR0xGAjNxVW2UU00pX
M0T6UrqsrWi74c4SkpkV2CcpzutgvlwBtwWzgZ1Ro+0ApD0VaLhRj6POI9hyZhO9uW3jNnYjvf0DEukV
OKco3J3OiXDPUEhl1l5W0VcLjVeFJkcjyrUldHFrLsyiHXqH5W8/cS+Y2+DBLHNIrscU8iXvlkLUWYoy
TRGKT2xYDbOoby5wBW4myIa5glvMQ+TzYjEBhSGw7h2orr9EnCnwPIlyXm+IKWADharv8v/mMwKOk88R
S/0AlcjicyyDRSoNYo/Oh0KJlG4HnxFwzDLvbzKG0oeuzKHhYhD7z63dyz9CEH8A9DstjEISHpEAAAAA
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL/TxJxHMbvP2prU1c612iLylIJXCQt2myz
9WWupq5hIRhDc6xatQgR6jIpHRHRWGUJKQ41lTRifbUv2Bc4AoEIytY93R035cif6rU9u+3ez/Psvc/e
xH9jcH1E160wdPb30AzM40T/G6jIV4/5sYC+0YT6ysjiwuVHcVg8MfQ8jIHI5H6hWM3WEM1nBJDexPdi
L3HK3wGdTw3NiArHPa3czybzM/AZAVbvV27eH+oFGbwEy+wFECiCNRwwzq1aYB6OcfNCCJsvikKxhn3n
A4IChU0iqyO3o8YkhrxHIvAT9vEI35UnlspBeWZquUBhq5ZJe6to7XAbOke1qD27lQuyDIxF8gXOySic
ExG4pyN4+yWNXd0TXIG8r1omMW2hVfeasdNci8qTZRDrN2LQH4Wd1Tj19wavP6VQp/dDRm6rrzGK6VZ3
E0T6crqivWSz4fYCUtklOCYpzutkvlwBtwWzgYNRo30vpNYqNFzfjSOug9igW0evb1+7id2o0/EBycwS
XFMU7kznRQw9oZDOrrys8mo9NF4VDjsbUakto0vb8mGWjsF3WPz2E3cD+Q0ezDKH5J6hUCi5SQpRVzkq
NCUoPbZmOcyivjHPFQwxQTbMFdxkHqKQF+EklAb/qneguvYSCabA8zTGeb1BpoANFEvR7fvNZwS0kM8R
T/8AlczhczyLMJUBsUPnQ7FELfedfEbAUUto7JAxmNl/cQ4N5wLYc3rlXv4RgvgD1F8tewTZ58gAAAAA
SUVORK5CYII=
</value>
</data>

View File

@@ -138,7 +138,7 @@ namespace FPJ0000
dtPdate.Value = DateTime.Now;
cmbState.Text = "PO";
cmbState.Text = "PR"; //po에서 변경 200423 - JBS요청
this.Show();