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

..

Browse Source
This commit is contained in:
chi
2021-02-16 08:31:01 +09:00
parent 30b06c2d35
commit 1c52445f76
23 changed files with 985 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

311
SubProject/FPJ0000/EBoard/fEboardList.Designer.cs generated
View File

@@ -30,27 +30,27 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEboardList));
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.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.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 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 textCellType14 = 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 textCellType57 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType58 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType59 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType60 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType61 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType62 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType63 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType64 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType65 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType66 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType67 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType68 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType69 = 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 textCellType70 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType35 = new FarPoint.Win.Spread.CellType.NumberCellType();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bs = new System.Windows.Forms.BindingSource(this.components);
this.dsMSSQL = new FPJ0000.dsPRJ();
@@ -96,16 +96,9 @@
this.cmbYearS = new System.Windows.Forms.ToolStripComboBox();
this.toolStripLabel4 = new System.Windows.Forms.ToolStripLabel();
this.cmbYearE = new System.Windows.Forms.ToolStripComboBox();
this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
this.cmbCate = new System.Windows.Forms.ToolStripComboBox();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
this.cmbProcess = new System.Windows.Forms.ToolStripComboBox();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
this.tbRequest = new System.Windows.Forms.ToolStripTextBox();
this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel();
this.cmbStat = new System.Windows.Forms.ToolStripComboBox();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.panel4 = new System.Windows.Forms.Panel();
this.label11 = new System.Windows.Forms.Label();
@@ -127,6 +120,14 @@
this.btSearch = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.chkDelay = new System.Windows.Forms.ToolStripButton();
this.toolStripLabel5 = new System.Windows.Forms.ToolStripLabel();
this.tbSd = new System.Windows.Forms.ToolStripTextBox();
this.toolStripLabel6 = new System.Windows.Forms.ToolStripLabel();
this.tbSD2 = new System.Windows.Forms.ToolStripTextBox();
this.toolStripLabel7 = new System.Windows.Forms.ToolStripLabel();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
@@ -523,11 +524,11 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 20).Value = "Repair Time(H)";
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;
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 = "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;
@@ -535,97 +536,97 @@
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(1).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType57;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "uid";
this.fpSpread1_Sheet1.Columns.Get(1).Label = "Engineer";
this.fpSpread1_Sheet1.Columns.Get(2).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType58;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "Site";
this.fpSpread1_Sheet1.Columns.Get(2).Label = "SITE";
this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType59;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "요청자";
this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청";
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType60;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pdate";
this.fpSpread1_Sheet1.Columns.Get(4).Label = "입고일";
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType5;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType61;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "수리완료일";
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;
this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType62;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "분류";
this.fpSpread1_Sheet1.Columns.Get(6).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(6).Label = "Status";
this.fpSpread1_Sheet1.Columns.Get(6).Tag = "status";
this.fpSpread1_Sheet1.Columns.Get(6).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType7;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType63;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Line";
this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType8;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType64;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "Division";
this.fpSpread1_Sheet1.Columns.Get(8).Width = 72F;
this.fpSpread1_Sheet1.Columns.Get(9).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = textCellType65;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "Process";
this.fpSpread1_Sheet1.Columns.Get(9).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(9).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(9).Width = 78F;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType10;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = textCellType66;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "Model";
this.fpSpread1_Sheet1.Columns.Get(10).Label = "Equipment";
this.fpSpread1_Sheet1.Columns.Get(10).Width = 69F;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType11;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = textCellType67;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "BoardName";
this.fpSpread1_Sheet1.Columns.Get(11).Label = "Board Name";
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType12;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType68;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "BoardVender";
this.fpSpread1_Sheet1.Columns.Get(12).Label = "보드규격";
this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType13;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType69;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "SN";
this.fpSpread1_Sheet1.Columns.Get(13).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).Label = "S/N";
this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(13).Width = 78F;
numberCellType2.DecimalPlaces = 0;
numberCellType2.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType2.MaximumValue = 2147483647D;
numberCellType2.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType2;
numberCellType30.DecimalPlaces = 0;
numberCellType30.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType30.MaximumValue = 2147483647D;
numberCellType30.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType30;
this.fpSpread1_Sheet1.Columns.Get(14).DataField = "QTY";
this.fpSpread1_Sheet1.Columns.Get(14).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).Label = "Qty";
this.fpSpread1_Sheet1.Columns.Get(14).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(14).Width = 59F;
numberCellType3.MaximumValue = 999999999999999D;
numberCellType3.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType3;
numberCellType31.MaximumValue = 999999999999999D;
numberCellType31.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType31;
this.fpSpread1_Sheet1.Columns.Get(15).DataField = "NPrice";
this.fpSpread1_Sheet1.Columns.Get(15).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(15).Label = "New Price($K)";
this.fpSpread1_Sheet1.Columns.Get(15).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
numberCellType4.MaximumValue = 999999999999999D;
numberCellType4.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType4;
numberCellType32.MaximumValue = 999999999999999D;
numberCellType32.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType32;
this.fpSpread1_Sheet1.Columns.Get(16).DataField = "OPrice";
this.fpSpread1_Sheet1.Columns.Get(16).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(16).Label = "OutSourcing\r\nPrice($K)";
this.fpSpread1_Sheet1.Columns.Get(16).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(16).Width = 97F;
numberCellType5.MaximumValue = 999999999999999D;
numberCellType5.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType5;
numberCellType33.MaximumValue = 999999999999999D;
numberCellType33.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType33;
this.fpSpread1_Sheet1.Columns.Get(17).DataField = "RepairCost";
this.fpSpread1_Sheet1.Columns.Get(17).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
this.fpSpread1_Sheet1.Columns.Get(17).Label = "Repair Cost\r\n($K)";
this.fpSpread1_Sheet1.Columns.Get(17).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(18).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(18).CellType = numberCellType6;
numberCellType34.MaximumValue = 999999999999999D;
numberCellType34.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType34;
this.fpSpread1_Sheet1.Columns.Get(18).DataField = "CostReduction";
this.fpSpread1_Sheet1.Columns.Get(18).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
this.fpSpread1_Sheet1.Columns.Get(18).Formula = "RC[-2]-RC[-1]";
@@ -635,11 +636,11 @@
this.fpSpread1_Sheet1.Columns.Get(18).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(18).Width = 72F;
this.fpSpread1_Sheet1.Columns.Get(19).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType14;
this.fpSpread1_Sheet1.Columns.Get(19).CellType = textCellType70;
this.fpSpread1_Sheet1.Columns.Get(19).DataField = "외주업체";
numberCellType7.MaximumValue = 999999999999999D;
numberCellType7.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType7;
numberCellType35.MaximumValue = 999999999999999D;
numberCellType35.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType35;
this.fpSpread1_Sheet1.Columns.Get(20).DataField = "RepairTime";
this.fpSpread1_Sheet1.Columns.Get(20).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(20).Label = "Repair Time(H)";
@@ -658,26 +659,27 @@
this.cmbYearS,
this.toolStripLabel4,
this.cmbYearE,
this.toolStripLabel6,
this.cmbCate,
this.toolStripSeparator2,
this.toolStripLabel7,
this.cmbProcess,
this.toolStripSeparator4,
this.toolStripLabel3,
this.tbRequest,
this.toolStripSeparator2,
this.toolStripLabel5,
this.cmbStat});
this.toolStripLabel7,
this.tbSd,
this.toolStripLabel6,
this.tbSD2,
this.chkDelay,
this.toolStripSeparator3});
this.toolStrip1.Location = new System.Drawing.Point(5, 5);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(991, 25);
this.toolStrip1.Size = new System.Drawing.Size(991, 27);
this.toolStrip1.TabIndex = 4;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripLabel2
//
this.toolStripLabel2.Name = "toolStripLabel2";
this.toolStripLabel2.Size = new System.Drawing.Size(43, 22);
this.toolStripLabel2.Size = new System.Drawing.Size(43, 24);
this.toolStripLabel2.Text = "입고일";
//
// cmbYearS
@@ -685,12 +687,12 @@
this.cmbYearS.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbYearS.DropDownWidth = 70;
this.cmbYearS.Name = "cmbYearS";
this.cmbYearS.Size = new System.Drawing.Size(100, 25);
this.cmbYearS.Size = new System.Drawing.Size(100, 27);
//
// toolStripLabel4
//
this.toolStripLabel4.Name = "toolStripLabel4";
this.toolStripLabel4.Size = new System.Drawing.Size(15, 22);
this.toolStripLabel4.Size = new System.Drawing.Size(15, 24);
this.toolStripLabel4.Text = "~";
//
// cmbYearE
@@ -698,70 +700,17 @@
this.cmbYearE.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbYearE.DropDownWidth = 70;
this.cmbYearE.Name = "cmbYearE";
this.cmbYearE.Size = new System.Drawing.Size(100, 25);
//
// toolStripLabel6
//
this.toolStripLabel6.Name = "toolStripLabel6";
this.toolStripLabel6.Size = new System.Drawing.Size(31, 22);
this.toolStripLabel6.Text = "분류";
this.toolStripLabel6.Visible = false;
//
// cmbCate
//
this.cmbCate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbCate.Items.AddRange(new object[] {
"---",
"Origin Cost",
"Input Cost",
"Effect Cost",
"Asset No",
"Project",
"Champion",
"Requestor",
"Process"});
this.cmbCate.Name = "cmbCate";
this.cmbCate.Size = new System.Drawing.Size(100, 25);
this.cmbCate.Visible = false;
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25);
//
// toolStripLabel7
//
this.toolStripLabel7.Name = "toolStripLabel7";
this.toolStripLabel7.Size = new System.Drawing.Size(47, 22);
this.toolStripLabel7.Text = "Process";
this.toolStripLabel7.Visible = false;
//
// cmbProcess
//
this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbProcess.Items.AddRange(new object[] {
"---",
"Origin Cost",
"Input Cost",
"Effect Cost",
"Asset No",
"Project",
"Champion",
"Requestor",
"Process"});
this.cmbProcess.Name = "cmbProcess";
this.cmbProcess.Size = new System.Drawing.Size(100, 25);
this.cmbProcess.Visible = false;
this.cmbYearE.Size = new System.Drawing.Size(100, 27);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(6, 25);
this.toolStripSeparator4.Size = new System.Drawing.Size(6, 27);
//
// toolStripLabel3
//
this.toolStripLabel3.Name = "toolStripLabel3";
this.toolStripLabel3.Size = new System.Drawing.Size(43, 22);
this.toolStripLabel3.Size = new System.Drawing.Size(43, 24);
this.toolStripLabel3.Text = "담당자";
this.toolStripLabel3.Click += new System.EventHandler(this.toolStripLabel3_Click);
//
@@ -770,34 +719,10 @@
this.tbRequest.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbRequest.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbRequest.Name = "tbRequest";
this.tbRequest.Size = new System.Drawing.Size(120, 25);
this.tbRequest.Size = new System.Drawing.Size(120, 27);
this.tbRequest.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbRequest.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbRequest_KeyDown);
//
// toolStripLabel5
//
this.toolStripLabel5.Name = "toolStripLabel5";
this.toolStripLabel5.Size = new System.Drawing.Size(31, 22);
this.toolStripLabel5.Text = "상태";
this.toolStripLabel5.Visible = false;
//
// cmbStat
//
this.cmbStat.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbStat.Items.AddRange(new object[] {
"---",
"Origin Cost",
"Input Cost",
"Effect Cost",
"Asset No",
"Project",
"Champion",
"Requestor",
"Process"});
this.cmbStat.Name = "cmbStat";
this.cmbStat.Size = new System.Drawing.Size(75, 25);
this.cmbStat.Visible = false;
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 2;
@@ -1060,6 +985,61 @@
//
this.ta.ClearBeforeFill = true;
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 27);
//
// chkDelay
//
this.chkDelay.CheckOnClick = true;
this.chkDelay.Image = global::FPJ0000.Properties.Resources.accept;
this.chkDelay.ImageTransparentColor = System.Drawing.Color.Magenta;
this.chkDelay.Name = "chkDelay";
this.chkDelay.Size = new System.Drawing.Size(95, 24);
this.chkDelay.Text = "조회시 적용";
this.chkDelay.Click += new System.EventHandler(this.toolStripButton4_Click);
//
// toolStripLabel5
//
this.toolStripLabel5.Font = new System.Drawing.Font("맑은 고딕", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.toolStripLabel5.Name = "toolStripLabel5";
this.toolStripLabel5.Size = new System.Drawing.Size(116, 24);
this.toolStripLabel5.Text = "* 수리지연품목 조회";
//
// tbSd
//
this.tbSd.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbSd.Name = "tbSd";
this.tbSd.Size = new System.Drawing.Size(20, 27);
this.tbSd.Text = "2";
this.tbSd.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// toolStripLabel6
//
this.toolStripLabel6.Name = "toolStripLabel6";
this.toolStripLabel6.Size = new System.Drawing.Size(34, 24);
this.toolStripLabel6.Text = "외주:";
//
// tbSD2
//
this.tbSD2.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbSD2.Name = "tbSD2";
this.tbSD2.Size = new System.Drawing.Size(20, 27);
this.tbSD2.Text = "7";
this.tbSD2.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
//
// toolStripLabel7
//
this.toolStripLabel7.Name = "toolStripLabel7";
this.toolStripLabel7.Size = new System.Drawing.Size(34, 24);
this.toolStripLabel7.Text = "일반:";
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(6, 27);
//
// fEboardList
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1128,7 +1108,6 @@
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.ToolStripComboBox cmbYearS;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem 엑셀파일로저장ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
@@ -1148,17 +1127,11 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
private System.Windows.Forms.ToolStripMenuItem 편집ToolStripMenuItem1;
private System.Windows.Forms.ToolStripMenuItem 삭제ToolStripMenuItem;
private System.Windows.Forms.ToolStripLabel toolStripLabel6;
private System.Windows.Forms.ToolStripComboBox cmbCate;
private System.Windows.Forms.ToolStripLabel toolStripLabel7;
private System.Windows.Forms.ToolStripComboBox cmbProcess;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator6;
private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btSearch;
private System.Windows.Forms.ToolStripLabel toolStripLabel5;
private System.Windows.Forms.ToolStripComboBox cmbStat;
private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label4;
@@ -1171,5 +1144,13 @@
private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem;
private System.Windows.Forms.ToolStripButton toolStripButton2;
private System.Windows.Forms.ToolStripButton toolStripButton3;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripLabel toolStripLabel5;
private System.Windows.Forms.ToolStripTextBox tbSd;
private System.Windows.Forms.ToolStripLabel toolStripLabel6;
private System.Windows.Forms.ToolStripTextBox tbSD2;
private System.Windows.Forms.ToolStripButton chkDelay;
private System.Windows.Forms.ToolStripLabel toolStripLabel7;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
}
}

49
SubProject/FPJ0000/EBoard/fEboardList.cs
View File

@@ -45,22 +45,6 @@ namespace FPJ0000
this.tbRequest.Text = FCOMMON.info.Login.nameK;
//분류 - 190905
var dt_cate = FCOMMON.DBM.getCodeTable("20");
cmbCate.Items.Clear();
cmbCate.Items.Add("--전체--");
foreach (DataRow dr in dt_cate.Rows)
cmbCate.Items.Add(dr["Value"].ToString());
cmbCate.SelectedIndex = 0;
this.cmbProcess.Items.Clear();
this.cmbProcess.Items.Add("전체");
var procesList = FCOMMON.DBM.getProcessList();
foreach (DataRow dr in procesList.Rows)
cmbProcess.Items.Add(dr["Value"].ToString());
cmbProcess.Text = FCOMMON.info.Login.process;
if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0;
//this.cmbSort.SelectedIndex = 0;
this.cmbYearS.Items.Clear();
@@ -98,6 +82,8 @@ namespace FPJ0000
void refreshData()
{
//수리지연추가 210208 - 장은철
if (this.dsMSSQL.EETGW_JobReport_EBoard.GetChanges() != null)
{
@@ -111,6 +97,20 @@ namespace FPJ0000
string State_where = " WHERE gcode=@gcode and pdate between ";
State_where += "'" + cmbYearS.Text + "-01-01' and '" + cmbYearE.Text + "-12-31' AND (ISNULL(uid, '')) LIKE @username ";
if (chkDelay.Checked)
{
var 시작일 = DateTime.Now.AddDays(-int.Parse(tbSd.Text)); //일반기간
var 시작일2 = DateTime.Now.AddDays(-int.Parse(tbSD2.Text)); //외주기간
State_where += string.Format("and isnull(수리완료일,'') = '' and ((isnull(분류,'') like '%외주%' and pdate <= '{0}') or (isnull(분류,'') not like '%외주%' and pdate <= '{1}'))", 시작일2.ToShortDateString(), 시작일.ToShortDateString());
tbSd.BackColor = Color.Gold;
tbSD2.BackColor = Color.Gold;
}
else
{
tbSd.BackColor = Color.WhiteSmoke;
tbSD2.BackColor = Color.WhiteSmoke;
}
//if (cmbCate.SelectedIndex > 0) State_where += " AND isnull(분류,'') = '" + cmbCate.Text + "'";
//if (cmbProcess.SelectedIndex > 0) State_where += " and isnull(Process,'') = '" + cmbProcess.Text.Trim() + "'";
string State_order = " ORDER BY pdate desc,uid";
@@ -279,7 +279,8 @@ namespace FPJ0000
var f = new fEboardData(newdr);
f.Show();
f.FormClosed += (s1, e1) => {
f.FormClosed += (s1, e1) =>
{
if (f.DialogResult == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr);
@@ -414,7 +415,8 @@ namespace FPJ0000
var f = new fEboardData(newdr);
f.Show();
f.FormClosed += (s1, e1) => {
f.FormClosed += (s1, e1) =>
{
if (f.DialogResult == System.Windows.Forms.DialogResult.OK)
{
this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr);
@@ -436,14 +438,15 @@ namespace FPJ0000
var dr = drv.Row as dsPRJ.EETGW_JobReport_EBoardRow;
var f = new fEboardData(dr);
f.Show();
f.FormClosed += (s1, e1) => {
f.FormClosed += (s1, e1) =>
{
if (f.DialogResult == System.Windows.Forms.DialogResult.OK)
{
this.Validate();
this.bs.EndEdit();
}
};
}
private void 편집ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -523,5 +526,11 @@ namespace FPJ0000
newdr.Site = "ATK";
this.dsMSSQL.EETGW_JobReport_EBoard.AddEETGW_JobReport_EBoardRow(newdr);
}
private void toolStripButton4_Click(object sender, EventArgs e)
{
this.chkDelay.BackColor = chkDelay.Checked ? Color.Lime : SystemColors.Control;
this.refreshData();
}
}
}

31
SubProject/FPJ0000/EBoard/fEboardList.resx
View File

@@ -223,20 +223,20 @@
<data name="toolStripButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVDhPhZLrS1NhHMf3qv6EsF70UohSSiupF5WpTQ3s
ZipleZlTLLWhK4PMmJNMW2iiQkUkRS8qonRObV6ac7nRjEwzM++38DJ1l3Me3Tnz23PORisI+sGH58Vz
vh/O73uORJjIG4aU4xVmfdxd87K01MzSk4hohNNC4ip6SMwd08BBpbFqR/yLTWLoz4ku7TYuOMjST5ud
t7nWYHP6WXIIEHybc6CoYQoXNEOMNEe32Rf1TmyZaWFxxcn3TLhhmeRgmeJgnuBgGl+H4ccaWgZdWOMA
7RCLojeTSL8/wP4liVJ1snZmHb3TPD5Nc/Tk8FGUrKNrZA3vBhkq8KB3jodl1g21bgrh1zuei+FEzZGx
s6XxG/La00ivOYOa1nqUvNYgvDgIRyhS9QFEqvahUlspruIkHOZXGERe6+JEQUJF+KuO/iY0DT9CjblA
lFysjkHBs2Tk1idBVncCaXVp0PbNo2nAicYvdqzSnqJU3UQUSKukm4+r83jz9/d42q9CuSFHlKTUxtLw
SWQ9yIRxxCWu0j7MQk97WHG5EVXywSsQJrqsiygep8I6YkKd5Sput+UjUXMUKdXxsE4wsNJihYKNo95O
bFQQqfpDcOhmsXt/4XYkV0nRO9oD9ftsqHQKJN2LQL3hLT7PcLDSYnvG3fhAWXC4EX7LJ9ijDJCHKLch
98k5nK+NxrnKY6JEoUuG8nUmfZMICPe9Uzw+Cp+Y4qBFhilNXkGIcstMiHIrfSgAIQUBOFUegUsPU2Ec
1EOtL0T2y1TIahNgpQIL/TfMVEDcHoTmGfwrHFZ2k7lVgr4ZXqTr+yyuPM5CBg3K65KQ/+Ty7zsBZp1H
cF6LX7BXYSDTNr/gf7joCsGZWr8gTNHJDM0sb/zr4X9hd7GeXRe1Tl+cFpnVNjZtZxxDs6uesUUWYwss
RnwsOt0iQvNOwsNmZzwsIauBF5q/+uISSWhW66VgWUvbbrneFixvJL/J8BKU0eBF1kACZc0rO9Oa24NS
dekSiUTyC9B/oc2h827VAAAAAElFTkSuQmCC
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAL4SURBVDhPhZLrS1NhHMf3qv6EsF70UohSalFRLyrzMjWw
m6mUeZtTKm+4iUFmzUXmJbRQoSKSohcVkbdZzcxtTjeckWne8tamA6fTue2coztnfnvO2XAFQT/48Lx4
zvfD+X3PEfETdVObfrraqEmoMa7EqIw0ORmBWv40MQnV/UzcfcPIMYW+fk/i621C6M+Jvdurt7uYZduy
k3N41uFwB1l28TAYs7lQ1mpBas04JclTbw9E/RNfabDbV1xc/5wXpl8sTBYWxjkWhtkNaH+u48OoB+ss
0D5Oo+z9L2Q9HKH/kkTf6abXqA0MWjl8tbLkZDEgSDagm1rHp1GKCHwYtHEwLXihUlsQcaP7lRBOrj05
c1GVuClrPI+shgto+NiMine1iCgPw0mCRHUUUcpDqGuvE1ZxMywWVylElehYQZBUHfG2e7gDHZNP0WCU
C5K0R3GQv0xFfnMKpE1nkNmUifahRXSMuNH2fQ1O0lO0spcRBJJ6yfb4igLOONGDF8NKVGnzBEl6YzwJ
n0Xu4xzopzzCKp8naWhID6seL6Ir+vwCfmIrdUzRswyYpwxoMpXgXlcxkmtPIf1RIsxzFMykWL5g/bS/
EwcRRCn/EBy/Ve49XLobqfUSDE73Q9VzFUp1EVIeRKJZ24Jv8yzMpNj+WS/6CHaXFxG3A4IDihCZWLEL
+c8v4XJjLC7VxQiSInUqFO9yyJtEgr8ftHAY4D8xwUWKPCw3+AVixY55sWIneSgEYnkIzlVF4tqTDOhH
NVBpSnH1TQakjUkwE4GJ/BtGImC8PogLtMEVTsh7GZuTwdA8J6CbWEDhs1xkk6CsKQXFz69v3fFQGxzC
CzqDgoOFWsbqCAr+h4esEJ7TFhQcKfpCjVkdm/96+F843ZRvX1q7OxAnReZ2zVjWKNfY/KpvZonGjJ3G
VIAlt1eAb97NcFh2enw0TTtDr3T+CMTJCrkfr4VLP3Ttl2kc4bJWZotsP2HZLX6kLUyotHN1b2bn57AM
dZZIJBL9BohloZ6S1+tQAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -254,6 +254,9 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</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>252, 17</value>
</metadata>

9
SubProject/FPJ0000/FPJ0000.csproj
View File

@@ -215,6 +215,12 @@
<Compile Include="JobReport\fJobReport_AddAI.Designer.cs">
<DependentUpon>fJobReport_AddAI.cs</DependentUpon>
</Compile>
<Compile Include="JobReport\fSelectProcess.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="JobReport\fSelectProcess.Designer.cs">
<DependentUpon>fSelectProcess.cs</DependentUpon>
</Compile>
<Compile Include="JobReport\rJobChart.cs">
<SubType>Form</SubType>
</Compile>
@@ -465,6 +471,9 @@
<EmbeddedResource Include="JobReport\fJobReport_AddAI.resx">
<DependentUpon>fJobReport_AddAI.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="JobReport\fSelectProcess.resx">
<DependentUpon>fSelectProcess.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="JobReport\rJobChart.rdlc" />
<EmbeddedResource Include="JobReport\rJobChart.resx">
<DependentUpon>rJobChart.cs</DependentUpon>

106
SubProject/FPJ0000/JobReport/fJobReport.Designer.cs generated
View File

@@ -30,20 +30,20 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fJobReport));
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.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.NumberCellType numberCellType1 = new FarPoint.Win.Spread.CellType.NumberCellType();
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.TextCellType textCellType10 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType11 = 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.TextCellType textCellType25 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType26 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType27 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType28 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType29 = new FarPoint.Win.Spread.CellType.TextCellType();
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.NumberCellType numberCellType7 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType8 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.NumberCellType numberCellType9 = new FarPoint.Win.Spread.CellType.NumberCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
FarPoint.Win.Spread.CellType.TextCellType textCellType33 = 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();
@@ -97,7 +97,8 @@
this.lbTime = new System.Windows.Forms.ToolStripLabel();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel();
this.cmbProcess = new System.Windows.Forms.ToolStripComboBox();
this.tbProcess = new System.Windows.Forms.ToolStripTextBox();
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.toolStripLabel3 = new System.Windows.Forms.ToolStripLabel();
this.cmbUser = new System.Windows.Forms.ToolStripComboBox();
this.btSearch = new System.Windows.Forms.ToolStripSplitButton();
@@ -200,6 +201,7 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -291,6 +293,7 @@
// tbFind
//
this.tbFind.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tbFind.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbFind.Name = "tbFind";
this.tbFind.Size = new System.Drawing.Size(100, 25);
this.tbFind.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFind_KeyDown);
@@ -526,82 +529,82 @@
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "비고";
this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "#";
this.fpSpread1_Sheet1.ColumnHeader.Rows.Get(0).Height = 28F;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType1;
this.fpSpread1_Sheet1.Columns.Get(0).CellType = textCellType23;
this.fpSpread1_Sheet1.Columns.Get(0).DataField = "pdate";
this.fpSpread1_Sheet1.Columns.Get(0).Label = "날짜";
this.fpSpread1_Sheet1.Columns.Get(0).Width = 58F;
this.fpSpread1_Sheet1.Columns.Get(1).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType2;
this.fpSpread1_Sheet1.Columns.Get(1).CellType = textCellType24;
this.fpSpread1_Sheet1.Columns.Get(1).DataField = "ww";
this.fpSpread1_Sheet1.Columns.Get(1).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(1).Label = "WW";
this.fpSpread1_Sheet1.Columns.Get(1).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType3;
this.fpSpread1_Sheet1.Columns.Get(2).CellType = textCellType25;
this.fpSpread1_Sheet1.Columns.Get(2).DataField = "username";
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;
this.fpSpread1_Sheet1.Columns.Get(3).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType4;
this.fpSpread1_Sheet1.Columns.Get(3).CellType = textCellType26;
this.fpSpread1_Sheet1.Columns.Get(3).DataField = "requestpart";
this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청부서";
this.fpSpread1_Sheet1.Columns.Get(3).Width = 78F;
this.fpSpread1_Sheet1.Columns.Get(4).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType5;
this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType27;
this.fpSpread1_Sheet1.Columns.Get(4).DataField = "package";
this.fpSpread1_Sheet1.Columns.Get(4).Label = "패키지";
this.fpSpread1_Sheet1.Columns.Get(4).Width = 86F;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType6;
this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType28;
this.fpSpread1_Sheet1.Columns.Get(5).DataField = "status";
this.fpSpread1_Sheet1.Columns.Get(5).Label = "상태";
this.fpSpread1_Sheet1.Columns.Get(6).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType7;
this.fpSpread1_Sheet1.Columns.Get(6).CellType = textCellType29;
this.fpSpread1_Sheet1.Columns.Get(6).DataField = "type";
this.fpSpread1_Sheet1.Columns.Get(6).Label = "업무형태";
this.fpSpread1_Sheet1.Columns.Get(6).Width = 84F;
this.fpSpread1_Sheet1.Columns.Get(7).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType8;
this.fpSpread1_Sheet1.Columns.Get(7).CellType = textCellType30;
this.fpSpread1_Sheet1.Columns.Get(7).DataField = "process";
this.fpSpread1_Sheet1.Columns.Get(7).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(7).Label = "업무분류";
this.fpSpread1_Sheet1.Columns.Get(7).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(7).Width = 80F;
this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType9;
this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType31;
this.fpSpread1_Sheet1.Columns.Get(8).DataField = "projectName";
this.fpSpread1_Sheet1.Columns.Get(8).Label = "프로젝트(아이템)";
this.fpSpread1_Sheet1.Columns.Get(8).Width = 158F;
this.fpSpread1_Sheet1.Columns.Get(9).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(9).CellType = numberCellType1;
numberCellType7.DecimalPlaces = 0;
numberCellType7.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
numberCellType7.MaximumValue = 2147483647D;
numberCellType7.MinimumValue = -2147483648D;
this.fpSpread1_Sheet1.Columns.Get(9).CellType = numberCellType7;
this.fpSpread1_Sheet1.Columns.Get(9).DataField = "pidx";
this.fpSpread1_Sheet1.Columns.Get(9).Label = "*";
this.fpSpread1_Sheet1.Columns.Get(9).Tag = "pidx";
this.fpSpread1_Sheet1.Columns.Get(9).Width = 39F;
numberCellType2.MaximumValue = 999999999999999D;
numberCellType2.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType2;
numberCellType8.MaximumValue = 999999999999999D;
numberCellType8.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(10).CellType = numberCellType8;
this.fpSpread1_Sheet1.Columns.Get(10).DataField = "hrs";
this.fpSpread1_Sheet1.Columns.Get(10).Label = "시간";
this.fpSpread1_Sheet1.Columns.Get(10).Width = 52F;
numberCellType3.MaximumValue = 999999999999999D;
numberCellType3.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType3;
numberCellType9.MaximumValue = 999999999999999D;
numberCellType9.MinimumValue = -999999999999999D;
this.fpSpread1_Sheet1.Columns.Get(11).CellType = numberCellType9;
this.fpSpread1_Sheet1.Columns.Get(11).DataField = "ot";
this.fpSpread1_Sheet1.Columns.Get(11).ForeColor = System.Drawing.Color.Red;
this.fpSpread1_Sheet1.Columns.Get(11).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(11).Label = "초과";
this.fpSpread1_Sheet1.Columns.Get(11).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType10;
this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType32;
this.fpSpread1_Sheet1.Columns.Get(12).DataField = "description";
this.fpSpread1_Sheet1.Columns.Get(12).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Left;
this.fpSpread1_Sheet1.Columns.Get(12).Label = "비고";
this.fpSpread1_Sheet1.Columns.Get(12).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
this.fpSpread1_Sheet1.Columns.Get(12).Width = 113F;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType11;
this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType33;
this.fpSpread1_Sheet1.Columns.Get(13).DataField = "tag";
this.fpSpread1_Sheet1.Columns.Get(13).Label = "#";
this.fpSpread1_Sheet1.Columns.Get(13).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
@@ -622,7 +625,8 @@
this.lbTime,
this.toolStripSeparator2,
this.toolStripLabel1,
this.cmbProcess,
this.tbProcess,
this.toolStripButton4,
this.toolStripLabel3,
this.cmbUser,
this.btSearch,
@@ -645,6 +649,7 @@
// dtSD
//
this.dtSD.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtSD.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtSD.Name = "dtSD";
this.dtSD.Size = new System.Drawing.Size(90, 37);
this.dtSD.Text = "1982-11-23";
@@ -668,6 +673,7 @@
// dtED
//
this.dtED.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.dtED.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.dtED.Name = "dtED";
this.dtED.Size = new System.Drawing.Size(90, 37);
this.dtED.Text = "1982-11-23";
@@ -690,13 +696,22 @@
this.toolStripLabel1.Size = new System.Drawing.Size(31, 34);
this.toolStripLabel1.Text = "공정";
//
// cmbProcess
// tbProcess
//
this.cmbProcess.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbProcess.Name = "cmbProcess";
this.cmbProcess.Size = new System.Drawing.Size(150, 37);
this.cmbProcess.SelectedIndexChanged += new System.EventHandler(this.cmbProcess_SelectedIndexChanged);
this.cmbProcess.Click += new System.EventHandler(this.cmbProcess_Click);
this.tbProcess.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(180)))), ((int)(((byte)(180)))), ((int)(((byte)(180)))));
this.tbProcess.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(200, 37);
//
// toolStripButton4
//
this.toolStripButton4.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
this.toolStripButton4.Image = global::FPJ0000.Properties.Resources.find;
this.toolStripButton4.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton4.Name = "toolStripButton4";
this.toolStripButton4.Size = new System.Drawing.Size(34, 34);
this.toolStripButton4.Text = "toolStripButton4";
this.toolStripButton4.Click += new System.EventHandler(this.toolStripButton4_Click);
//
// toolStripLabel3
//
@@ -837,12 +852,13 @@
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripButton toolStripButton2;
private System.Windows.Forms.ToolStripLabel toolStripLabel1;
private System.Windows.Forms.ToolStripComboBox cmbProcess;
private System.Windows.Forms.RichTextBox richTextBox1;
private System.Windows.Forms.ToolStripButton toolStripButton3;
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripSplitButton btSearch;
private System.Windows.Forms.ToolStripMenuItem 태그자료만조회ToolStripMenuItem;
private System.Windows.Forms.ToolStripLabel toolStripLabel4;
private System.Windows.Forms.ToolStripTextBox tbProcess;
private System.Windows.Forms.ToolStripButton toolStripButton4;
}
}

117
SubProject/FPJ0000/JobReport/fJobReport.cs
View File

@@ -39,14 +39,33 @@ namespace FPJ0000
this.cmbUser.Items.Add("-- 전체 --");
var taUserList = new dsReportTableAdapters.ProcessUserListTableAdapter();
var processStr = "%";
if (cmbProcess.SelectedIndex > 0) processStr = cmbProcess.Text;
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList)
var prclist = this.tbProcess.Tag as List<string>;
if (prclist.Count < 1)
{
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
this.cmbUser.Items.Add(cmbdata);
var processStr = "%";
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList)
{
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
this.cmbUser.Items.Add(cmbdata);
}
}
else
{
foreach (var prc in prclist)
{
var processStr = prc;// cmbProcess.Text;
var dtUserList = taUserList.GetData(processStr, FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessUserListRow dr in dtUserList)
{
string cmbdata = string.Format("{1}({0})", dr.id, dr.name);
this.cmbUser.Items.Add(cmbdata);
}
}
}
}
private void __Load(object sender, EventArgs e)
@@ -55,19 +74,20 @@ namespace FPJ0000
var sdate = DateTime.Parse(dtSD.Text);
this.dtED.Text = sdate.AddMonths(1).AddDays(-1).ToShortDateString();
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
cmbProcess.Items.Clear();
cmbProcess.Items.Add("--전체--");
foreach (dsReport.ProcessListRow dr in dtProcList)
{
cmbProcess.Items.Add(dr.processs);
}
cmbProcess.Text = FCOMMON.info.Login.process;
if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함
//cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");
//foreach (dsReport.ProcessListRow dr in dtProcList)
//{
// cmbProcess.Items.Add(dr.processs);
//}
//cmbProcess.Text = FCOMMON.info.Login.process;
//if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함
tbProcess.Text = FCOMMON.info.Login.process;
tbProcess.Tag = new List<string>(new string[] { FCOMMON.info.Login.process });
//담당자목록 - 사용자목록으로 처리한다.
@@ -208,15 +228,55 @@ namespace FPJ0000
FCOMMON.Util.MsgE("담당자 번호를 확인할 수 없습니다.(문의 T.8567)");
return;
}
string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1);
request = request.Substring(0, request.Length - 1);
if (cmbUser.SelectedIndex == 0) request = "%"; //전체검색 201028 - chi(임현대)
if (tagonly == false)
this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode);
//사용자 목록다중선택으로 인해 처리
var sql = "SELECT *, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww";
sql += " FROM JobReport";
sql += " WHERE(pdate BETWEEN @sd AND @ed) AND(gcode = @gcode)";
if (request != "%")
{
//사용자가 지정되어있다
sql += $" AND uid = '{request}'";
}
else
this.ta.FillByTagOnly(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode);
{
//전체사용자가 지정되어있다. 해당하는 사용자 목록에서만 취한다.
var userlist = new List<string>();
for (int i = 1; i < cmbUser.Items.Count; i++) //0번요소는 전체이다
{
var userinfo = cmbUser.Items[i].ToString();
var userno = userinfo.Substring(userinfo.LastIndexOf('(') + 1);
userno = userno.Substring(0, userno.Length - 1);
userlist.Add(userno);
}
sql += " and uid in ('" + string.Join("','", userlist) + "')";
}
if (tagonly) sql += " and isnull(tag,'') <> ''";
sql += " ORDER BY pdate DESC";
var cmd = new System.Data.SqlClient.SqlCommand(sql, ta.Connection);
cmd.Parameters.Add("sd", SqlDbType.VarChar).Value = dtSD.Text;
cmd.Parameters.Add("ed", SqlDbType.VarChar).Value = dtED.Text;
cmd.Parameters.Add("gcode", SqlDbType.VarChar).Value = FCOMMON.info.Login.gcode;
var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
dsMSSQL.JobReport.Clear();
da.Fill(this.dsMSSQL.JobReport);
dsMSSQL.JobReport.AcceptChanges();
//if (tagonly == false)
// this.ta.Fill(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode);
//else
// this.ta.FillByTagOnly(this.dsMSSQL.JobReport, dtSD.Text, dtED.Text, request, FCOMMON.info.Login.gcode);
RefreshTime();
FPUtil.ColSizeLoad(ref this.fpSpread1, fn_fpcolsize);
@@ -554,9 +614,9 @@ namespace FPJ0000
private void toolStripButton1_Click(object sender, EventArgs e)
{
string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1);
request = request.Substring(0, request.Length - 1);
string name = cmbUser.Text.Substring(0, cmbUser.Text.IndexOf('('));
//string request = cmbUser.Text.Substring(cmbUser.Text.LastIndexOf('(') + 1);
//request = request.Substring(0, request.Length - 1);
//string name = cmbUser.Text.Substring(0, cmbUser.Text.IndexOf('('));
var f = new JobReport.fJobChartMenu();
f.ShowDialog();
}
@@ -588,5 +648,18 @@ namespace FPJ0000
if (f.ShowDialog() != System.Windows.Forms.DialogResult.OK) return;
dtED.Text = f.dtPick.SelectionStart.ToShortDateString();
}
private void toolStripButton4_Click(object sender, EventArgs e)
{
var oldlist = (List<string>)tbProcess.Tag;
var f = new JobReport.fSelectProcess(oldlist.ToArray());
if (f.ShowDialog() == DialogResult.OK)
{
tbProcess.Tag = f.values;
tbProcess.Text = string.Join(",", f.values);
UpdateUserList();
}
}
}
}

3
SubProject/FPJ0000/JobReport/fJobReport.resx
View File

@@ -257,6 +257,9 @@
GoSrpcVIQqmAj6LZftFBup9vWiUlUQdIDCbsQrsGZRJKBbOXyA++SlEsu6QjvQAAAABJRU5ErkJggg==
</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>325, 17</value>
</metadata>

130
SubProject/FPJ0000/JobReport/fSelectProcess.Designer.cs generated Normal file
View File

@@ -0,0 +1,130 @@

namespace FPJ0000.JobReport
{
partial class fSelectProcess
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.cmbProcess = new System.Windows.Forms.CheckedListBox();
this.button1 = new System.Windows.Forms.Button();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton3 = new System.Windows.Forms.ToolStripButton();
this.toolStrip1.SuspendLayout();
this.SuspendLayout();
//
// cmbProcess
//
this.cmbProcess.Dock = System.Windows.Forms.DockStyle.Fill;
this.cmbProcess.Font = new System.Drawing.Font("맑은 고딕", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(129)));
this.cmbProcess.FormattingEnabled = true;
this.cmbProcess.Location = new System.Drawing.Point(0, 25);
this.cmbProcess.Name = "cmbProcess";
this.cmbProcess.Size = new System.Drawing.Size(289, 328);
this.cmbProcess.TabIndex = 0;
//
// button1
//
this.button1.Dock = System.Windows.Forms.DockStyle.Bottom;
this.button1.Location = new System.Drawing.Point(0, 353);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(289, 39);
this.button1.TabIndex = 2;
this.button1.Text = "확인";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// toolStrip1
//
this.toolStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripButton1,
this.toolStripButton2,
this.toolStripButton3});
this.toolStrip1.Location = new System.Drawing.Point(0, 0);
this.toolStrip1.Name = "toolStrip1";
this.toolStrip1.Size = new System.Drawing.Size(289, 25);
this.toolStrip1.TabIndex = 1;
this.toolStrip1.Text = "toolStrip1";
//
// toolStripButton1
//
this.toolStripButton1.Image = global::FPJ0000.Properties.Resources.accept;
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
this.toolStripButton1.Size = new System.Drawing.Size(75, 22);
this.toolStripButton1.Text = "전체선택";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// toolStripButton2
//
this.toolStripButton2.Image = global::FPJ0000.Properties.Resources.accept;
this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton2.Name = "toolStripButton2";
this.toolStripButton2.Size = new System.Drawing.Size(75, 22);
this.toolStripButton2.Text = "선택해제";
this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click);
//
// toolStripButton3
//
this.toolStripButton3.Image = global::FPJ0000.Properties.Resources.accept;
this.toolStripButton3.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton3.Name = "toolStripButton3";
this.toolStripButton3.Size = new System.Drawing.Size(75, 22);
this.toolStripButton3.Text = "선택반전";
this.toolStripButton3.Click += new System.EventHandler(this.toolStripButton3_Click);
//
// fSelectProcess
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(289, 392);
this.Controls.Add(this.cmbProcess);
this.Controls.Add(this.toolStrip1);
this.Controls.Add(this.button1);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "fSelectProcess";
this.Text = "공정 선택";
this.Load += new System.EventHandler(this.fSelectProcess_Load);
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.CheckedListBox cmbProcess;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.ToolStrip toolStrip1;
private System.Windows.Forms.ToolStripButton toolStripButton1;
private System.Windows.Forms.ToolStripButton toolStripButton2;
private System.Windows.Forms.ToolStripButton toolStripButton3;
}
}

86
SubProject/FPJ0000/JobReport/fSelectProcess.cs Normal file
View File

@@ -0,0 +1,86 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace FPJ0000.JobReport
{
public partial class fSelectProcess : Form
{
public List<string> values = new List<string>();
public fSelectProcess(string[] list)
{
InitializeComponent();
values.AddRange(list);
}
private void fSelectProcess_Load(object sender, EventArgs e)
{
//공정목록
var taProc = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcList = taProc.GetData(FCOMMON.info.Login.gcode);
cmbProcess.Items.Clear();
//cmbProcess.Items.Add("--전체--");
foreach (dsReport.ProcessListRow dr in dtProcList)
{
cmbProcess.Items.Add(dr.processs);
if (values.Contains(dr.processs))
{
this.cmbProcess.SetItemChecked(cmbProcess.Items.Count - 1, true);
}
}
//cmbProcess.Text = FCOMMON.info.Login.process;
//if (cmbProcess.SelectedIndex < 0) cmbProcess.SelectedIndex = 0; //공정이 없는 사람은 전체보기로 함
}
private void button1_Click(object sender, EventArgs e)
{
values.Clear();
for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++)
{
if (cmbProcess.GetItemChecked(i))
{
values.Add(cmbProcess.Items[i].ToString());
}
}
if(values.Count < 1)
{
FCOMMON.Util.MsgE("공정선택이 필요 합니다");
return;
}
DialogResult = DialogResult.OK;
}
private void toolStripButton1_Click(object sender, EventArgs e)
{
for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++)
{
cmbProcess.SetItemChecked(i, true);
}
}
private void toolStripButton2_Click(object sender, EventArgs e)
{
for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++)
{
cmbProcess.SetItemChecked(i, false);
}
}
private void toolStripButton3_Click(object sender, EventArgs e)
{
for (int i = 0; i <= (cmbProcess.Items.Count - 1); i++)
{
var cur = cmbProcess.GetItemChecked(i);
cmbProcess.SetItemChecked(i, !cur);
}
}
}
}

123
SubProject/FPJ0000/JobReport/fSelectProcess.resx Normal file
View File

@@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

24
SubProject/FPJ0000/JobReport/rJobReport.Designer.cs generated
View File

@@ -34,6 +34,8 @@
this.ta = new FPJ0000.dsReportTableAdapters.jobReportTableAdapter();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.panel1 = new System.Windows.Forms.Panel();
this.tbProcess = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btRefresh = new System.Windows.Forms.Button();
this.tbMon = new System.Windows.Forms.TextBox();
@@ -72,6 +74,8 @@
//
// panel1
//
this.panel1.Controls.Add(this.tbProcess);
this.panel1.Controls.Add(this.label1);
this.panel1.Controls.Add(this.linkLabel1);
this.panel1.Controls.Add(this.btRefresh);
this.panel1.Controls.Add(this.tbMon);
@@ -82,6 +86,24 @@
this.panel1.Size = new System.Drawing.Size(721, 42);
this.panel1.TabIndex = 3;
//
// tbProcess
//
this.tbProcess.FormattingEnabled = true;
this.tbProcess.Location = new System.Drawing.Point(222, 10);
this.tbProcess.Name = "tbProcess";
this.tbProcess.Size = new System.Drawing.Size(158, 20);
this.tbProcess.TabIndex = 7;
this.tbProcess.SelectedIndexChanged += new System.EventHandler(this.tbProcess_SelectedIndexChanged);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(187, 15);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(29, 12);
this.label1.TabIndex = 6;
this.label1.Text = "공정";
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
@@ -140,5 +162,7 @@
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.Button btRefresh;
private System.Windows.Forms.TextBox tbMon;
private System.Windows.Forms.ComboBox tbProcess;
private System.Windows.Forms.Label label1;
}
}

24
SubProject/FPJ0000/JobReport/rJobReport.cs
View File

@@ -19,12 +19,23 @@ namespace FPJ0000.JobReport
private void rJobReport_Load(object sender, EventArgs e)
{
RefreshData();
this.tbProcess.Items.Clear();
tbProcess.Items.Add("전체");
var taProcess = new dsReportTableAdapters.ProcessListTableAdapter();
var dtProcessList = taProcess.GetData(FCOMMON.info.Login.gcode);
foreach (dsReport.ProcessListRow dr in dtProcessList.Rows)
tbProcess.Items.Add(dr.processs);
this.tbProcess.Text = FCOMMON.info.Login.process;
if (tbProcess.SelectedIndex < 0) tbProcess.SelectedIndex = 0;
refrehData();
}
void RefreshData()
void refrehData()
{
this.ta.Fill(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode);
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
this.ta.Fill(this.dsReport.jobReport, tbMon.Text, FCOMMON.info.Login.gcode, prcname);
//this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
//this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
@@ -104,7 +115,12 @@ namespace FPJ0000.JobReport
private void btRefresh_Click(object sender, EventArgs e)
{
RefreshData();
refrehData();
}
private void tbProcess_SelectedIndexChanged(object sender, EventArgs e)
{
if (tbProcess.SelectedIndex >= 0) refrehData();
}
}
}

9
SubProject/FPJ0000/JobReport/rJobReport.resx
View File

@@ -118,15 +118,12 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>119, 17</value>
<value>181, 17</value>
</metadata>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsReport.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
<value>79, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>183, 17</value>
<value>17, 17</value>
</metadata>
</root>

3
SubProject/FPJ0000/JobReport/rJobReportDay.cs
View File

@@ -47,7 +47,8 @@ namespace FPJ0000.JobReport
}
void refrehData()
{
this.ta.Fill(this.dsReport.JobReportDay, tbMon.Text, FCOMMON.info.Login.gcode);
string prcname = tbProcess.SelectedIndex < 1 ? "%" : tbProcess.Text.Trim();
this.ta.Fill(this.dsReport.JobReportDay, tbMon.Text, FCOMMON.info.Login.gcode, prcname);
//this.reportViewer1.SetDisplayMode(Microsoft.Reporting.WinForms.DisplayMode.PrintLayout);
//this.reportViewer1.ZoomMode = Microsoft.Reporting.WinForms.ZoomMode.PageWidth;
//this.reportViewer1.RefreshReport();

4
SubProject/FPJ0000/JobReport/rJobReportUser.cs
View File

@@ -111,6 +111,8 @@ namespace FPJ0000.JobReport
if (drDays == null || drDays.Count() < 1) this.fpSpread1.Sheets[0].Cells[3, 7].Value = 0;
else this.fpSpread1.Sheets[0].Cells[3, 7].Value = drDays.Count();
//기준시간 1번시트에 추가 표시 (210215 - 정봉석)
this.fpSpread1.Sheets[1].Cells["F1"].Value = drDays.Count() * 8;
ComplexBorderSide left = new ComplexBorderSide(Color.Gray, 1);
ComplexBorderSide top = new ComplexBorderSide(Color.Gray, 1);
@@ -194,7 +196,7 @@ namespace FPJ0000.JobReport
this.fpSpread1.Sheets[1].Cells[row, 3].Value = item.Sum(t => t.ot);
row += 1;
}
fpSpread1.Sheets[1].ColumnCount = 5;
fpSpread1.Sheets[1].ColumnCount = 6;
fpSpread1.Sheets[1].RowCount = row + 1;
//Raw dat a표시

28
SubProject/FPJ0000/Project/fPartBuyStatus.resx
View File

@@ -331,20 +331,20 @@
<data name="toolStripButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3qv6EsF70UpBSyqioF+VSmxrY
zVTMvM0pmprowiBbzEXmJTRxQoUoXV5UaJZOberc5nTDGZnL1LzfwMtSdzln7mx+e87ZUgOhH3x4Xjzn
++H8vufw2Am5r068VKpXRpbpf4dK9BQ5aY5y9jTQkaV9dPgTnemsWFvpF/VuHxfaPWGPerTLFnrVZDK5
zDYHzNYdVi0sNH4uWlD4aRaxZSN2QZZivzfqmYhi3TIb7pt2wjDDwDDLQD/NQDe1CfUvB9qGbXAwQPMI
hcKPM0h5ZqL+kYRK2qgN+yYG5lz4OseQk0E/J9mEZtyBL8N2InBjYNEFw4ITMsUs+Pe63nLhmPKgyRuS
qC2R/BpSqq+jur0eRQ3l4Ev8EUQQyM4gRHoSFc0V3CpWmsHSmh0hCRqGE0SX8j90DbWgZewlqvX5nCSh
Khz5r+ORXR8LYc1lJNcko3lwCS0mKz5/38A66SlU2kNzAkGlYL+fJMelH+3GqyEpStRZnCRRHkHCV5D+
PA3acRu3SucYBSXpYc3mRGhRr0fATlixhs6tTYJxXIcaw1087shDTPkFJFZFwThth5EUyxasnfB0YiaC
EOkuwbkHEuepgsOIrxRgYKIPsu4MSBW5iH0ajHp1E77NMzCSYvumnOglLFuc4D/0Co6LfUSB4kPIrovD
TXkY4ioucpJcRTzEDWnkTYLB3g/MutDPfmKChRQZkKPzCALFB+YDxQfJQz4IzPfB1ZJgZL5IgnZYCZmy
ABnvkyCUR8NIBAbyb+iJgHa6iUC9s8L5nB56cZ3G4LyLQzO6gDu16UglQVFNLPLqbm/fsdg3XUTQuCNg
bXPmHcH/sLErpO0SnM5V2d80Kbf2engvVGqt+2hCs9UbJ0Wmd0zObNgtKpXKPblCYXKZwriXFauTg23e
SpOwSuOmKGrd91brD2+cxzuR3p4ZIGzrOCZSmgNEjfQ2qR78/yJspH2FrWtHkls7/ZMUKTwej/cHMGye
UcYINAcAAAAASUVORK5CYII=
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALuSURBVDhPhZLrS1NhHMf3Kv+EsF70UpBSalFRL0pTmxrY
zVTMvM0pmprowiBbTCPzEpqoUCFK0osKtdJ5mTq3ObfhjMxlat5v4GWpu5wzdza/PedsqYHQDz48L57z
/XB+33N47AQ/UiZcLdXJI8p0v0MkOoqcNEc5e+rpiFItHfZcY7wgVlf6Rr4/xIX2T+jTfvWqmV43Go1O
k9UOk2WPdTMLjZ/LZhR8nkdM2ZhNkCnz8kTdE16sWWXD2lkH9HMM9PMMdLMMNDPbUP6yo2PUCjsDtI5R
KGiZQ/JLI/WPJETSQW3ZtjG04MTXBYacDAY5yTZUk3Z0jdqIwIWhZSf0Sw4UyeYR+LD3HReOLg+Yvi2J
3BHV3ERy9S1UdzagsKkcgRI/BBAERecRLD2DitYKbhULzWBlw4bgeBXDCaJKAz/2jrShbeINqnV5nCS+
Kgx5jXHIaoiBsPYakmqT0Dq8gjajBV++b2GT9BQi7ac5gaBS4OUryXbqxvvwdkSKEmUmJ0moCSfh60h7
lQr1pJVbpWeCgpz0sGF1IKRwwC1gJ7RYRefUJcIwqUGt/gGedeciuvwyEqoiYZi1wUCKZQtWT7k7MRFB
sHSf4OJjieNs/jHEVQowNKVFUV86pLIcxLwIQoPyE74tMjCQYrUzDgwQVs0OBD7xCE6JvUV88VFk1cfi
Tk0oYiuucJIcWRzETankTYLA3g/NOzHIfmKCmRTpn61xC/jiw4t88RHykDf4ed64URKEjNeJUI/KUSTP
R/qHRAhromAgAj35N3REQDtcRKDcW+FSdj+9vEljeNHJoRpfwv26NKSQoKg2Brn193bvWGzbTiJo3hOw
tgXTnuB/WNkVUvcJzuUobI0tXTsHPXwQij6V60R8q8UTJ0WmdU/PbdnMCoXCNb1GYXqVwqSHNYuDg23e
QpOwQumiKGrT5277D0+cxzud1pnhL+zoPimSm/xFzfQuKW78/iJspn2E7RvHk9p7/BJlyTwej/cHLNme
S8tQCB0AAAAASUVORK5CYII=
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

68
SubProject/FPJ0000/Project/fProjectData.Designer.cs generated
View File

@@ -155,6 +155,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.arPanel4 = new arCtl.arPanel();
this.dataGridView2 = new System.Windows.Forms.DataGridView();
@@ -175,7 +176,6 @@
this.toolStripButton5 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
this.toolStripButton7 = new System.Windows.Forms.ToolStripButton();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.arLabel12 = new arCtl.arLabel();
this.tabPage5 = new System.Windows.Forms.TabPage();
@@ -251,13 +251,13 @@
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.tabControl2.SuspendLayout();
this.tabPage3.SuspendLayout();
this.tabPage4.SuspendLayout();
this.arPanel4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dataGridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bsHistDay)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bindingNavigator2)).BeginInit();
this.bindingNavigator2.SuspendLayout();
this.tabPage3.SuspendLayout();
this.tabPage2.SuspendLayout();
this.tabPage5.SuspendLayout();
this.arPanel5.SuspendLayout();
@@ -583,7 +583,7 @@
this.remark_reqTextBox.Multiline = true;
this.remark_reqTextBox.Name = "remark_reqTextBox";
this.remark_reqTextBox.ScrollBars = System.Windows.Forms.ScrollBars.Both;
this.remark_reqTextBox.Size = new System.Drawing.Size(453, 280);
this.remark_reqTextBox.Size = new System.Drawing.Size(485, 280);
this.remark_reqTextBox.TabIndex = 49;
//
// ddateTextBox
@@ -633,7 +633,7 @@
this.bn.MovePreviousItem = this.bindingNavigatorMovePreviousItem;
this.bn.Name = "bn";
this.bn.PositionItem = this.bindingNavigatorPositionItem;
this.bn.Size = new System.Drawing.Size(1026, 25);
this.bn.Size = new System.Drawing.Size(1058, 25);
this.bn.TabIndex = 65;
this.bn.Text = "bindingNavigator1";
//
@@ -671,7 +671,6 @@
//
this.bindingNavigatorPositionItem.AccessibleName = "위치";
this.bindingNavigatorPositionItem.AutoSize = false;
this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem.Text = "0";
@@ -783,7 +782,7 @@
this.dataGridView1.RowHeadersVisible = false;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView1.Size = new System.Drawing.Size(440, 270);
this.dataGridView1.Size = new System.Drawing.Size(472, 270);
this.dataGridView1.TabIndex = 0;
this.dataGridView1.DoubleClick += new System.EventHandler(this.dataGridView1_DoubleClick);
//
@@ -1266,7 +1265,7 @@
this.panel3.Controls.Add(costoLabel);
this.panel3.Location = new System.Drawing.Point(6, 561);
this.panel3.Name = "panel3";
this.panel3.Size = new System.Drawing.Size(546, 93);
this.panel3.Size = new System.Drawing.Size(546, 86);
this.panel3.TabIndex = 86;
//
// arLabel5
@@ -1350,7 +1349,7 @@
this.arLabel6.SignAlign = System.Drawing.ContentAlignment.BottomRight;
this.arLabel6.SignColor = System.Drawing.Color.Yellow;
this.arLabel6.SignFont = new System.Drawing.Font("Consolas", 7F, System.Drawing.FontStyle.Italic);
this.arLabel6.Size = new System.Drawing.Size(453, 23);
this.arLabel6.Size = new System.Drawing.Size(485, 23);
this.arLabel6.TabIndex = 86;
this.arLabel6.Text = "개선 방향";
this.arLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -1383,7 +1382,7 @@
this.arPanel1.ProgressValue = 0F;
this.arPanel1.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel1.ShowBorder = true;
this.arPanel1.Size = new System.Drawing.Size(455, 305);
this.arPanel1.Size = new System.Drawing.Size(487, 305);
this.arPanel1.TabIndex = 88;
this.arPanel1.Text = "arPanel1";
this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1414,7 +1413,7 @@
this.arPanel2.ProgressValue = 0F;
this.arPanel2.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel2.ShowBorder = true;
this.arPanel2.Size = new System.Drawing.Size(442, 297);
this.arPanel2.Size = new System.Drawing.Size(474, 297);
this.arPanel2.TabIndex = 89;
this.arPanel2.Text = "arPanel2";
this.arPanel2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1448,7 +1447,7 @@
this.bindingNavigator1.MovePreviousItem = this.bindingNavigatorMovePreviousItem1;
this.bindingNavigator1.Name = "bindingNavigator1";
this.bindingNavigator1.PositionItem = this.bindingNavigatorPositionItem1;
this.bindingNavigator1.Size = new System.Drawing.Size(440, 25);
this.bindingNavigator1.Size = new System.Drawing.Size(472, 25);
this.bindingNavigator1.TabIndex = 87;
this.bindingNavigator1.Text = "bindingNavigator1";
//
@@ -1486,7 +1485,6 @@
//
this.bindingNavigatorPositionItem1.AccessibleName = "위치";
this.bindingNavigatorPositionItem1.AutoSize = false;
this.bindingNavigatorPositionItem1.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.bindingNavigatorPositionItem1.Name = "bindingNavigatorPositionItem1";
this.bindingNavigatorPositionItem1.Size = new System.Drawing.Size(50, 23);
this.bindingNavigatorPositionItem1.Text = "0";
@@ -1554,6 +1552,8 @@
// tam
//
this.tam.BackupDataSetBeforeUpdate = false;
this.tam.EETGW_JobReport_AutoInputTableAdapter = null;
this.tam.EETGW_JobReport_EBoardTableAdapter = null;
this.tam.EETGW_NoteTableAdapter = null;
this.tam.EETGW_ProjecthistoryDTableAdapter = null;
this.tam.EETGW_ProjectToDoTableAdapter = null;
@@ -1897,7 +1897,7 @@
this.tabControl1.Location = new System.Drawing.Point(0, 0);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1026, 679);
this.tabControl1.Size = new System.Drawing.Size(1058, 679);
this.tabControl1.TabIndex = 93;
//
// tabPage1
@@ -1912,28 +1912,41 @@
this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1018, 653);
this.tabPage1.Size = new System.Drawing.Size(1050, 653);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "일반사항";
this.tabPage1.UseVisualStyleBackColor = true;
//
// tabControl2
//
this.tabControl2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.tabControl2.Controls.Add(this.tabPage3);
this.tabControl2.Controls.Add(this.tabPage4);
this.tabControl2.Location = new System.Drawing.Point(559, 318);
this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(456, 329);
this.tabControl2.Size = new System.Drawing.Size(488, 329);
this.tabControl2.TabIndex = 90;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.arPanel2);
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(480, 303);
this.tabPage3.TabIndex = 0;
this.tabPage3.Text = "업무 현황";
this.tabPage3.UseVisualStyleBackColor = true;
//
// tabPage4
//
this.tabPage4.Controls.Add(this.arPanel4);
this.tabPage4.Location = new System.Drawing.Point(4, 22);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
this.tabPage4.Size = new System.Drawing.Size(448, 303);
this.tabPage4.Size = new System.Drawing.Size(480, 303);
this.tabPage4.TabIndex = 1;
this.tabPage4.Text = "메모";
this.tabPage4.UseVisualStyleBackColor = true;
@@ -1962,7 +1975,7 @@
this.arPanel4.ProgressValue = 0F;
this.arPanel4.ShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel4.ShowBorder = true;
this.arPanel4.Size = new System.Drawing.Size(442, 297);
this.arPanel4.Size = new System.Drawing.Size(474, 297);
this.arPanel4.TabIndex = 90;
this.arPanel4.Text = "arPanel4";
this.arPanel4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -1991,7 +2004,7 @@
this.dataGridView2.RowHeadersVisible = false;
this.dataGridView2.RowTemplate.Height = 23;
this.dataGridView2.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
this.dataGridView2.Size = new System.Drawing.Size(440, 270);
this.dataGridView2.Size = new System.Drawing.Size(472, 270);
this.dataGridView2.TabIndex = 0;
//
// dataGridViewTextBoxColumn3
@@ -2053,7 +2066,7 @@
this.bindingNavigator2.MovePreviousItem = this.toolStripButton2;
this.bindingNavigator2.Name = "bindingNavigator2";
this.bindingNavigator2.PositionItem = this.toolStripTextBox1;
this.bindingNavigator2.Size = new System.Drawing.Size(440, 25);
this.bindingNavigator2.Size = new System.Drawing.Size(472, 25);
this.bindingNavigator2.TabIndex = 87;
this.bindingNavigator2.Text = "bindingNavigator2";
//
@@ -2091,7 +2104,6 @@
//
this.toolStripTextBox1.AccessibleName = "위치";
this.toolStripTextBox1.AutoSize = false;
this.toolStripTextBox1.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.toolStripTextBox1.Name = "toolStripTextBox1";
this.toolStripTextBox1.Size = new System.Drawing.Size(50, 23);
this.toolStripTextBox1.Text = "0";
@@ -2152,17 +2164,6 @@
this.toolStripButton7.Text = "삭제";
this.toolStripButton7.Click += new System.EventHandler(this.toolStripButton7_Click);
//
// tabPage3
//
this.tabPage3.Controls.Add(this.arPanel2);
this.tabPage3.Location = new System.Drawing.Point(4, 22);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(448, 303);
this.tabPage3.TabIndex = 0;
this.tabPage3.Text = "업무 현황";
this.tabPage3.UseVisualStyleBackColor = true;
//
// tabPage2
//
this.tabPage2.Controls.Add(this.tableLayoutPanel1);
@@ -2441,7 +2442,6 @@
//
this.toolStripTextBox2.AccessibleName = "위치";
this.toolStripTextBox2.AutoSize = false;
this.toolStripTextBox2.Font = new System.Drawing.Font("맑은 고딕", 9F);
this.toolStripTextBox2.Name = "toolStripTextBox2";
this.toolStripTextBox2.Size = new System.Drawing.Size(50, 23);
this.toolStripTextBox2.Text = "0";
@@ -2524,7 +2524,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1026, 704);
this.ClientSize = new System.Drawing.Size(1058, 704);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.bn);
this.MinimizeBox = false;
@@ -2564,6 +2564,7 @@
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.tabControl2.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.tabPage4.ResumeLayout(false);
this.arPanel4.ResumeLayout(false);
this.arPanel4.PerformLayout();
@@ -2572,7 +2573,6 @@
((System.ComponentModel.ISupportInitialize)(this.bindingNavigator2)).EndInit();
this.bindingNavigator2.ResumeLayout(false);
this.bindingNavigator2.PerformLayout();
this.tabPage3.ResumeLayout(false);
this.tabPage2.ResumeLayout(false);
this.tabPage5.ResumeLayout(false);
this.arPanel5.ResumeLayout(false);

38
SubProject/FPJ0000/Project/fProjectPartListEdit.Designer.cs generated
View File

@@ -60,6 +60,7 @@
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.panel1 = new System.Windows.Forms.Panel();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.itemModelTextBox = new System.Windows.Forms.TextBox();
this.textBox1 = new System.Windows.Forms.TextBox();
this.panel3 = new System.Windows.Forms.Panel();
this.checkBox1 = new System.Windows.Forms.CheckBox();
@@ -78,7 +79,6 @@
this.itemNameTextBox = new System.Windows.Forms.TextBox();
this.button1 = new System.Windows.Forms.Button();
this.panel2 = new System.Windows.Forms.Panel();
this.itemModelTextBox = new System.Windows.Forms.TextBox();
pdateLabel = new System.Windows.Forms.Label();
statusLabel = new System.Windows.Forms.Label();
nameLabel = new System.Windows.Forms.Label();
@@ -257,6 +257,15 @@
label1.TabIndex = 6;
label1.Text = "납기일";
//
// itemModelLabel
//
itemModelLabel.AutoSize = true;
itemModelLabel.Location = new System.Drawing.Point(44, 66);
itemModelLabel.Name = "itemModelLabel";
itemModelLabel.Size = new System.Drawing.Size(48, 12);
itemModelLabel.TabIndex = 24;
itemModelLabel.Text = "MODEL";
//
// bs
//
this.bs.DataMember = "ProjectPartStatus";
@@ -416,6 +425,14 @@
this.groupBox2.TabStop = false;
this.groupBox2.Text = "파트정보";
//
// itemModelTextBox
//
this.itemModelTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ItemModel", true));
this.itemModelTextBox.Location = new System.Drawing.Point(98, 62);
this.itemModelTextBox.Name = "itemModelTextBox";
this.itemModelTextBox.Size = new System.Drawing.Size(602, 21);
this.itemModelTextBox.TabIndex = 25;
//
// textBox1
//
this.textBox1.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "Item", true));
@@ -571,7 +588,7 @@
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(713, 39);
this.button1.TabIndex = 17;
this.button1.Text = "저장";
this.button1.Text = "확인";
this.button1.UseVisualStyleBackColor = true;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
@@ -583,23 +600,6 @@
this.panel2.Size = new System.Drawing.Size(713, 5);
this.panel2.TabIndex = 18;
//
// itemModelLabel
//
itemModelLabel.AutoSize = true;
itemModelLabel.Location = new System.Drawing.Point(44, 66);
itemModelLabel.Name = "itemModelLabel";
itemModelLabel.Size = new System.Drawing.Size(48, 12);
itemModelLabel.TabIndex = 24;
itemModelLabel.Text = "MODEL";
//
// itemModelTextBox
//
this.itemModelTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "ItemModel", true));
this.itemModelTextBox.Location = new System.Drawing.Point(98, 62);
this.itemModelTextBox.Name = "itemModelTextBox";
this.itemModelTextBox.Size = new System.Drawing.Size(602, 21);
this.itemModelTextBox.TabIndex = 25;
//
// fProjectPartListEdit
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);

9
SubProject/FPJ0000/Project/fProjectPartListEdit.resx
View File

@@ -168,22 +168,19 @@
<metadata name="label1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="itemModelLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
<metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>100, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="dsPRJ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>164, 17</value>
</metadata>
<metadata name="tableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>226, 17</value>
</metadata>
<metadata name="itemModelLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>False</value>
</metadata>
</root>

BIN
SubProject/FPJ0000/ReportForUser.xlsx
View File

Binary file not shown.

145
SubProject/FPJ0000/dsReport.Designer.cs generated
View File

@@ -431,6 +431,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnot;
private global::System.Data.DataColumn columnUserProcess;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public jobReportDataTable() {
@@ -512,6 +514,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn UserProcessColumn {
get {
return this.columnUserProcess;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -549,7 +559,7 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot) {
public jobReportRow AddjobReportRow(string yymm, int total, string uid, string uname, double hrs, double ot, string UserProcess) {
jobReportRow rowjobReportRow = ((jobReportRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
yymm,
@@ -557,7 +567,8 @@ namespace FPJ0000 {
uid,
uname,
hrs,
ot};
ot,
UserProcess};
rowjobReportRow.ItemArray = columnValuesArray;
this.Rows.Add(rowjobReportRow);
return rowjobReportRow;
@@ -594,6 +605,7 @@ namespace FPJ0000 {
this.columnuname = base.Columns["uname"];
this.columnhrs = base.Columns["hrs"];
this.columnot = base.Columns["ot"];
this.columnUserProcess = base.Columns["UserProcess"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -611,6 +623,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnhrs);
this.columnot = new global::System.Data.DataColumn("ot", typeof(double), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnot);
this.columnUserProcess = new global::System.Data.DataColumn("UserProcess", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnUserProcess);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnyymm,
this.columnuid}, true));
@@ -622,6 +636,7 @@ namespace FPJ0000 {
this.columnuid.MaxLength = 20;
this.columnuname.ReadOnly = true;
this.columnuname.MaxLength = 200;
this.columnUserProcess.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -767,6 +782,8 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnprocesss;
private global::System.Data.DataColumn columnUserProcess;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobReportDayDataTable() {
@@ -848,6 +865,14 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public global::System.Data.DataColumn UserProcessColumn {
get {
return this.columnUserProcess;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -885,7 +910,7 @@ namespace FPJ0000 {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public JobReportDayRow AddJobReportDayRow(string uid, string uname, string pdate, double hrs, double ot, string processs) {
public JobReportDayRow AddJobReportDayRow(string uid, string uname, string pdate, double hrs, double ot, string processs, string UserProcess) {
JobReportDayRow rowJobReportDayRow = ((JobReportDayRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
uid,
@@ -893,7 +918,8 @@ namespace FPJ0000 {
pdate,
hrs,
ot,
processs};
processs,
UserProcess};
rowJobReportDayRow.ItemArray = columnValuesArray;
this.Rows.Add(rowJobReportDayRow);
return rowJobReportDayRow;
@@ -930,6 +956,7 @@ namespace FPJ0000 {
this.columnhrs = base.Columns["hrs"];
this.columnot = base.Columns["ot"];
this.columnprocesss = base.Columns["processs"];
this.columnUserProcess = base.Columns["UserProcess"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -947,6 +974,8 @@ namespace FPJ0000 {
base.Columns.Add(this.columnot);
this.columnprocesss = new global::System.Data.DataColumn("processs", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnprocesss);
this.columnUserProcess = new global::System.Data.DataColumn("UserProcess", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnUserProcess);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnuid,
this.columnpdate}, true));
@@ -959,6 +988,7 @@ namespace FPJ0000 {
this.columnhrs.ReadOnly = true;
this.columnot.ReadOnly = true;
this.columnprocesss.MaxLength = 100;
this.columnUserProcess.MaxLength = 50;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -2028,6 +2058,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string UserProcess {
get {
if (this.IsUserProcessNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tablejobReport.UserProcessColumn]));
}
}
set {
this[this.tablejobReport.UserProcessColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IstotalNull() {
@@ -2075,6 +2121,18 @@ namespace FPJ0000 {
public void SetotNull() {
this[this.tablejobReport.otColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsUserProcessNull() {
return this.IsNull(this.tablejobReport.UserProcessColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetUserProcessNull() {
this[this.tablejobReport.UserProcessColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -2177,6 +2235,22 @@ namespace FPJ0000 {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public string UserProcess {
get {
if (this.IsUserProcessNull()) {
return string.Empty;
}
else {
return ((string)(this[this.tableJobReportDay.UserProcessColumn]));
}
}
set {
this[this.tableJobReportDay.UserProcessColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsunameNull() {
@@ -2224,6 +2298,18 @@ namespace FPJ0000 {
public void SetprocesssNull() {
this[this.tableJobReportDay.processsColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IsUserProcessNull() {
return this.IsNull(this.tableJobReportDay.UserProcessColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public void SetUserProcessNull() {
this[this.tableJobReportDay.UserProcessColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -2807,6 +2893,7 @@ namespace FPJ0000.dsReportTableAdapters {
tableMapping.ColumnMappings.Add("uname", "uname");
tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("ot", "ot");
tableMapping.ColumnMappings.Add("UserProcess", "UserProcess");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -2823,18 +2910,20 @@ namespace FPJ0000.dsReportTableAdapters {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot\r\nFROM vUserWorkTimeList\r\nWHERE (SUB" +
"STRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode)\r\nORDER BY yymm";
this._commandCollection[0].CommandText = "SELECT yymm, total, uid, uname, hrs, ot, UserProcess\r\nFROM vUserWorkTimeList" +
"\r\nWHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserPr" +
"ocess, \'\') LIKE @userprocess)\r\nORDER BY yymm";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yyyy", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
public virtual int Fill(dsReport.jobReportDataTable dataTable, string yyyy, string gcode) {
public virtual int Fill(dsReport.jobReportDataTable dataTable, string yyyy, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
@@ -2848,6 +2937,12 @@ namespace FPJ0000.dsReportTableAdapters {
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -2859,7 +2954,7 @@ namespace FPJ0000.dsReportTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
public virtual dsReport.jobReportDataTable GetData(string yyyy, string gcode) {
public virtual dsReport.jobReportDataTable GetData(string yyyy, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yyyy == null)) {
throw new global::System.ArgumentNullException("yyyy");
@@ -2873,6 +2968,12 @@ namespace FPJ0000.dsReportTableAdapters {
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
}
dsReport.jobReportDataTable dataTable = new dsReport.jobReportDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -3006,6 +3107,7 @@ namespace FPJ0000.dsReportTableAdapters {
tableMapping.ColumnMappings.Add("hrs", "hrs");
tableMapping.ColumnMappings.Add("ot", "ot");
tableMapping.ColumnMappings.Add("processs", "processs");
tableMapping.ColumnMappings.Add("UserProcess", "UserProcess");
this._adapter.TableMappings.Add(tableMapping);
}
@@ -3022,22 +3124,25 @@ namespace FPJ0000.dsReportTableAdapters {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot
FROM JobReport LEFT OUTER JOIN
this._commandCollection[0].CommandText = @"SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot,
EETGW_GroupUser.Process AS UserProcess
FROM JobReport INNER JOIN
EETGW_GroupUser ON JobReport.gcode = EETGW_GroupUser.gcode AND JobReport.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
Users ON JobReport.uid = Users.id
WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid <> '') AND (JobReport.gcode = @gcode)
GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs
WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid <> '') AND (JobReport.gcode = @gcode) AND (ISNULL(EETGW_GroupUser.Process, '') LIKE @userprocess)
GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs, EETGW_GroupUser.Process
ORDER BY processs, JobReport.pdate, uname";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@yymm", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 10, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userprocess", global::System.Data.SqlDbType.VarChar, 1024, global::System.Data.ParameterDirection.Input, 0, 0, "", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)]
public virtual int Fill(dsReport.JobReportDayDataTable dataTable, string yymm, string gcode) {
public virtual int Fill(dsReport.JobReportDayDataTable dataTable, string yymm, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yymm == null)) {
throw new global::System.ArgumentNullException("yymm");
@@ -3051,6 +3156,12 @@ ORDER BY processs, JobReport.pdate, uname";
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
}
if ((this.ClearBeforeFill == true)) {
dataTable.Clear();
}
@@ -3062,7 +3173,7 @@ ORDER BY processs, JobReport.pdate, uname";
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)]
public virtual dsReport.JobReportDayDataTable GetData(string yymm, string gcode) {
public virtual dsReport.JobReportDayDataTable GetData(string yymm, string gcode, string userprocess) {
this.Adapter.SelectCommand = this.CommandCollection[0];
if ((yymm == null)) {
throw new global::System.ArgumentNullException("yymm");
@@ -3076,6 +3187,12 @@ ORDER BY processs, JobReport.pdate, uname";
else {
this.Adapter.SelectCommand.Parameters[1].Value = ((string)(gcode));
}
if ((userprocess == null)) {
throw new global::System.ArgumentNullException("userprocess");
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(userprocess));
}
dsReport.JobReportDayDataTable dataTable = new dsReport.JobReportDayDataTable();
this.Adapter.Fill(dataTable);
return dataTable;

42
SubProject/FPJ0000/dsReport.xsd
View File

@@ -9,16 +9,17 @@
<Tables>
<TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="jobReportTableAdapter" GeneratorDataComponentClassName="jobReportTableAdapter" Name="jobReport" UserDataComponentName="jobReportTableAdapter">
<MainSource>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="GroupWare.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<DbSource ConnectionRef="gwcs (Settings)" DbObjectName="EE.dbo.vUserWorkTimeList" DbObjectType="View" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT yymm, total, uid, uname, hrs, ot
<CommandText>SELECT yymm, total, uid, uname, hrs, ot, UserProcess
FROM vUserWorkTimeList
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode)
WHERE (SUBSTRING(yymm, 1, 4) = @yyyy) AND (gcode = @gcode) AND (ISNULL(UserProcess, '') LIKE @userprocess)
ORDER BY yymm</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="yyyy" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@yyyy" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="GroupWare.dbo.vUserWorkTimeList" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.vUserWorkTimeList" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -31,6 +32,7 @@ ORDER BY yymm</CommandText>
<Mapping SourceColumn="uname" DataSetColumn="uname" />
<Mapping SourceColumn="hrs" DataSetColumn="hrs" />
<Mapping SourceColumn="ot" DataSetColumn="ot" />
<Mapping SourceColumn="UserProcess" DataSetColumn="UserProcess" />
</Mappings>
<Sources />
</TableAdapter>
@@ -39,15 +41,18 @@ ORDER BY yymm</CommandText>
<DbSource ConnectionRef="gwcs (Settings)" DbObjectType="Unknown" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="false">
<CommandText>SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot
FROM JobReport LEFT OUTER JOIN
<CommandText>SELECT ISNULL(Users.processs, '') AS processs, JobReport.uid, Users.name AS uname, JobReport.pdate, SUM(JobReport.hrs) AS hrs, SUM(JobReport.ot) AS ot,
EETGW_GroupUser.Process AS UserProcess
FROM JobReport INNER JOIN
EETGW_GroupUser ON JobReport.gcode = EETGW_GroupUser.gcode AND JobReport.uid = EETGW_GroupUser.uid LEFT OUTER JOIN
Users ON JobReport.uid = Users.id
WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid &lt;&gt; '') AND (JobReport.gcode = @gcode)
GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs
WHERE (SUBSTRING(JobReport.pdate, 1, 7) = @yymm) AND (JobReport.uid &lt;&gt; '') AND (JobReport.gcode = @gcode) AND (ISNULL(EETGW_GroupUser.Process, '') LIKE @userprocess)
GROUP BY JobReport.uid, JobReport.pdate, Users.name, Users.processs, EETGW_GroupUser.Process
ORDER BY processs, JobReport.pdate, uname</CommandText>
<Parameters>
<Parameter AllowDbNull="false" AutogeneratedName="yymm" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@yymm" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="gcode" ColumnName="gcode" DataSourceName="EE.dbo.JobReport" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@gcode" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="gcode" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="false" AutogeneratedName="userprocess" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@userprocess" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -60,6 +65,7 @@ ORDER BY processs, JobReport.pdate, uname</CommandText>
<Mapping SourceColumn="hrs" DataSetColumn="hrs" />
<Mapping SourceColumn="ot" DataSetColumn="ot" />
<Mapping SourceColumn="processs" DataSetColumn="processs" />
<Mapping SourceColumn="UserProcess" DataSetColumn="UserProcess" />
</Mappings>
<Sources />
</TableAdapter>
@@ -177,13 +183,20 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:element>
<xs:element name="hrs" msprop:Generator_ColumnVarNameInTable="columnhrs" msprop:Generator_ColumnPropNameInRow="hrs" msprop:Generator_ColumnPropNameInTable="hrsColumn" msprop:Generator_UserColumnName="hrs" type="xs:double" minOccurs="0" />
<xs:element name="ot" msprop:Generator_ColumnVarNameInTable="columnot" msprop:Generator_ColumnPropNameInRow="ot" msprop:Generator_ColumnPropNameInTable="otColumn" msprop:Generator_UserColumnName="ot" type="xs:double" minOccurs="0" />
<xs:element name="UserProcess" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="UserProcess" msprop:Generator_ColumnVarNameInTable="columnUserProcess" msprop:Generator_ColumnPropNameInTable="UserProcessColumn" msprop:Generator_UserColumnName="UserProcess" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="JobReportDay" msprop:Generator_TableClassName="JobReportDayDataTable" msprop:Generator_TableVarName="tableJobReportDay" msprop:Generator_RowChangedName="JobReportDayRowChanged" msprop:Generator_TablePropName="JobReportDay" msprop:Generator_RowDeletingName="JobReportDayRowDeleting" msprop:Generator_RowChangingName="JobReportDayRowChanging" msprop:Generator_RowEvHandlerName="JobReportDayRowChangeEventHandler" msprop:Generator_RowDeletedName="JobReportDayRowDeleted" msprop:Generator_RowClassName="JobReportDayRow" msprop:Generator_UserTableName="JobReportDay" msprop:Generator_RowEvArgName="JobReportDayRowChangeEvent">
<xs:complexType>
<xs:sequence>
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid">
<xs:element name="uid" msprop:Generator_ColumnVarNameInTable="columnuid" msprop:Generator_ColumnPropNameInRow="uid" msprop:Generator_ColumnPropNameInTable="uidColumn" msprop:Generator_UserColumnName="uid" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="20" />
@@ -197,7 +210,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate">
<xs:element name="pdate" msprop:Generator_ColumnVarNameInTable="columnpdate" msprop:Generator_ColumnPropNameInRow="pdate" msprop:Generator_ColumnPropNameInTable="pdateColumn" msprop:Generator_UserColumnName="pdate" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="10" />
@@ -213,6 +226,13 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
</xs:restriction>
</xs:simpleType>
</xs:element>
<xs:element name="UserProcess" msprop:Generator_ColumnVarNameInTable="columnUserProcess" msprop:Generator_ColumnPropNameInRow="UserProcess" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInTable="UserProcessColumn" msprop:Generator_UserColumnName="UserProcess" minOccurs="0">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:maxLength value="50" />
</xs:restriction>
</xs:simpleType>
</xs:element>
</xs:sequence>
</xs:complexType>
</xs:element>
@@ -263,7 +283,7 @@ SELECT Users.id, Users.name, Users.gcode FROM Users RIGHT OUTER JOIN JobReport O
<xs:element name="option1" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="option1" msprop:Generator_ColumnVarNameInTable="columnoption1" msprop:Generator_ColumnPropNameInTable="option1Column" msprop:Generator_UserColumnName="option1" type="xs:string" minOccurs="0" />
<xs:element name="ItemSupply" msprop:nullValue="_empty" msprop:Generator_ColumnPropNameInRow="ItemSupply" msprop:Generator_ColumnVarNameInTable="columnItemSupply" msprop:Generator_ColumnPropNameInTable="ItemSupplyColumn" msprop:Generator_UserColumnName="ItemSupply" type="xs:string" minOccurs="0" />
<xs:element name="amt" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="amt" msprop:Generator_ColumnVarNameInTable="columnamt" msprop:Generator_ColumnPropNameInTable="amtColumn" msprop:Generator_UserColumnName="amt" type="xs:decimal" minOccurs="0" />
<xs:element name="amtn" msprop:Generator_ColumnVarNameInTable="columnamtn" msprop:Generator_ColumnPropNameInRow="amtn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInTable="amtnColumn" msprop:Generator_UserColumnName="amtn" type="xs:decimal" minOccurs="0" />
<xs:element name="amtn" msprop:nullValue="0" msprop:Generator_ColumnPropNameInRow="amtn" msprop:Generator_ColumnVarNameInTable="columnamtn" msprop:Generator_ColumnPropNameInTable="amtnColumn" msprop:Generator_UserColumnName="amtn" type="xs:decimal" minOccurs="0" />
</xs:sequence>
</xs:complexType>
</xs:element>

4
SubProject/FPJ0000/dsReport.xss
View File

@@ -4,10 +4,10 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="60" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:jobReport" ZOrder="5" X="70" Y="70" Height="419" Width="200" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="273" />
<Shape ID="DesignTable:JobReportDay" ZOrder="4" X="335" Y="164" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:JobReportDay" ZOrder="4" X="311" Y="177" Height="394" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="326" />
<Shape ID="DesignTable:ProcessList" ZOrder="3" X="587" Y="65" Height="190" Width="177" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ProcessUserList" ZOrder="2" X="619" Y="303" Height="248" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="180" />
<Shape ID="DesignTable:PartSummary" ZOrder="1" X="852" Y="79" Height="124" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="120" />