Amkor/Groupware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

신규 스케쥴 추가시 조회되지 않는 현상 수정

Browse Source 
스케쥴 승인,1,2 기능 구현
This commit is contained in:
chi
2021-05-18 09:21:34 +09:00
parent d56775dc75
commit b3228bbdb6
41 changed files with 2390 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

424
SubProject/FPJ0000/Project/fProjectList.Designer.cs generated
View File

@@ -30,25 +30,25 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectList));
FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType8 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType9 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType11 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType12 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType13 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType14 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType15 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType16 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType17 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType18 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType19 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType20 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType21 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType22 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType23 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType24 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType10 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType11 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType12 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -98,6 +98,7 @@
this.ta = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter();
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.cmbDateType = new System.Windows.Forms.ToolStripComboBox();
this.cmbYearS = new System.Windows.Forms.ToolStripComboBox();
@@ -159,13 +160,13 @@
this.button1 = new System.Windows.Forms.Button();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.label17 = new System.Windows.Forms.Label();
this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
this.cm.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
this.toolStrip1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.panel4.SuspendLayout();
@@ -175,7 +176,6 @@
this.toolStrip2.SuspendLayout();
this.panel1.SuspendLayout();
this.tableLayoutPanel3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
this.SuspendLayout();
//
// bn
@@ -606,6 +606,193 @@
this.fpSpread1.StatusBarVisible = true;
this.fpSpread1.TabIndex = 2;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
this.fpSpread1_Sheet1.SheetName = "Sheet1";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
this.fpSpread1_Sheet1.ColumnCount = 19;
this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
this.fpSpread1_Sheet1.AutoGenerateColumns = false;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료\r\n(ww)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " ";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "(ww)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No.";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType7.DecimalPlaces = 0;
numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType7.MaximumValue = 2147483647D;
numberCellType7.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType7;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType14;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state";
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType15;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "(ww)";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F;
numberCellType8.DecimalPlaces = 0;
numberCellType8.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType8.MaximumValue = 2147483647D;
numberCellType8.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType8;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType16;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part";
this.fpSpread1_Sheet1.Columns.Get(4).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType17;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType18;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType19;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType20;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W";
this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType21;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2";
this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(9).Label = "전장";
this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType22;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub";
this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W";
this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType23;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset";
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No.";
this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType24;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F;
numberCellType9.DecimalPlaces = 0;
numberCellType9.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType9.MaximumValue = 2147483647D;
numberCellType9.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType9;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt";
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F;
numberCellType10.MaximumValue = 999999999999999D;
numberCellType10.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType10;
this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo";
this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).Width = 63F;
numberCellType11.MaximumValue = 999999999999999D;
numberCellType11.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType11;
this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn";
this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(15).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType12.MaximumValue = 999999999999999D;
numberCellType12.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType12;
this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste";
this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType25;
this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno";
this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#";
this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType26;
this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo";
this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F;
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.DataSource = this.bs;
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// toolStrip1
//
this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
@@ -638,6 +825,8 @@
"출고일기준"});
this.cmbDateType.Name = "cmbDateType";
this.cmbDateType.Size = new System.Drawing.Size(121, 25);
this.cmbDateType.Visible = false;
this.cmbDateType.Click += new System.EventHandler(this.cmbDateType_Click);
//
// cmbYearS
//
@@ -645,12 +834,14 @@
this.cmbYearS.DropDownWidth = 70;
this.cmbYearS.Name = "cmbYearS";
this.cmbYearS.Size = new System.Drawing.Size(100, 25);
this.cmbYearS.Visible = false;
//
// toolStripLabel4
//
this.toolStripLabel4.Name = "toolStripLabel4";
this.toolStripLabel4.Size = new System.Drawing.Size(15, 22);
this.toolStripLabel4.Text = "~";
this.toolStripLabel4.Visible = false;
//
// cmbYearE
//
@@ -658,6 +849,8 @@
this.cmbYearE.DropDownWidth = 70;
this.cmbYearE.Name = "cmbYearE";
this.cmbYearE.Size = new System.Drawing.Size(100, 25);
this.cmbYearE.Visible = false;
this.cmbYearE.Click += new System.EventHandler(this.cmbYearE_Click);
//
// toolStripLabel6
//
@@ -1339,193 +1532,6 @@
this.label17.Text = "구매 진행";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// fpSpread1_Sheet1
//
this.fpSpread1_Sheet1.Reset();
this.fpSpread1_Sheet1.SheetName = "Sheet1";
// Formulas and custom names must be loaded with R1C1 reference style
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
this.fpSpread1_Sheet1.ColumnCount = 19;
this.fpSpread1_Sheet1.ColumnHeader.RowCount = 2;
this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
this.fpSpread1_Sheet1.ActiveRowIndex = -1;
this.fpSpread1_Sheet1.AutoGenerateColumns = false;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "상태";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "완료\r\n(ww)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "진행\r\n(%)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "파트";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "공정";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "요청";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "담당";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).ColumnSpan = 3;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "협업";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "자산번호";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "프로젝트";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "대수";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Original\r\n($K)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).StyleName = " ";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "Input\r\n($K)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "Effect\r\n($K)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "CR/CF#";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).RowSpan = 2;
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "비고";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 2).Value = "(ww)";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 8).Value = "H/W";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 9).Value = "전장";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 10).Value = "S/W";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 11).Value = "Asset No.";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 17).Value = "CR/CF#";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 46F;
this.fpSpread1_Sheet1.Columns.Get(0).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType1.DecimalPlaces = 0;
numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType1.MaximumValue = 2147483647D;
numberCellType1.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Locked = true;
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(1).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "status";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Tag = "state";
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "edate";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "(ww)";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Width = 63F;
numberCellType2.DecimalPlaces = 0;
numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType2.MaximumValue = 2147483647D;
numberCellType2.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType2;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ProgressPrj";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "part";
this.fpSpread1_Sheet1.Columns.Get(4).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(5).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "process";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType5;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "reqstaff";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "userManager";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType7;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "usermain";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Label = "H/W";
this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType8;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "userhw2";
this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(9).Label = "전장";
this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(9).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(10).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "usersub";
this.fpSpread1_Sheet1.Columns.Get(10).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).Label = "S/W";
this.fpSpread1_Sheet1.Columns.Get(10).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(10).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType10;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "asset";
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "Asset No.";
this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(12).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType11;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "name";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).Width = 63F;
numberCellType3.DecimalPlaces = 0;
numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType3.MaximumValue = 2147483647D;
numberCellType3.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = numberCellType3;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "cnt";
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).Width = 63F;
numberCellType4.MaximumValue = 999999999999999D;
numberCellType4.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType4;
this.fpSpread1_Sheet1.Columns.Get(14).DataField = "costo";
this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).Width = 63F;
numberCellType5.MaximumValue = 999999999999999D;
numberCellType5.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType5;
this.fpSpread1_Sheet1.Columns.Get(15).DataField = "costn";
this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(15).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(16).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
numberCellType6.MaximumValue = 999999999999999D;
numberCellType6.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType6;
this.fpSpread1_Sheet1.Columns.Get(16).DataField = "coste";
this.fpSpread1_Sheet1.Columns.Get(16).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(16).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(17).CellType = textCellType12;
this.fpSpread1_Sheet1.Columns.Get(17).DataField = "orderno";
this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(17).Label = "CR/CF#";
this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(17).Width = 63F;
this.fpSpread1_Sheet1.Columns.Get(18).CellType = textCellType13;
this.fpSpread1_Sheet1.Columns.Get(18).DataField = "memo";
this.fpSpread1_Sheet1.Columns.Get(18).Width = 63F;
this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
this.fpSpread1_Sheet1.DataSource = this.bs;
this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// fProjectList
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1547,6 +1553,7 @@
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
this.cm.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
@@ -1559,7 +1566,6 @@
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.tableLayoutPanel3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

28
SubProject/FPJ0000/Project/fProjectList.cs
View File

@@ -153,14 +153,18 @@ namespace FPJ0000
if (btViewDel.Checked == false) State_where += " isnull(isdel,0)=0 and "; //삭제보기 햇을 경우
var dateField = "pdate";
if (cmbDateType.SelectedIndex == 1) dateField = "edate";
else if (cmbDateType.SelectedIndex == 2) dateField = "odate";
//var dateField = "pdate";
//if (cmbDateType.SelectedIndex == 1) dateField = "edate";
//else if (cmbDateType.SelectedIndex == 2) dateField = "odate";
State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " +
"ISNULL(usermain, '') LIKE @username OR " +
"ISNULL(reqstaff, '') LIKE @username OR " +
"ISNULL(usersub, '') LIKE @username) ";
//State_where += " " + dateField + " between '" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(userManager, '') LIKE @username OR " +
// "ISNULL(usermain, '') LIKE @username OR " +
// "ISNULL(reqstaff, '') LIKE @username OR " +
// "ISNULL(usersub, '') LIKE @username) ";
State_where += " (ISNULL(userManager, '') LIKE @username OR " +
"ISNULL(usermain, '') LIKE @username OR " +
"ISNULL(reqstaff, '') LIKE @username OR " +
"ISNULL(usersub, '') LIKE @username) ";
if (state != "") State_where += " AND " + state;
if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(category,'') = '" + cmbCate.Text + "'";
@@ -750,5 +754,15 @@ namespace FPJ0000
{
}
private void cmbDateType_Click(object sender, EventArgs e)
{
}
private void cmbYearE_Click(object sender, EventArgs e)
{
}
}
}

55
SubProject/FPJ0000/Project/fProjectList.resx
View File

@@ -230,36 +230,39 @@
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIxSURBVDhPpZL9T1JxGMXvf9TWpq50rlGLylIJXKQt2mzT
1ZqrqWtYgERijlWrZimhu5mUjohorLKEFIeaRhq5Xu0Fe4FLIBBB2bqne7/cKZf8qT7b2d3uc87Zs+8e
6r8xOT+i/WYQBtt76Abmcbz/DdT0q0fCWETfaEzTO7K40PswCos7gu4HEVCpzC/kq9HoZoWMCNoT+57v
pU759DB4NdCNqHHM3Ux+NpifQciI6PF8JfP+ucugA5dgmbkACnnwhgMXZ1ctMA9HyDwXyuoNI1e8Yf95
v6igxipTVNE7UNElhbJbJvJTtvGQ0JUlkshAdWZquaDGWq6QnyxjW4dbYBxtReXZbSTIMzAWyhY4JsNw
TITgmg7h7ZckdndMkAJlX7lCpt/Kqu82Ype5EqUniiBt24hBXxg2XuPM3xu8/pRAVZsPCnp7dYVOyja7
GiDRFrMl2oItplsLSKSXYJ9kiNfBfUkB2YLbwM6pzrYP8p4y1F7bg8POg9igXceu167dzG9ktH9APLUE
5xSD29NZUUNPGCTTKy+rulINnUeNQ446lGqL2MKWbJhHP/gOi99+4o4/u8H9Ge6QXI8Z5ErZJYekvRgl
ugIUHl2zHObRXJ8nBUNckA+TghvcQ+TyIhiHyuRb9Q7UV18ixhW4n0aI1xPgCvhAvjZ1eH4LGRFN9HNE
kz/AxDP4HE0jyKRA7TR4kS9J0z2HkBFxxDI3Vt8ZSNV3zqL2nB97T6/cyz9CUX8AcJks2URqZdcAAAAA
SUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIwSURBVDhPpZL/TxJxHMbvP2prU1c613CLylIJXKQt2mzT
1ZqrqWtYHBhDc8xaNUsJ3WVSOiKiscoCUhxqGmrk+qoV9gWOQCCCsnVPd8dNOfKnem3Pbrv38zx777M3
8d8YHR/RcTsIvfU9tEOLOD34Fmrq9RNhLGJgLKbpH11Z7n8chdkdQe+jCIhU5hfy1WRwMUJGBOWJfc/3
Emd9bdB7NdCOqnHK3cL/bDQ9h5AR0ef5ys8HF66CClyBee4SCOTBGY5cnt+wwOSK8PNcCIs3jFxxhsMX
/aKCWotMUU3tQWWPFMpemchPWCdCQleWSCID1bnptYJaS4VCri9ndK5WtI/pUHV+Fx/kGBoPZQvsU2HY
J0NwzoSw9CWJ/Z2TfIFyoEIh0+1k1PebsM9UhdIzRZAayjDsC8PKaYL+e4M3nxKoNvigoHbXVJJSpsXZ
CAlZzJSQBTuMd5aRSK/CNkXzXjv75Qv4LdgNbKzqrYcg7ytH3Y0DOO44im3kFmYruXk7t1G77QPiqVU4
pmncncmKGJmlkUyvv6zqWg20HjWO2etRShYxha3ZMEfb8DusfPuJe/7sBg/n2ENyPqWRK2WPHJKOYpRo
C1B4ctNamENzc5EvGGGDXJgvuMU+RC4vg3GojL4N70B9/RVibIH7WYT3egJsARfIV1mn57eQEdFMvUA0
+QN0PIPP0TSCdArEXr0X+ZI0P7ALGREnzAvjDd2BVEP3POou+HGwa/1e/hGC+ANihyzTq1/1MwAAAABJ
RU5ErkJggg==
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ1SURBVDhPpZFJTBNhHMXn4J2bdw9eRCSKVG8cTExMPHgy
JB5MNF7ARIMJBw8gISBqwLCoCRJcQHZBKRJaQwgGuoBQpCMOpS3TUipTgSkznaXT6Ty/llHUxMTlZV5m
yfd7/2Wo/9bSSMFCaPisFv7FK6MnA/6XR/YH+gpyfvLbgpyJiaJ9Jk5Rrg6LahhpAAa5Mt59TikxRCZK
kmvOC+o3R+euKSFnWYh5fey8iVMUPVQYN3QFaqQBUrAREvsEcmgARoonWQkYuki8s/ue2gbHcUlm0EKb
OEX5uo4KaW2HwC1I+JshfKzC1kwJYrNXwXtrwC/eAr9wE9uecuIy0hkH3+Bx0cRJQH+hlpI3wNMt2J6v
Azd5AzLnJlUFs3rmHv/eQWY8T3++YuKZDk5o2fnTKrEM6FIW1GUGavQBaLoXVocL7eMsuqfWYfeEkdmb
iZOAFkvS0GXoggsp3gZtcwDJjTYoa/fgXezAyByHlc8SVjdVuAMCxha+YNjaqJs4+QutFjWtCdC2rEhy
ndmqSrgGcrAcfY4oliIiZlgZjqCEaWJvVEXPOxYmTlGe+/mKofEEfgZ1vRFKqIrAZZB8l7Nt+2MqHIEE
pvwJjDMi5sIqOicjewHLd/KicpyOB53d6cRKO0TfQ4hMA8RPteghMy+tS5j07cIZv19T0Tq6vBfA1OZe
Z+oOd9G3D8U8dXnKj34z1KS7/QLmCeRkFcyS6tYPIqrr2wxbxamLZsTv1WRjD7Ta2cp+sove6Sge293p
qvqnhnesDa7mYuFFaW6xefTP9arizBXno0t80NaE0eoiyfz8d3peerB4rPK0bL97bm8X/yaK+gpvpyRE
ifAKVAAAAABJRU5ErkJggg==
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJ2SURBVDhPpZFLTNNwHMd78M7NuwcvIhJFpjcOJiYmHjwZ
Eg8mGi9gosGEgwceGhCVoDzUBAhEQd6CMiRshhAMbAOEIatYxja7MSadQEe7PtZ1/frfqKImJj6+6Td9
5P/5/h6l/lvLI3mLweGzWugXr46e9PteHNnv78vL+slv8rImJgr2mThFuTosqmGkABjkSnv3OalEEZ4o
Sqw5L6jfHJm/pgSdJUHm1bHzJk5R9FB+zNAVqOE6SIF6SGw75OAAjCRPsuIwdJF4Z/c9uQ2O4xLMoIU2
cYrydh0VUtoOgZsQ9zVC+FCJrdkiROeugvdUgV+qAL94E9vuUuIS0hkH7+Bx0cRJQH++lpQ3wNNN2F6o
ATd5AzI3Q6oKZvX0Pfa9g/R47v5cxcTTHZzQMvOnVGIZ0KUMqMsM1Mgj0HQvrA4X2sZZdE+tw+4OIb03
EycBTZaEocvQBReSvA3a5gASG61Q1u7Ds9SBkXkOq58lfNpUMeMXMLb4BcPWh7qJk7/QbFFTmgBty4oE
15mpqoSqIAdK0eeIYDksYpaV4QhImCb2RFT0vGVh4hTlfpCrGBpP4KdQ1+uhBCsJXALJeznTti+qwuGP
Y8oXxzgjYj6konMyvBewcjcnIsfomN/RnYqvtkH0PobI1EH8WI0eMvPyuoRJ7y6c9rs1Fc2jK3sBTHX2
dabmcBd951DUXZOj/OjXQ/X6jE/AAoGcrII5Ut36XsSt2hbDVnbqohnxezXY2APNdra8n+yidzqCFrsr
VVHbbnjGWuFqLBSeF2cXmkf/XC/LzlxxPrnEB2wNGL1dIJmf/07Pig8WjpWflu33zu3t4t9EUV8BYv4k
OVzp+PUAAAAASUVORK5CYII=
</value>
</data>
<metadata name="dsMSSQL.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="cm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>387, 17</value>
</metadata>
@@ -317,12 +320,18 @@
<metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>561, 17</value>
</metadata>
<metadata name="bsHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>561, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>731, 17</value>
</metadata>
<metadata name="taHist.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>647, 17</value>
</metadata>
<metadata name="toolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>731, 17</value>
</metadata>
<metadata name="toolStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>169, 56</value>
</metadata>

185
SubProject/FPJ0000/Project/fProjectSchedule.Designer.cs generated
View File

@@ -39,20 +39,20 @@
System.Windows.Forms.Label pdateLabel;
System.Windows.Forms.Label label2;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fProjectSchedule));
FarPoint.Win.Spread.CellType.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType1 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType2 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType3 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType4 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType5 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType6 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType2 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType3 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType4 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType5 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType6 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType7 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType29 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType30 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType31 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType32 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType33 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType34 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType30 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType31 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType();
this.dsPRJ = new FPJ0000.dsPRJ();
this.tam = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_ProjectsScheduleTableAdapter();
@@ -129,7 +129,10 @@
this.tbIdx = new System.Windows.Forms.TextBox();
this.nameTextBox = new System.Windows.Forms.TextBox();
this.pdateTextBox = new System.Windows.Forms.TextBox();
this.comboBox1 = new System.Windows.Forms.ComboBox();
this.taProjectInfo = new FPJ0000.dsPRJTableAdapters.ProjectsTableAdapter();
this.chkapp1 = new System.Windows.Forms.ToolStripButton();
this.chkapp2 = new System.Windows.Forms.ToolStripButton();
statusLabel = new System.Windows.Forms.Label();
odateLabel = new System.Windows.Forms.Label();
edateLabel = new System.Windows.Forms.Label();
@@ -296,8 +299,10 @@
this.bindingNavigatorDeleteItem,
this.projectsScheduleBindingNavigatorSaveItem,
this.toolStripButton1,
this.toolStripButton10});
this.bn.Location = new System.Drawing.Point(5, 221);
this.toolStripButton10,
this.chkapp2,
this.chkapp1});
this.bn.Location = new System.Drawing.Point(5, 259);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
@@ -442,7 +447,7 @@
this.fpSpread1.Name = "fpSpread1";
this.fpSpread1.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread1_Sheet1});
this.fpSpread1.Size = new System.Drawing.Size(795, 202);
this.fpSpread1.Size = new System.Drawing.Size(795, 240);
this.fpSpread1.TabIndex = 1;
//
// cm1
@@ -541,68 +546,68 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 5).Value = "완료";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(1, 6).Value = "%";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 21F;
numberCellType1.DecimalPlaces = 0;
numberCellType1.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType1.MaximumValue = 2147483647D;
numberCellType1.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType1;
numberCellType29.DecimalPlaces = 0;
numberCellType29.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType29.MaximumValue = 2147483647D;
numberCellType29.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType29;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "seq";
this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(0).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType29;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "title";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
numberCellType2.DecimalPlaces = 0;
numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType2.MaximumValue = 2147483647D;
numberCellType2.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType2;
numberCellType30.DecimalPlaces = 0;
numberCellType30.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType30.MaximumValue = 2147483647D;
numberCellType30.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = numberCellType30;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "sw";
this.fpSpread1_Sheet1.Columns.Get(2).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).Label = "시작";
this.fpSpread1_Sheet1.Columns.Get(2).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
numberCellType3.DecimalPlaces = 0;
numberCellType3.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType3.MaximumValue = 2147483647D;
numberCellType3.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType3;
numberCellType31.DecimalPlaces = 0;
numberCellType31.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType31.MaximumValue = 2147483647D;
numberCellType31.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = numberCellType31;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "ew";
this.fpSpread1_Sheet1.Columns.Get(3).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(3).Label = "완료";
this.fpSpread1_Sheet1.Columns.Get(3).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
numberCellType4.DecimalPlaces = 0;
numberCellType4.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType4.MaximumValue = 2147483647D;
numberCellType4.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType4;
numberCellType32.DecimalPlaces = 0;
numberCellType32.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType32.MaximumValue = 2147483647D;
numberCellType32.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = numberCellType32;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "swa";
this.fpSpread1_Sheet1.Columns.Get(4).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(4).Label = "시작";
this.fpSpread1_Sheet1.Columns.Get(4).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
numberCellType5.DecimalPlaces = 0;
numberCellType5.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType5.MaximumValue = 2147483647D;
numberCellType5.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType5;
numberCellType33.DecimalPlaces = 0;
numberCellType33.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType33.MaximumValue = 2147483647D;
numberCellType33.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = numberCellType33;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "ewa";
this.fpSpread1_Sheet1.Columns.Get(5).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(5).Label = "완료";
this.fpSpread1_Sheet1.Columns.Get(5).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
numberCellType6.DecimalPlaces = 0;
numberCellType6.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType6.MaximumValue = 2147483647D;
numberCellType6.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType6;
numberCellType34.DecimalPlaces = 0;
numberCellType34.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType34.MaximumValue = 2147483647D;
numberCellType34.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = numberCellType34;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "progress";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "%";
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType30;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "uid";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType31;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "memo";
this.fpSpread1_Sheet1.Columns.Get(8).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(8).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
@@ -615,10 +620,10 @@
this.groupBox1.Controls.Add(this.fpSpread1);
this.groupBox1.Controls.Add(this.bn);
this.groupBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox1.Location = new System.Drawing.Point(332, 0);
this.groupBox1.Location = new System.Drawing.Point(332, 28);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(5);
this.groupBox1.Size = new System.Drawing.Size(805, 251);
this.groupBox1.Size = new System.Drawing.Size(805, 289);
this.groupBox1.TabIndex = 2;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "Schedule";
@@ -627,10 +632,10 @@
//
this.groupBox2.Controls.Add(this.panel1);
this.groupBox2.Dock = System.Windows.Forms.DockStyle.Fill;
this.groupBox2.Location = new System.Drawing.Point(5, 256);
this.groupBox2.Location = new System.Drawing.Point(5, 322);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(5);
this.groupBox2.Size = new System.Drawing.Size(654, 410);
this.groupBox2.Size = new System.Drawing.Size(654, 344);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Time Table";
@@ -641,7 +646,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(5, 19);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(644, 386);
this.panel1.Size = new System.Drawing.Size(644, 320);
this.panel1.TabIndex = 0;
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
this.panel1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseClick);
@@ -652,10 +657,10 @@
this.groupBox3.Controls.Add(this.groupBox4);
this.groupBox3.Controls.Add(this.bnTodo);
this.groupBox3.Dock = System.Windows.Forms.DockStyle.Right;
this.groupBox3.Location = new System.Drawing.Point(659, 256);
this.groupBox3.Location = new System.Drawing.Point(659, 322);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(10);
this.groupBox3.Size = new System.Drawing.Size(483, 410);
this.groupBox3.Size = new System.Drawing.Size(483, 344);
this.groupBox3.TabIndex = 4;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Todo";
@@ -670,7 +675,7 @@
this.fpSpread2.Name = "fpSpread2";
this.fpSpread2.Sheets.AddRange(new FarPoint.Win.Spread.SheetView[] {
this.fpSpread2_Sheet1});
this.fpSpread2.Size = new System.Drawing.Size(463, 251);
this.fpSpread2.Size = new System.Drawing.Size(463, 185);
this.fpSpread2.TabIndex = 1;
//
// cm2
@@ -754,27 +759,27 @@
this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "완료일";
this.fpSpread2_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "진행";
this.fpSpread2_Sheet1.ColumnHeader.Rows.Get(0).Height = 31F;
this.fpSpread2_Sheet1.Columns.Get(0).CellType = textCellType4;
this.fpSpread2_Sheet1.Columns.Get(0).CellType = textCellType32;
this.fpSpread2_Sheet1.Columns.Get(0).DataField = "sort";
this.fpSpread2_Sheet1.Columns.Get(0).Label = "No";
this.fpSpread2_Sheet1.Columns.Get(0).Width = 58F;
this.fpSpread2_Sheet1.Columns.Get(1).CellType = textCellType5;
this.fpSpread2_Sheet1.Columns.Get(1).CellType = textCellType33;
this.fpSpread2_Sheet1.Columns.Get(1).DataField = "title";
this.fpSpread2_Sheet1.Columns.Get(1).Label = "항목";
this.fpSpread2_Sheet1.Columns.Get(1).Width = 151F;
this.fpSpread2_Sheet1.Columns.Get(2).CellType = textCellType6;
this.fpSpread2_Sheet1.Columns.Get(2).CellType = textCellType34;
this.fpSpread2_Sheet1.Columns.Get(2).DataField = "pdate";
this.fpSpread2_Sheet1.Columns.Get(2).Label = "시작일";
this.fpSpread2_Sheet1.Columns.Get(2).Width = 84F;
this.fpSpread2_Sheet1.Columns.Get(3).CellType = textCellType7;
this.fpSpread2_Sheet1.Columns.Get(3).CellType = textCellType35;
this.fpSpread2_Sheet1.Columns.Get(3).DataField = "edate";
this.fpSpread2_Sheet1.Columns.Get(3).Label = "완료일";
this.fpSpread2_Sheet1.Columns.Get(3).Width = 76F;
numberCellType7.DecimalPlaces = 0;
numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType7.MaximumValue = 2147483647D;
numberCellType7.MinimumValue = -2147483648D;
this.fpSpread2_Sheet1.Columns.Get(4).CellType = numberCellType7;
numberCellType35.DecimalPlaces = 0;
numberCellType35.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType35.MaximumValue = 2147483647D;
numberCellType35.MinimumValue = -2147483648D;
this.fpSpread2_Sheet1.Columns.Get(4).CellType = numberCellType35;
this.fpSpread2_Sheet1.Columns.Get(4).DataField = "process";
this.fpSpread2_Sheet1.Columns.Get(4).Label = "진행";
this.fpSpread2_Sheet1.Columns.Get(4).Width = 77F;
@@ -792,7 +797,7 @@
//
this.groupBox4.Controls.Add(this.textBox1);
this.groupBox4.Dock = System.Windows.Forms.DockStyle.Bottom;
this.groupBox4.Location = new System.Drawing.Point(10, 275);
this.groupBox4.Location = new System.Drawing.Point(10, 209);
this.groupBox4.Name = "groupBox4";
this.groupBox4.Padding = new System.Windows.Forms.Padding(10);
this.groupBox4.Size = new System.Drawing.Size(463, 100);
@@ -831,7 +836,7 @@
this.toolStripButton7,
this.toolStripButton8,
this.toolStripButton9});
this.bnTodo.Location = new System.Drawing.Point(10, 375);
this.bnTodo.Location = new System.Drawing.Point(10, 309);
this.bnTodo.MoveFirstItem = this.toolStripButton2;
this.bnTodo.MoveLastItem = this.toolStripButton5;
this.bnTodo.MoveNextItem = this.toolStripButton4;
@@ -966,10 +971,11 @@
//
this.panel2.Controls.Add(this.groupBox1);
this.panel2.Controls.Add(this.panel3);
this.panel2.Controls.Add(this.comboBox1);
this.panel2.Dock = System.Windows.Forms.DockStyle.Top;
this.panel2.Location = new System.Drawing.Point(5, 5);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(1137, 251);
this.panel2.Size = new System.Drawing.Size(1137, 317);
this.panel2.TabIndex = 6;
//
// panel3
@@ -996,9 +1002,9 @@
this.panel3.Controls.Add(pdateLabel);
this.panel3.Controls.Add(this.pdateTextBox);
this.panel3.Dock = System.Windows.Forms.DockStyle.Left;
this.panel3.Location = new System.Drawing.Point(0, 0);
this.panel3.Location = new System.Drawing.Point(0, 28);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(332, 251);
this.panel3.Size = new System.Drawing.Size(332, 289);
this.panel3.TabIndex = 36;
//
// textBox3
@@ -1110,10 +1116,42 @@
this.pdateTextBox.TabIndex = 5;
this.pdateTextBox.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// comboBox1
//
this.comboBox1.Dock = System.Windows.Forms.DockStyle.Top;
this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboBox1.Font = new System.Drawing.Font("굴림", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.comboBox1.FormattingEnabled = true;
this.comboBox1.Location = new System.Drawing.Point(0, 0);
this.comboBox1.Name = "comboBox1";
this.comboBox1.Size = new System.Drawing.Size(1137, 28);
this.comboBox1.TabIndex = 2;
this.comboBox1.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
// taProjectInfo
//
this.taProjectInfo.ClearBeforeFill = true;
//
// chkapp1
//
this.chkapp1.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.chkapp1.Image = global::FPJ0000.Properties.Resources.accept;
this.chkapp1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.chkapp1.Name = "chkapp1";
this.chkapp1.Size = new System.Drawing.Size(58, 22);
this.chkapp1.Text = "승인1";
this.chkapp1.Click += new System.EventHandler(this.chkapp1_Click);
//
// chkapp2
//
this.chkapp2.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.chkapp2.Image = global::FPJ0000.Properties.Resources.accept;
this.chkapp2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.chkapp2.Name = "chkapp2";
this.chkapp2.Size = new System.Drawing.Size(58, 22);
this.chkapp2.Text = "승인2";
this.chkapp2.Click += new System.EventHandler(this.chkapp2_Click);
//
// fProjectSchedule
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -1237,5 +1275,8 @@
private System.Windows.Forms.BindingSource bsPrjinfo;
private dsPRJTableAdapters.ProjectsTableAdapter taProjectInfo;
private System.Windows.Forms.TextBox textBox3;
private System.Windows.Forms.ComboBox comboBox1;
private System.Windows.Forms.ToolStripButton chkapp1;
private System.Windows.Forms.ToolStripButton chkapp2;
}
}

145
SubProject/FPJ0000/Project/fProjectSchedule.cs
View File

@@ -16,7 +16,8 @@ namespace FPJ0000
int projectindex = 0;
EEEntities db;
List<EETGW_ProjectsSchedule> list;
Boolean bini = false;
Boolean bInit = false;
public fProjectSchedule(int project_)
{
InitializeComponent();
@@ -26,6 +27,7 @@ namespace FPJ0000
fn_fpcolsize2 = util.MakeFilePath(util.CurrentPath, "formSetting", "fp2_" + this.Name + ".ini");
this.FormClosed += FProjectSchedule_FormClosed;
this.FormClosing += FProjectSchedule_FormClosing;
this.dsPRJ.EETGW_ProjectsSchedule.TableNewRow += ProjectsSchedule_TableNewRow;
}
private void FProjectSchedule_FormClosing(object sender, FormClosingEventArgs e)
@@ -33,7 +35,7 @@ namespace FPJ0000
this.Validate();
this.bs.EndEdit();
this.bsTodo.EndEdit();
if (dsPRJ.HasChanges())
{
var dlg = FCOMMON.Util.MsgQ("변경된 자료가 있습니다. 지금 화면을 닫으면 해당 자료는 손실됩니다\n화면을 닫을까요?");
@@ -47,7 +49,7 @@ namespace FPJ0000
private void FProjectSchedule_FormClosed(object sender, FormClosedEventArgs e)
{
this.dsPRJ.EETGW_ProjectsSchedule.TableNewRow -= ProjectsSchedule_TableNewRow;
this.dsPRJ.EETGW_ProjectsSchedule.RowChanged += EETGW_ProjectsSchedule_RowChanged;
}
@@ -56,6 +58,8 @@ namespace FPJ0000
e.Row["wuid"] = FCOMMON.info.Login.no;
e.Row["wdate"] = DateTime.Now;
e.Row["project"] = this.projectindex;
e.Row["appoval"] = 0; //신규추가는 확정안되는 데이터이다
e.Row["no"] = int.Parse(this.comboBox1.Text);
}
private void fProjectSchedule_Load(object sender, EventArgs e)
@@ -63,11 +67,35 @@ namespace FPJ0000
//프로젝트 정보 채우기
this.taProjectInfo.FillByIDX(this.dsPRJ.Projects, this.projectindex);
//스케쥴 그룹(no)
var db = new EEEntities();
var nolist = db.EETGW_ProjectsSchedule.AsNoTracking().Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == this.projectindex).GroupBy(t => t.no).ToList();
this.comboBox1.Items.Clear();
foreach (var item in nolist)
{
if (item.Key == null) this.comboBox1.Items.Add("1");
else this.comboBox1.Items.Add(item.Key.ToString());
}
db.Dispose();
if (this.comboBox1.Items.Count == 0)
{
util.MsgE("이 프로젝트에는 스케쥴이 등록되지 않았습니다\n" +
"스케쥴을 등록한 후 에는 관리자이 승인과정이 필요하며 승인이 완료되면 계획은 수정할 수 없습니다");
this.comboBox1.Items.Add("1");
this.comboBox1.SelectedIndex = 0;
}
else
{
this.comboBox1.SelectedIndex = this.comboBox1.Items.Count - 1;
}
this.comboBox1.Items.Add("스케쥴 추가");
RefreshData();
RefreshGraph();
this.dsPRJ.EETGW_ProjectsSchedule.RowChanged += EETGW_ProjectsSchedule_RowChanged;
bini = true;
//시작할떄 cww 를 가져오낟.
var sql = "select dbo.getWorkWeek('" + DateTime.Now.ToShortDateString() + "')";
@@ -77,14 +105,14 @@ namespace FPJ0000
CWW = int.Parse(wccstr.ToString());
cmd.Connection.Close();
cmd.Dispose();
bInit = true;
}
int CWW = 0;
private void EETGW_ProjectsSchedule_RowChanged(object sender, DataRowChangeEventArgs e)
{
if (bini == false) return;
if (bInit == false) return;
RefreshGraph();
}
@@ -94,10 +122,12 @@ namespace FPJ0000
}
void RefreshData()
{
var scno = int.Parse(comboBox1.Text);
try
{
//list = db.EETGW_ProjectsSchedule.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.project == this.projectindex).OrderBy(t => t.seq).ToList();
this.ta.Fill(this.dsPRJ.EETGW_ProjectsSchedule, FCOMMON.info.Login.gcode, this.projectindex);
this.ta.Fill(this.dsPRJ.EETGW_ProjectsSchedule, FCOMMON.info.Login.gcode, this.projectindex, scno);
this.taTodo.Fill(this.dsPRJ.EETGW_ProjectToDo, this.projectindex);
//this.bs.DataSource = list;//.ToList();// db.EETGW_ProjectsSchedule.Local;
//this.fpSpread1_Sheet1.DataSource = this.bs;
@@ -108,6 +138,45 @@ namespace FPJ0000
{
System.Windows.Forms.MessageBox.Show(ex.Message);
}
Application.DoEvents();
//해당스케쥴의 승인상태를 확인
var db = new EEEntities();
var dr = db.EETGW_ProjectsSchedule.Where(t => t.project == this.projectindex && t.no == scno).FirstOrDefault();
if (dr == null || dr.appoval == 0)
{
chkapp1.Checked = false;
chkapp2.Checked = false;
}
else if (dr.appoval == 1)
{
chkapp1.Checked = true;
chkapp2.Checked = false;
this.fpSpread1.Sheets[0].Columns[2].Locked = true;
this.fpSpread1.Sheets[0].Columns[3].Locked = true;
this.fpSpread1.Sheets[0].Columns[2].BackColor = Color.FromArgb(230, 230, 230);
this.fpSpread1.Sheets[0].Columns[3].BackColor = Color.FromArgb(230, 230, 230);
}
else
{
chkapp1.Checked = true;
chkapp2.Checked = true;
this.fpSpread1.Sheets[0].Columns[2].Locked = true;
this.fpSpread1.Sheets[0].Columns[3].Locked = true;
this.fpSpread1.Sheets[0].Columns[2].BackColor = Color.FromArgb(230, 230, 230);
this.fpSpread1.Sheets[0].Columns[3].BackColor = Color.FromArgb(230, 230, 230);
}
}
private void projectsScheduleBindingNavigatorSaveItem_Click(object sender, EventArgs e)
{
@@ -405,7 +474,7 @@ namespace FPJ0000
//actual
if (ww >= swa && ww <= ewa)
e.Graphics.FillRectangle(new SolidBrush(ABg), rect2BP.Left, rect2BP.Top, rect2BP.Width, rect2BP.Height);
else if (isEmpty == false && isBusy && ww >= swa && ww <= this.CWW )
else if (isEmpty == false && isBusy && ww >= swa && ww <= this.CWW)
{
e.Graphics.FillRectangle(new SolidBrush(Color.Pink), rect2BP.Left, rect2BP.Top, rect2BP.Width, rect2BP.Height);
}
@@ -515,5 +584,65 @@ namespace FPJ0000
//lad
FPUtil.ColSizeLoad(ref this.fpSpread2, fn_fpcolsize2);
}
private void chkapp1_Click(object sender, EventArgs e)
{
//권한이 있어야한다.
var db = new EEEntities();
var dr = db.Auth.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.user == FCOMMON.info.Login.no).FirstOrDefault();
if (dr == null || dr.scheapp == null || dr.scheapp < 1)
{
util.MsgE("'승인권한1'이 없습니다");
return;
}
if(chkapp1.Checked)
{
util.MsgE("'승인해제1'는 현재 구현 중");
}
else
{
chkapp1.Checked = true;
foreach(var item in this.dsPRJ.EETGW_ProjectsSchedule)
{
if (item.RowState == DataRowState.Deleted || item.RowState == DataRowState.Deleted) continue;
item.appoval = 1;
}
}
}
private void chkapp2_Click(object sender, EventArgs e)
{
//권한이 있어야한다.
var db = new EEEntities();
var dr = db.Auth.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.user == FCOMMON.info.Login.no).FirstOrDefault();
if (dr == null || dr.scheapp == null || dr.scheapp < 2)
{
util.MsgE("'승인권한2'이 없습니다");
return;
}
if (chkapp2.Checked)
{
util.MsgE("승인해제2'는 현재 구현 중");
}
else
{
chkapp2.Checked = true;
foreach (var item in this.dsPRJ.EETGW_ProjectsSchedule)
{
if (item.RowState == DataRowState.Deleted || item.RowState == DataRowState.Deleted) continue;
item.appoval = 2;
}
}
}
private void comboBox1_SelectedIndexChanged(object sender, EventArgs e)
{
if (bInit == false) return;
if(comboBox1.SelectedIndex == this.comboBox1.Items.Count-1)
{
util.MsgE("스케쥴 신규 추가 기능은 준비 중 입니다");
this.comboBox1.SelectedIndex = this.comboBox1.Items.Count - 2;
}
}
}
}

22
SubProject/FPJ0000/Project/fProjectSchedule.resx
View File

@@ -252,6 +252,9 @@
<metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>239, 17</value>
</metadata>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>871, 17</value>
</metadata>
<data name="autoToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
@@ -291,12 +294,18 @@
vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
</value>
</data>
<metadata name="fpSpread1_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>871, 17</value>
<metadata name="bnTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>624, 17</value>
</metadata>
<metadata name="cm2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1023, 17</value>
</metadata>
<metadata name="fpSpread2_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>719, 17</value>
</metadata>
<metadata name="bsTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>440, 17</value>
</metadata>
<data name="toolStripMenuItem3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
R0lGODlhEAAQAIQfAJXG2JXa+ZLO5ChrlkCy4TZ1kiVvpCN0trvo9SN5xTd4lrfh7iR9zo3S+EGz7JDJ
@@ -336,12 +345,6 @@
vmv/Akgg2IMBDgsSdJwcAEICDhoECjDAmQIFBQouXNiwQYPOgqgLBgQAOw==
</value>
</data>
<metadata name="fpSpread2_Sheet1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>719, 17</value>
</metadata>
<metadata name="bsTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>440, 17</value>
</metadata>
<metadata name="bnTodo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>624, 17</value>
</metadata>
@@ -434,6 +437,9 @@
<metadata name="bsPrjinfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1098, 17</value>
</metadata>
<metadata name="bsPrjinfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1098, 17</value>
</metadata>
<metadata name="taProjectInfo.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 56</value>
</metadata>