From 10d05e36d428b800a30821a743f8737af9e46221 Mon Sep 17 00:00:00 2001 From: chi Date: Thu, 30 Dec 2021 13:58:45 +0900 Subject: [PATCH] .... --- .../OtConfirm/fHolyRequest.Designer.cs | 41 +-- SubProject/FPJ0000/OtConfirm/fHolyRequest.cs | 26 +- .../FPJ0000/OtConfirm/fHolyRequestAdd.cs | 13 +- .../Project/fPartBuyStatus.Designer.cs | 240 +++++++++--------- .../FPJ0000/Project/fPartBuyStatus.resx | 28 +- 5 files changed, 188 insertions(+), 160 deletions(-) diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs index b30821c..b346893 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.Designer.cs @@ -37,6 +37,8 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); this.bn = new System.Windows.Forms.BindingNavigator(this.components); + this.bs = new System.Windows.Forms.BindingSource(this.components); + this.dSKuntae = new FPJ0000.DSKuntae(); this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel(); this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton(); this.bindingNavigatorMovePreviousItem = new System.Windows.Forms.ToolStripButton(); @@ -66,8 +68,6 @@ this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.dv1 = new arCtl.arDatagridView(); - this.bs = new System.Windows.Forms.BindingSource(this.components); - this.dSKuntae = new FPJ0000.DSKuntae(); this.ta = new FPJ0000.DSKuntaeTableAdapters.EETGW_HolydayRequestTableAdapter(); this.uidDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.nameDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -86,14 +86,14 @@ this.remarkDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit(); this.toolStrip1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dv1)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).BeginInit(); this.SuspendLayout(); // // bn @@ -132,6 +132,17 @@ this.bn.TabIndex = 0; this.bn.Text = "bindingNavigator1"; // + // bs + // + this.bs.DataMember = "EETGW_HolydayRequest"; + this.bs.DataSource = this.dSKuntae; + this.bs.Sort = ""; + // + // dSKuntae + // + this.dSKuntae.DataSetName = "DSKuntae"; + this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; + // // bindingNavigatorCountItem // this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem"; @@ -435,17 +446,6 @@ this.dv1.TabIndex = 3; this.dv1.DataError += new System.Windows.Forms.DataGridViewDataErrorEventHandler(this.arDatagridView1_DataError); // - // bs - // - this.bs.DataMember = "EETGW_HolydayRequest"; - this.bs.DataSource = this.dSKuntae; - this.bs.Sort = ""; - // - // dSKuntae - // - this.dSKuntae.DataSetName = "DSKuntae"; - this.dSKuntae.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema; - // // ta // this.ta.ClearBeforeFill = true; @@ -542,6 +542,7 @@ this.HolyDays.DataPropertyName = "HolyDays"; dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129))); this.HolyDays.DefaultCellStyle = dataGridViewCellStyle4; this.HolyDays.HeaderText = "일"; this.HolyDays.Name = "HolyDays"; @@ -552,10 +553,12 @@ this.HolyTimes.DataPropertyName = "HolyTimes"; dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Bold); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); this.HolyTimes.DefaultCellStyle = dataGridViewCellStyle5; - this.HolyTimes.HeaderText = "시간"; + this.HolyTimes.HeaderText = "대체시간"; this.HolyTimes.Name = "HolyTimes"; - this.HolyTimes.Width = 64; + this.HolyTimes.Width = 88; // // HolyBackup // @@ -586,6 +589,8 @@ ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit(); this.bn.ResumeLayout(false); this.bn.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).EndInit(); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); this.splitContainer1.Panel1.ResumeLayout(false); @@ -593,8 +598,6 @@ ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dv1)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.dSKuntae)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs index 57026b8..84edb39 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequest.cs @@ -53,9 +53,8 @@ namespace FPJ0000 btSave.Visible = curLevel >= 5; btEdit.Text = curLevel >= 5 ? "승인(&E)" : "편집(&E)"; + binit = true; refreshData(); - binit = true; - } @@ -111,7 +110,26 @@ namespace FPJ0000 var ed = dtED.Text.Trim(); ta.Fill(this.dSKuntae.EETGW_HolydayRequest, FCOMMON.info.Login.gcode, sd, ed); + ////색상처리 + //dv1.SuspendLayout(); + //foreach(DataGridViewRow dr in this.dv1.Rows) + //{ + // var times = dr.Cells["HolyTimes"].Value; + // if(times == null || float.Parse( times.ToString()) < 1) + // { + // //대체없음 + // dr.DefaultCellStyle.BackColor = Color.White; + // } + // else + // { + // dr.DefaultCellStyle.BackColor = Color.LightSkyBlue; + // } + + //} + //dv1.ResumeLayout(); + //dv1.Invalidate(); + //dv1.Refresh(); } void funcSave() @@ -289,7 +307,7 @@ namespace FPJ0000 { var cnt = ta.Update(dr); dr.AcceptChanges(); - if(cnt == 0) + if (cnt == 0) FCOMMON.Util.MsgE($"저장 실패"); } catch (Exception ex) @@ -330,7 +348,7 @@ namespace FPJ0000 bs.RemoveCurrent(); var cnt = ta.Update(this.dSKuntae.EETGW_HolydayRequest); - if(cnt == 0) + if (cnt == 0) FCOMMON.Util.MsgQ("삭제가 완료되지 않았습니다"); } } diff --git a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs index efb55dd..3839caf 100644 --- a/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs +++ b/SubProject/FPJ0000/OtConfirm/fHolyRequestAdd.cs @@ -69,7 +69,7 @@ namespace FPJ0000.OtConfirm private void fHolyRequestAdd_Load(object sender, EventArgs e) { curLevel = Math.Max(FCOMMON.info.Login.level, FCOMMON.DBM.getAuth(FCOMMON.DBM.eAuthType.holyreq)); - + //관리자라면 관리자패널을 활성해준다. if (dr.RowState == DataRowState.Detached) @@ -111,6 +111,13 @@ namespace FPJ0000.OtConfirm if (tbDays.Text.IsNumeric()) vDay = int.Parse(tbDays.Text.Trim()); if (tbTimes.Text.IsNumeric()) vTime = float.Parse(tbTimes.Text.Trim()); + if (vDay > 0 && vTime > 0) + { + FCOMMON.Util.MsgE("사용일/시간을 동시에 입력할 수는 없습니다.\r\n" + + "대체휴가의 경우에만 시간을 입력하시기 바랍니다"); + return; + } + if (vDay < 1 && vTime < 0.1) { FCOMMON.Util.MsgE("사용 일/시간 값을 입력해주세요\n대체휴가에는 시간을 입력하세요"); @@ -132,7 +139,7 @@ namespace FPJ0000.OtConfirm } } - + dr.HolyReason = tbReason.Text.Trim(); dr.HolyLocation = tbLocation.Text.Trim(); @@ -157,7 +164,7 @@ namespace FPJ0000.OtConfirm private void button2_Click(object sender, EventArgs e) { - + } private void cmbPreset_SelectedIndexChanged(object sender, EventArgs e) diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs index a8193f3..b36a3b7 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.Designer.cs @@ -114,6 +114,7 @@ this.toolStripButton5 = new System.Windows.Forms.ToolStripButton(); this.toolStripButton1 = new System.Windows.Forms.ToolStripButton(); this.fpSpread1 = new FarPoint.Win.Spread.FpSpread(); + this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.panel3 = new System.Windows.Forms.Panel(); this.panel4 = new System.Windows.Forms.Panel(); @@ -125,7 +126,6 @@ this.tbPDate = new System.Windows.Forms.TextBox(); this.tbStatus = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); - this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView(); pdateLabel = new System.Windows.Forms.Label(); label3 = new System.Windows.Forms.Label(); label4 = new System.Windows.Forms.Label(); @@ -138,9 +138,9 @@ ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit(); this.bn.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.panel3.SuspendLayout(); this.panel4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit(); this.SuspendLayout(); // // pdateLabel @@ -895,123 +895,6 @@ this.fpSpread1.VerticalScrollBar.Renderer = flatScrollBarRenderer2; this.fpSpread1.EditModeOff += new System.EventHandler(this.fpSpread1_EditModeOff); // - // panel3 - // - this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); - this.panel3.Controls.Add(this.panel4); - this.panel3.Controls.Add(this.label1); - this.panel3.Dock = System.Windows.Forms.DockStyle.Top; - this.panel3.Location = new System.Drawing.Point(0, 92); - this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1345, 55); - this.panel3.TabIndex = 5; - // - // panel4 - // - this.panel4.Controls.Add(this.tbProjectName); - this.panel4.Controls.Add(this.tbProjectIdx); - this.panel4.Controls.Add(this.tbDue); - this.panel4.Controls.Add(this.linkLabel1); - this.panel4.Controls.Add(this.tbOrderNo); - this.panel4.Controls.Add(label3); - this.panel4.Controls.Add(label5); - this.panel4.Controls.Add(this.tbPDate); - this.panel4.Controls.Add(pdateLabel); - this.panel4.Controls.Add(this.tbStatus); - this.panel4.Controls.Add(label4); - this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel4.Location = new System.Drawing.Point(0, 24); - this.panel4.Name = "panel4"; - this.panel4.Padding = new System.Windows.Forms.Padding(5); - this.panel4.Size = new System.Drawing.Size(1345, 31); - this.panel4.TabIndex = 8; - // - // tbProjectName - // - this.tbProjectName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "name", true)); - this.tbProjectName.Dock = System.Windows.Forms.DockStyle.Fill; - this.tbProjectName.Location = new System.Drawing.Point(871, 5); - this.tbProjectName.Name = "tbProjectName"; - this.tbProjectName.Size = new System.Drawing.Size(469, 21); - this.tbProjectName.TabIndex = 3; - this.tbProjectName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // tbProjectIdx - // - this.tbProjectIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "Project", true)); - this.tbProjectIdx.Dock = System.Windows.Forms.DockStyle.Left; - this.tbProjectIdx.Location = new System.Drawing.Point(817, 5); - this.tbProjectIdx.Name = "tbProjectIdx"; - this.tbProjectIdx.ReadOnly = true; - this.tbProjectIdx.Size = new System.Drawing.Size(54, 21); - this.tbProjectIdx.TabIndex = 9; - this.tbProjectIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // tbDue - // - this.tbDue.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "crdue", true)); - this.tbDue.Dock = System.Windows.Forms.DockStyle.Left; - this.tbDue.Location = new System.Drawing.Point(733, 5); - this.tbDue.Name = "tbDue"; - this.tbDue.Size = new System.Drawing.Size(84, 21); - this.tbDue.TabIndex = 10; - this.tbDue.Text = "2020-01-01"; - this.tbDue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // linkLabel1 - // - this.linkLabel1.Dock = System.Windows.Forms.DockStyle.Left; - this.linkLabel1.Location = new System.Drawing.Point(625, 5); - this.linkLabel1.Name = "linkLabel1"; - this.linkLabel1.Size = new System.Drawing.Size(108, 21); - this.linkLabel1.TabIndex = 17; - this.linkLabel1.TabStop = true; - this.linkLabel1.Text = "SCR/CF Due Date"; - this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); - // - // tbOrderNo - // - this.tbOrderNo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "orderno", true)); - this.tbOrderNo.Dock = System.Windows.Forms.DockStyle.Left; - this.tbOrderNo.Location = new System.Drawing.Point(368, 5); - this.tbOrderNo.Name = "tbOrderNo"; - this.tbOrderNo.Size = new System.Drawing.Size(257, 21); - this.tbOrderNo.TabIndex = 5; - this.tbOrderNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // tbPDate - // - this.tbPDate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "pdate", true)); - this.tbPDate.Dock = System.Windows.Forms.DockStyle.Left; - this.tbPDate.Location = new System.Drawing.Point(193, 5); - this.tbPDate.Name = "tbPDate"; - this.tbPDate.Size = new System.Drawing.Size(100, 21); - this.tbPDate.TabIndex = 1; - this.tbPDate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // tbStatus - // - this.tbStatus.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "status", true)); - this.tbStatus.Dock = System.Windows.Forms.DockStyle.Left; - this.tbStatus.Location = new System.Drawing.Point(49, 5); - this.tbStatus.Name = "tbStatus"; - this.tbStatus.Size = new System.Drawing.Size(100, 21); - this.tbStatus.TabIndex = 7; - this.tbStatus.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; - // - // label1 - // - this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); - this.label1.Dock = System.Windows.Forms.DockStyle.Top; - this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(0, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(1345, 24); - this.label1.TabIndex = 2; - this.label1.Text = "프로젝트정보"; - this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // // fpSpread1_Sheet1 // this.fpSpread1_Sheet1.Reset(); @@ -1259,6 +1142,123 @@ this.fpSpread1_Sheet1.TitleInfo.Value = "Partlist"; this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1; // + // panel3 + // + this.panel3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180))))); + this.panel3.Controls.Add(this.panel4); + this.panel3.Controls.Add(this.label1); + this.panel3.Dock = System.Windows.Forms.DockStyle.Top; + this.panel3.Location = new System.Drawing.Point(0, 92); + this.panel3.Name = "panel3"; + this.panel3.Size = new System.Drawing.Size(1345, 55); + this.panel3.TabIndex = 5; + // + // panel4 + // + this.panel4.Controls.Add(this.tbProjectName); + this.panel4.Controls.Add(this.tbProjectIdx); + this.panel4.Controls.Add(this.tbDue); + this.panel4.Controls.Add(this.linkLabel1); + this.panel4.Controls.Add(this.tbOrderNo); + this.panel4.Controls.Add(label3); + this.panel4.Controls.Add(label5); + this.panel4.Controls.Add(this.tbPDate); + this.panel4.Controls.Add(pdateLabel); + this.panel4.Controls.Add(this.tbStatus); + this.panel4.Controls.Add(label4); + this.panel4.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel4.Location = new System.Drawing.Point(0, 24); + this.panel4.Name = "panel4"; + this.panel4.Padding = new System.Windows.Forms.Padding(5); + this.panel4.Size = new System.Drawing.Size(1345, 31); + this.panel4.TabIndex = 8; + // + // tbProjectName + // + this.tbProjectName.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "name", true)); + this.tbProjectName.Dock = System.Windows.Forms.DockStyle.Fill; + this.tbProjectName.Location = new System.Drawing.Point(871, 5); + this.tbProjectName.Name = "tbProjectName"; + this.tbProjectName.Size = new System.Drawing.Size(469, 21); + this.tbProjectName.TabIndex = 3; + this.tbProjectName.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tbProjectIdx + // + this.tbProjectIdx.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "Project", true)); + this.tbProjectIdx.Dock = System.Windows.Forms.DockStyle.Left; + this.tbProjectIdx.Location = new System.Drawing.Point(817, 5); + this.tbProjectIdx.Name = "tbProjectIdx"; + this.tbProjectIdx.ReadOnly = true; + this.tbProjectIdx.Size = new System.Drawing.Size(54, 21); + this.tbProjectIdx.TabIndex = 9; + this.tbProjectIdx.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tbDue + // + this.tbDue.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "crdue", true)); + this.tbDue.Dock = System.Windows.Forms.DockStyle.Left; + this.tbDue.Location = new System.Drawing.Point(733, 5); + this.tbDue.Name = "tbDue"; + this.tbDue.Size = new System.Drawing.Size(84, 21); + this.tbDue.TabIndex = 10; + this.tbDue.Text = "2020-01-01"; + this.tbDue.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // linkLabel1 + // + this.linkLabel1.Dock = System.Windows.Forms.DockStyle.Left; + this.linkLabel1.Location = new System.Drawing.Point(625, 5); + this.linkLabel1.Name = "linkLabel1"; + this.linkLabel1.Size = new System.Drawing.Size(108, 21); + this.linkLabel1.TabIndex = 17; + this.linkLabel1.TabStop = true; + this.linkLabel1.Text = "SCR/CF Due Date"; + this.linkLabel1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); + // + // tbOrderNo + // + this.tbOrderNo.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "orderno", true)); + this.tbOrderNo.Dock = System.Windows.Forms.DockStyle.Left; + this.tbOrderNo.Location = new System.Drawing.Point(368, 5); + this.tbOrderNo.Name = "tbOrderNo"; + this.tbOrderNo.Size = new System.Drawing.Size(257, 21); + this.tbOrderNo.TabIndex = 5; + this.tbOrderNo.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tbPDate + // + this.tbPDate.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "pdate", true)); + this.tbPDate.Dock = System.Windows.Forms.DockStyle.Left; + this.tbPDate.Location = new System.Drawing.Point(193, 5); + this.tbPDate.Name = "tbPDate"; + this.tbPDate.Size = new System.Drawing.Size(100, 21); + this.tbPDate.TabIndex = 1; + this.tbPDate.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // tbStatus + // + this.tbStatus.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bsPart, "status", true)); + this.tbStatus.Dock = System.Windows.Forms.DockStyle.Left; + this.tbStatus.Location = new System.Drawing.Point(49, 5); + this.tbStatus.Name = "tbStatus"; + this.tbStatus.Size = new System.Drawing.Size(100, 21); + this.tbStatus.TabIndex = 7; + this.tbStatus.TextAlign = System.Windows.Forms.HorizontalAlignment.Center; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(80)))), ((int)(((byte)(80)))), ((int)(((byte)(80))))); + this.label1.Dock = System.Windows.Forms.DockStyle.Top; + this.label1.ForeColor = System.Drawing.Color.White; + this.label1.Location = new System.Drawing.Point(0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(1345, 24); + this.label1.TabIndex = 2; + this.label1.Text = "프로젝트정보"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // fPartBuyStatus // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F); @@ -1281,10 +1281,10 @@ this.bn.ResumeLayout(false); this.bn.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.panel3.ResumeLayout(false); this.panel4.ResumeLayout(false); this.panel4.PerformLayout(); - ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); diff --git a/SubProject/FPJ0000/Project/fPartBuyStatus.resx b/SubProject/FPJ0000/Project/fPartBuyStatus.resx index 8a4004d..5df99a4 100644 --- a/SubProject/FPJ0000/Project/fPartBuyStatus.resx +++ b/SubProject/FPJ0000/Project/fPartBuyStatus.resx @@ -331,20 +331,20 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSyqioF+VSmxrY - zVTMdDqnaGqiC4NsMReZl9BMBxWiFL2o0C46talzzumGMzKXqc15F7wsdZdzdGf67TlnSw2EfvDhefGc - 74fz+57DYyf0nibpYqleFVWm/x0m1VPkpDnK2dNAR5X20RGPdaYzEm2lf/TbfVxo94Q/7NEu2uhlk8nk - tjrWYbXvsGxjofFz3obCT9OIKxtxCrKUPt6oZyKLdYtsuG/SBcMUA8M0A/0kA93EBjS/1tE67MA6AzSN - UCj8MIWUpybqH0mYtJVac25gYMaNrzMMORn0c5INdJvX8WXYSQSbGJh3wzDnglw5Df7dzjdcOLY82HJd - Gr0lrrmKlOprqG6rR1FDOfjSAAQTBPLTCJWdQEVTBbeKnWawsOJEaGI3wwliSvnvO4ea0Tz2EtX6fE6S - WBWB/NcJyK6Pg0hxCcmKZDQNLqDZZMfn72tYJT2FyXpoTiCoFPj4S3Pc+tEuvBqSoUSTxUmSaiJJ+DLS - n6dBa3Zwq3SMUVCRHlYcLoQV9XoE7IQXd9O5tUIYzTooDHfwqD0PseXnkVQVDeOkE0ZSLFuwdtzTiZUI - QmW7BGfvS10nCw4hoVKAgfE+yLsyIFPmIu5JCOo1H/FtloGRFNs34UIvYdHmAv+BV3BM4isOkhxEdl08 - btSEI77iAifJVSZA0pBG3iQE7P3AtBv97Ccm2EiRgTk6jyBIsn82SHKAPOSLoHxfXCkJQeYLIbTDKshV - Bch4J4SoJgZGIjCQf0NPBLRrkwg0Oyucy+mh51dpDM66ObpH53C7Nh2pJChWxCGv7tb2HYtzw00EjTsC - 1jZj3RH8Dwe7QtouwalctVNa8mxrr4f3Qq1Wbx5JbLJ746TI9HbL1JrTxl5YlihYFimYvSzZXRxs83ba - E6YoatXvZssPb5zHO57elhkoam0/KlZZA8WN9DapHgL+Imqk/UQtK4eTWzoChMoUHo/H+wPYU53U9zrm - dAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALqSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSalFRL0pTmxrY + zVTMvM0pmprowiBbzEWmLrygQoUoRS8qtItOberc5tyGMzKXqem8C16Wuss5ujP99pyzpQZCP/jwvHjO + 98P5fc/hsRP6QJ10ucygjCo3/A6TGChy0hxy9jTSUWV6OuKpznxOrK30j357gAvtnfDHvdolG71iNpvd + VscGrPZdVmwsNH4u2FD0aQZx5SNOQbbCxxv1TGSJbokN66dcME4zMM4wMEwx0E1uQv1rA+3DDmwwQMsI + haIP00itMlP/SMIk7dS6cxMDs258nWXIyaCfk2xCM76BL8NOItjCwIIbxnkXZIoZBN/vfsOFY+VBlpuS + 6G1R7XWk1txATUcjipvkCJYEIIggkJ1FqPQUKloquFXsNIPFVSdCEzUMJ4gpC37fPdSK1rGXqDEUcJLE + 6ggUvE5ATmMchHVXkFKXgpbBRbSa7fj8fR1rpKcwaS/NCQSVAh9/Sa7bMNqDV0NSlKqzOUlSbSQJX0XG + 83Roxx3cKl1jFJSkh1WHC2HFfR4BO+ElGjqvPhmmcR3qjPfwpDMfsfKLSKqOhmnKCRMpli1YO+HpxEoE + odI9gvMPJa7ThUeQUCnAwIQesp5MSBV5iHsWgkb1R3ybY2AixeonXegjLNlcCH7kFZwQ+4r44sPIaYjH + rdpwxFdc4iR5igSIm9LJm4SAvR+YcaOf/cQEGykyMFfnEfDFB+f44kPkIV/wC3xxrTQEWS+SoR1WQqYs + ROa7ZAhrY2AiAiP5NwxEQLu2iEC9u8KF3F56YY3G4JybQzM6j7v1GUgjQVFdHPIb7uzcsTg33UTQvCtg + bbPWXcH/cLArpO8RnMlTOSUlVdv7PbwfKpVq61hii90bJ0VmdFqm15029sKyTMGyRGHcy7LdxcE2b6c9 + YYqi1vxut/3wxnm8kxkdWYHC9s7jIqU1UNRM75DmIeAvwmbaT9i2ejSlrSsgWZHK4/F4fwDVcZ3Qsek6 + FQAAAABJRU5ErkJggg==