diff --git a/SubProject/FPJ0000/EBoard/EBoardReport.xlsx b/SubProject/FPJ0000/EBoard/EBoardReport.xlsx
deleted file mode 100644
index 3ee6706..0000000
Binary files a/SubProject/FPJ0000/EBoard/EBoardReport.xlsx and /dev/null differ
diff --git a/SubProject/FPJ0000/EBoard/fEBoardReport.Designer.cs b/SubProject/FPJ0000/EBoard/fEBoardReport.Designer.cs
index f876f08..6c705d3 100644
--- a/SubProject/FPJ0000/EBoard/fEBoardReport.Designer.cs
+++ b/SubProject/FPJ0000/EBoard/fEBoardReport.Designer.cs
@@ -65,25 +65,6 @@ namespace FPJ0000.EBoard
//
this.fpSpread1_Sheet1.Reset();
this.fpSpread1_Sheet1.SheetName = "Sheet1";
- // Formulas and custom names must be loaded with R1C1 reference style
- this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
- this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.ColumnFooter.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.ColumnFooterSheetCornerStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.ColumnHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.DefaultStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.FilterBar.DefaultStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.FilterBar.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.FilterBarHeaderStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.FilterBarHeaderStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.RowHeader.DefaultStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.RowHeader.DefaultStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.SheetCornerStyle.BackColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.SheetCornerStyle.ForeColor = System.Drawing.Color.Empty;
- this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
//
// progressBar2
//
@@ -106,6 +87,7 @@ namespace FPJ0000.EBoard
this.btSave.TabIndex = 12;
this.btSave.Text = "파일저장";
this.btSave.UseVisualStyleBackColor = true;
+ this.btSave.Click += new System.EventHandler(this.btSave_Click);
//
// label3
//
@@ -165,6 +147,7 @@ namespace FPJ0000.EBoard
this.panel1.Padding = new System.Windows.Forms.Padding(5);
this.panel1.Size = new System.Drawing.Size(1114, 58);
this.panel1.TabIndex = 6;
+ this.panel1.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.panel1_MouseDoubleClick);
//
// dsReport
//
@@ -187,6 +170,7 @@ namespace FPJ0000.EBoard
this.Name = "fEBoardReport";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "전자실 Performance Report";
+ this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
this.Load += new System.EventHandler(this.fEBoardReport_Load);
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
diff --git a/SubProject/FPJ0000/EBoard/fEBoardReport.cs b/SubProject/FPJ0000/EBoard/fEBoardReport.cs
index c5c701b..4368f0f 100644
--- a/SubProject/FPJ0000/EBoard/fEBoardReport.cs
+++ b/SubProject/FPJ0000/EBoard/fEBoardReport.cs
@@ -20,11 +20,150 @@ namespace FPJ0000.EBoard
private void fEBoardReport_Load(object sender, EventArgs e)
{
//기본엑셀파일을 가져온다
+ this.Show();
+ Application.DoEvents();
+
+ //파일불러오기
+ LoadExcel();
+ }
+
+ void LoadExcel()
+ {
+ //파일불러오기
+ var fi = new System.IO.FileInfo(FCOMMON.Util.CurrentPath + "EBoardReport.xlsx");
+ this.fpSpread1.OpenExcel(fi.FullName);
}
private void btRefresh_Click(object sender, EventArgs e)
{
+ //새로고침
+ //a2 에 날짜를 표시함.
+ var db = new EEEntities();
+ var sd = this.dts.Value.ToShortDateString();
+ var ed = this.dte.Value.ToShortDateString();
+ var 분류목록 = db.EETGW_JobReport_EBoard.Where(t => string.IsNullOrEmpty(t.분류) == false).OrderBy(t => t.분류).GroupBy(t => t.분류).ToList();
+
+ var 기간자료 = db.EETGW_JobReport_EBoard.Where(t => t.pdate.CompareTo(sd) >= 0 && t.pdate.CompareTo(ed) <= 0);
+ var 담당목록 = db.vGroupUser.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.processs == "전자실" && string.IsNullOrEmpty(t.state) == true).OrderBy(t => t.name).GroupBy(t => t.name);
+
+
+ var row = 1;
+ var col = 1;
+ var col0 = 1;
+ foreach (var item in 분류목록)
+ {
+ var dr = item.FirstOrDefault();
+ var cell = this.fpSpread1.Sheets[0].Cells[row, col + 0];
+ cell.Value = dr.분류;
+ cell.ColumnSpan = 2;
+ cell.BackColor = Color.SkyBlue;
+ cell.HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ cell.VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+
+ cell = this.fpSpread1.Sheets[0].Cells[row + 1, col + 0];
+ cell.Value = "건";
+ cell.BackColor = Color.Khaki;
+ cell.HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ cell.VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+
+ cell = this.fpSpread1.Sheets[0].Cells[row + 1, col + 1];
+ cell.Value = "시간";
+ cell.BackColor = Color.Khaki;
+ cell.HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ cell.VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+
+ col += 2;
+ col0 += 1;
+ }
+
+ //마지막 열에는 비용절감항목을 추가한다.
+ fpSpread1.Sheets[0].Cells[1, col].Value = "비용절감";
+ fpSpread1.Sheets[0].Cells[1, col].BackColor = Color.WhiteSmoke;
+ fpSpread1.Sheets[0].Cells[1, col].RowSpan = 2;
+ fpSpread1.Sheets[0].Cells[1, col].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ fpSpread1.Sheets[0].Cells[1, col].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+
+ var MaxCol = col0;
+ col = 0;
+ row = 3;
+ foreach (var item in 담당목록)
+ {
+ //var dr = item.KeY;
+ this.fpSpread1.Sheets[0].Cells[row, col].Value = item.Key;
+
+ //이 담당자의 횟수를 읽어온다
+ for (int i = 1; i < MaxCol; i++)
+ {
+ var 분류명 = fpSpread1.Sheets[0].Cells[1, 1 + (i - 1) * 2].Value.ToString();
+ var 분류데이터 = 기간자료.Where(t => t.uid.Contains(item.Key) && t.분류 == 분류명);
+ var 건수 = 분류데이터.Count();
+ var 시간 = 분류데이터.Sum(t => t.RepairTime);
+ this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 1].Value = 건수;
+ this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 2].Value = 시간;
+ this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 2].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 2].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+
+ this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 1].Column.Width = 50;
+ this.fpSpread1.Sheets[0].Cells[row, (i - 1) * 2 + 2].Column.Width = 70;
+ }
+
+ //이 담당자의 수리완료건의 비용절감비용을 가져온다
+ var 절감비용 = 기간자료.Where(t => t.uid.Contains(item.Key) && t.분류 == "수리완료" && string.IsNullOrEmpty(t.수리완료일) == false && string.IsNullOrEmpty(t.외주업체) == true).Sum(t => t.CostReduction);
+ this.fpSpread1.Sheets[0].Cells[row, (MaxCol) * 2 - 1].Value = 절감비용;
+ this.fpSpread1.Sheets[0].Cells[row, (MaxCol) * 2 - 1].BackColor = Color.WhiteSmoke;
+ this.fpSpread1.Sheets[0].Cells[row, (MaxCol) * 2 - 1].VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1.Sheets[0].Cells[row, (MaxCol) * 2 - 1].HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ row += 1;
+ }
+
+ this.fpSpread1.Sheets[0].Cells[row, 0].Value = "합계";
+
+
+ for (int i = 1; i < MaxCol; i++)
+ {
+ var colIdx = (i - 1) * 2;
+ var c1 = (char)(65 + colIdx + 1);
+ var c2 = (char)(65 + colIdx + 2);
+ this.fpSpread1.Sheets[0].Cells[row, colIdx + 1].Formula = $"SUM({c1}4:{c1}" + row.ToString() + ")";
+ this.fpSpread1.Sheets[0].Cells[row, colIdx + 2].Formula = $"SUM({c2}4:{c2}" + row.ToString() + ")";
+ }
+ var c3 = (char)(65 + MaxCol * 2 - 1);
+ this.fpSpread1.Sheets[0].Cells[row, (MaxCol) * 2 - 1].Formula = $"SUM({c3}4:{c3}" + row.ToString() + ")";
+ this.fpSpread1.Sheets[0].Cells["A1"].Value = "Performance";
+ this.fpSpread1.Sheets[0].Cells["A1"].ColumnSpan = MaxCol * 2;
+ this.fpSpread1.Sheets[0].Cells["A2"].Value = "성명";
+ this.fpSpread1.Sheets[0].Cells["A2"].RowSpan = 2;
+
+ this.fpSpread1.Sheets[0].Cells[$"A2:A{row}"].BackColor = Color.WhiteSmoke;
+
+ //합계필드 색상변경
+ this.fpSpread1.Sheets[0].Cells[$"A{row + 1}:{c3}{row + 1}"].BackColor = Color.WhiteSmoke;
+ //this.fpSpread1.Sheets[0].Cells[$"A{row + 1}:{c3}{row + 1}"].Border =
+ // new FarPoint.Win.ComplexBorder(
+ // new FarPoint.Win.ComplexBorderSide(FarPoint.Win.ComplexBorderSideStyle.MediumLine));
+
+
+ //모든열을 중앙정렬한다
+
+
+ this.fpSpread1.Invalidate();
+ }
+
+ private void btSave_Click(object sender, EventArgs e)
+ {
+ //파일저장
+ var sd = new SaveFileDialog();
+ sd.Filter = "excel|*.xls";
+ if (sd.ShowDialog() == DialogResult.OK)
+ {
+ this.fpSpread1.SaveExcel(sd.FileName);
+ }
+ }
+
+ private void panel1_MouseDoubleClick(object sender, MouseEventArgs e)
+ {
+ LoadExcel();
}
}
}
diff --git a/SubProject/FPJ0000/EBoard/fEBoardReport.resx b/SubProject/FPJ0000/EBoard/fEBoardReport.resx
index 7362dc4..03e2d73 100644
--- a/SubProject/FPJ0000/EBoard/fEBoardReport.resx
+++ b/SubProject/FPJ0000/EBoard/fEBoardReport.resx
@@ -120,9 +120,6 @@
397, 17
-
- 397, 17
-
549, 17
diff --git a/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs
index 8e6a440..9cc72a8 100644
--- a/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs
+++ b/SubProject/FPJ0000/EBoard/fEboardData.Designer.cs
@@ -48,15 +48,12 @@
System.Windows.Forms.Label repairTimeLabel;
System.Windows.Forms.Label label2;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEboardData));
- this.bs = new System.Windows.Forms.BindingSource(this.components);
- this.dsPRJ = new FPJ0000.dsPRJ();
- this.sdateTextBox = new System.Windows.Forms.TextBox();
- this.edateTextBox = new System.Windows.Forms.TextBox();
+ this.tbSdate = new System.Windows.Forms.TextBox();
+ this.tbEdate = new System.Windows.Forms.TextBox();
this.tbCostRepair = new System.Windows.Forms.TextBox();
this.tbCostOutSource = new System.Windows.Forms.TextBox();
this.tbCostReduct = new System.Windows.Forms.TextBox();
this.tbQty = new System.Windows.Forms.TextBox();
- this.remark_reqTextBox = new System.Windows.Forms.TextBox();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -91,8 +88,11 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.arPanel2 = new arCtl.arPanel();
- this.textBox6 = new System.Windows.Forms.TextBox();
this.arLabel7 = new arCtl.arLabel();
+ this.richTextBoxEx1 = new RichTextBoxEx.RichTextBoxEx();
+ this.richTextBoxEx2 = new RichTextBoxEx.RichTextBoxEx();
+ this.bs = new System.Windows.Forms.BindingSource(this.components);
+ this.dsPRJ = new FPJ0000.dsPRJ();
this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter();
this.tableAdapterManager = new FPJ0000.dsPRJTableAdapters.TableAdapterManager();
costoLabel = new System.Windows.Forms.Label();
@@ -113,8 +113,6 @@
분류Label = new System.Windows.Forms.Label();
repairTimeLabel = new System.Windows.Forms.Label();
label2 = new System.Windows.Forms.Label();
- ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
this.panel1.SuspendLayout();
@@ -122,13 +120,15 @@
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.arPanel2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).BeginInit();
this.SuspendLayout();
//
// costoLabel
//
costoLabel.AutoSize = true;
costoLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64)))));
- costoLabel.Location = new System.Drawing.Point(280, 191);
+ costoLabel.Location = new System.Drawing.Point(274, 232);
costoLabel.Name = "costoLabel";
costoLabel.Size = new System.Drawing.Size(80, 12);
costoLabel.TabIndex = 34;
@@ -138,7 +138,7 @@
//
costnLabel.AutoSize = true;
costnLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64)))));
- costnLabel.Location = new System.Drawing.Point(253, 154);
+ costnLabel.Location = new System.Drawing.Point(247, 195);
costnLabel.Name = "costnLabel";
costnLabel.Size = new System.Drawing.Size(107, 12);
costnLabel.TabIndex = 32;
@@ -148,7 +148,7 @@
//
costeLabel.AutoSize = true;
costeLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64)))));
- costeLabel.Location = new System.Drawing.Point(230, 232);
+ costeLabel.Location = new System.Drawing.Point(224, 273);
costeLabel.Name = "costeLabel";
costeLabel.Size = new System.Drawing.Size(130, 12);
costeLabel.TabIndex = 36;
@@ -158,7 +158,7 @@
//
cntLabel.AutoSize = true;
cntLabel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64)))));
- cntLabel.Location = new System.Drawing.Point(331, 74);
+ cntLabel.Location = new System.Drawing.Point(325, 115);
cntLabel.Name = "cntLabel";
cntLabel.Size = new System.Drawing.Size(29, 12);
cntLabel.TabIndex = 28;
@@ -168,7 +168,7 @@
//
label1.AutoSize = true;
label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(64)))));
- label1.Location = new System.Drawing.Point(259, 112);
+ label1.Location = new System.Drawing.Point(253, 153);
label1.Name = "label1";
label1.Size = new System.Drawing.Size(101, 12);
label1.TabIndex = 30;
@@ -177,7 +177,7 @@
// uidLabel
//
uidLabel.AutoSize = true;
- uidLabel.Location = new System.Drawing.Point(319, 346);
+ uidLabel.Location = new System.Drawing.Point(313, 387);
uidLabel.Name = "uidLabel";
uidLabel.Size = new System.Drawing.Size(41, 12);
uidLabel.TabIndex = 42;
@@ -240,7 +240,7 @@
// sNLabel
//
sNLabel.AutoSize = true;
- sNLabel.Location = new System.Drawing.Point(334, 32);
+ sNLabel.Location = new System.Drawing.Point(328, 73);
sNLabel.Name = "sNLabel";
sNLabel.Size = new System.Drawing.Size(26, 12);
sNLabel.TabIndex = 26;
@@ -249,7 +249,7 @@
// 외주업체Label
//
외주업체Label.AutoSize = true;
- 외주업체Label.Location = new System.Drawing.Point(303, 269);
+ 외주업체Label.Location = new System.Drawing.Point(297, 310);
외주업체Label.Name = "외주업체Label";
외주업체Label.Size = new System.Drawing.Size(57, 12);
외주업체Label.TabIndex = 38;
@@ -276,7 +276,7 @@
// repairTimeLabel
//
repairTimeLabel.AutoSize = true;
- repairTimeLabel.Location = new System.Drawing.Point(282, 308);
+ repairTimeLabel.Location = new System.Drawing.Point(276, 349);
repairTimeLabel.Name = "repairTimeLabel";
repairTimeLabel.Size = new System.Drawing.Size(78, 12);
repairTimeLabel.TabIndex = 40;
@@ -285,44 +285,31 @@
// label2
//
label2.AutoSize = true;
- label2.Location = new System.Drawing.Point(30, 423);
+ label2.Location = new System.Drawing.Point(301, 35);
label2.Name = "label2";
label2.Size = new System.Drawing.Size(53, 12);
label2.TabIndex = 24;
label2.Text = "보드규격";
//
- // bs
+ // tbSdate
//
- this.bs.DataMember = "EETGW_JobReport_EBoard";
- this.bs.DataSource = this.dsPRJ;
- this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
+ this.tbSdate.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+ this.tbSdate.Location = new System.Drawing.Point(89, 69);
+ this.tbSdate.Name = "tbSdate";
+ this.tbSdate.Size = new System.Drawing.Size(148, 21);
+ this.tbSdate.TabIndex = 3;
//
- // dsPRJ
+ // tbEdate
//
- this.dsPRJ.DataSetName = "dsPRJ";
- this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
- //
- // sdateTextBox
- //
- this.sdateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "pdate", true));
- this.sdateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
- this.sdateTextBox.Location = new System.Drawing.Point(89, 69);
- this.sdateTextBox.Name = "sdateTextBox";
- this.sdateTextBox.Size = new System.Drawing.Size(148, 21);
- this.sdateTextBox.TabIndex = 3;
- //
- // edateTextBox
- //
- this.edateTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "수리완료일", true));
- this.edateTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
- this.edateTextBox.Location = new System.Drawing.Point(89, 109);
- this.edateTextBox.Name = "edateTextBox";
- this.edateTextBox.Size = new System.Drawing.Size(148, 21);
- this.edateTextBox.TabIndex = 5;
+ this.tbEdate.ImeMode = System.Windows.Forms.ImeMode.Hangul;
+ this.tbEdate.Location = new System.Drawing.Point(89, 109);
+ this.tbEdate.Name = "tbEdate";
+ this.tbEdate.Size = new System.Drawing.Size(148, 21);
+ this.tbEdate.TabIndex = 5;
//
// tbCostRepair
//
- this.tbCostRepair.Location = new System.Drawing.Point(364, 186);
+ this.tbCostRepair.Location = new System.Drawing.Point(358, 227);
this.tbCostRepair.Name = "tbCostRepair";
this.tbCostRepair.Size = new System.Drawing.Size(176, 21);
this.tbCostRepair.TabIndex = 35;
@@ -331,7 +318,7 @@
//
// tbCostOutSource
//
- this.tbCostOutSource.Location = new System.Drawing.Point(364, 150);
+ this.tbCostOutSource.Location = new System.Drawing.Point(358, 191);
this.tbCostOutSource.Name = "tbCostOutSource";
this.tbCostOutSource.Size = new System.Drawing.Size(176, 21);
this.tbCostOutSource.TabIndex = 33;
@@ -341,7 +328,7 @@
// tbCostReduct
//
this.tbCostReduct.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
- this.tbCostReduct.Location = new System.Drawing.Point(364, 228);
+ this.tbCostReduct.Location = new System.Drawing.Point(358, 269);
this.tbCostReduct.Name = "tbCostReduct";
this.tbCostReduct.Size = new System.Drawing.Size(176, 21);
this.tbCostReduct.TabIndex = 37;
@@ -349,26 +336,13 @@
//
// tbQty
//
- this.tbQty.Location = new System.Drawing.Point(364, 69);
+ this.tbQty.Location = new System.Drawing.Point(358, 110);
this.tbQty.Name = "tbQty";
this.tbQty.Size = new System.Drawing.Size(176, 21);
this.tbQty.TabIndex = 29;
this.tbQty.TextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.tbQty.TextChanged += new System.EventHandler(this.tbQty_TextChanged);
//
- // remark_reqTextBox
- //
- this.remark_reqTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.remark_reqTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "원인", true));
- this.remark_reqTextBox.Dock = System.Windows.Forms.DockStyle.Fill;
- this.remark_reqTextBox.ImeMode = System.Windows.Forms.ImeMode.Hangul;
- this.remark_reqTextBox.Location = new System.Drawing.Point(1, 24);
- 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, 215);
- this.remark_reqTextBox.TabIndex = 0;
- //
// bn
//
this.bn.AddNewItem = null;
@@ -387,7 +361,7 @@
this.bindingNavigatorMoveLastItem,
this.bindingNavigatorSeparator2,
this.btSave});
- this.bn.Location = new System.Drawing.Point(0, 486);
+ this.bn.Location = new System.Drawing.Point(0, 696);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
this.bn.MoveNextItem = this.bindingNavigatorMoveNextItem;
@@ -514,15 +488,15 @@
this.panel1.Controls.Add(cntLabel);
this.panel1.Controls.Add(this.linkLabel2);
this.panel1.Controls.Add(costeLabel);
- this.panel1.Controls.Add(this.edateTextBox);
+ this.panel1.Controls.Add(this.tbEdate);
this.panel1.Controls.Add(this.tbCostOutSource);
- this.panel1.Controls.Add(this.sdateTextBox);
+ this.panel1.Controls.Add(this.tbSdate);
this.panel1.Controls.Add(costnLabel);
this.panel1.Controls.Add(costoLabel);
this.panel1.Controls.Add(this.tbCostRepair);
this.panel1.Location = new System.Drawing.Point(6, 7);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(547, 453);
+ this.panel1.Size = new System.Drawing.Size(547, 411);
this.panel1.TabIndex = 86;
this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
//
@@ -533,15 +507,15 @@
this.cmbBoardVender.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "BoardVender", true));
this.cmbBoardVender.Enabled = false;
this.cmbBoardVender.FormattingEnabled = true;
- this.cmbBoardVender.Location = new System.Drawing.Point(89, 422);
+ this.cmbBoardVender.Location = new System.Drawing.Point(358, 30);
this.cmbBoardVender.Name = "cmbBoardVender";
- this.cmbBoardVender.Size = new System.Drawing.Size(148, 20);
+ this.cmbBoardVender.Size = new System.Drawing.Size(176, 20);
this.cmbBoardVender.TabIndex = 25;
//
// repairTimeTextBox
//
this.repairTimeTextBox.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "RepairTime", true));
- this.repairTimeTextBox.Location = new System.Drawing.Point(364, 305);
+ this.repairTimeTextBox.Location = new System.Drawing.Point(358, 346);
this.repairTimeTextBox.Name = "repairTimeTextBox";
this.repairTimeTextBox.Size = new System.Drawing.Size(176, 21);
this.repairTimeTextBox.TabIndex = 41;
@@ -577,7 +551,7 @@
this.cmb외주업체.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "외주업체", true));
this.cmb외주업체.Enabled = false;
this.cmb외주업체.FormattingEnabled = true;
- this.cmb외주업체.Location = new System.Drawing.Point(364, 266);
+ this.cmb외주업체.Location = new System.Drawing.Point(358, 307);
this.cmb외주업체.Name = "cmb외주업체";
this.cmb외주업체.Size = new System.Drawing.Size(176, 20);
this.cmb외주업체.TabIndex = 39;
@@ -589,7 +563,7 @@
this.cmbSN.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "SN", true));
this.cmbSN.Enabled = false;
this.cmbSN.FormattingEnabled = true;
- this.cmbSN.Location = new System.Drawing.Point(364, 29);
+ this.cmbSN.Location = new System.Drawing.Point(358, 70);
this.cmbSN.Name = "cmbSN";
this.cmbSN.Size = new System.Drawing.Size(176, 20);
this.cmbSN.TabIndex = 27;
@@ -673,14 +647,14 @@
this.cmbUID.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "uid", true));
this.cmbUID.Enabled = false;
this.cmbUID.FormattingEnabled = true;
- this.cmbUID.Location = new System.Drawing.Point(364, 342);
+ this.cmbUID.Location = new System.Drawing.Point(358, 383);
this.cmbUID.Name = "cmbUID";
this.cmbUID.Size = new System.Drawing.Size(176, 20);
this.cmbUID.TabIndex = 43;
//
// tbCostNew
//
- this.tbCostNew.Location = new System.Drawing.Point(364, 108);
+ this.tbCostNew.Location = new System.Drawing.Point(358, 149);
this.tbCostNew.Name = "tbCostNew";
this.tbCostNew.Size = new System.Drawing.Size(176, 21);
this.tbCostNew.TabIndex = 31;
@@ -790,7 +764,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(545, 23);
this.arLabel6.TabIndex = 86;
this.arLabel6.Text = "원인 / 증상 / 요청";
this.arLabel6.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -805,13 +779,13 @@
this.arPanel1.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
this.arPanel1.BorderSize = new System.Windows.Forms.Padding(1);
- this.arPanel1.Controls.Add(this.remark_reqTextBox);
+ this.arPanel1.Controls.Add(this.richTextBoxEx1);
this.arPanel1.Controls.Add(this.arLabel6);
this.arPanel1.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.arPanel1.ForeColor = System.Drawing.Color.Khaki;
this.arPanel1.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arPanel1.GradientRepeatBG = true;
- this.arPanel1.Location = new System.Drawing.Point(559, 6);
+ this.arPanel1.Location = new System.Drawing.Point(6, 423);
this.arPanel1.Name = "arPanel1";
this.arPanel1.Padding = new System.Windows.Forms.Padding(1);
this.arPanel1.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
@@ -822,7 +796,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, 240);
+ this.arPanel1.Size = new System.Drawing.Size(547, 240);
this.arPanel1.TabIndex = 88;
this.arPanel1.Text = "arPanel1";
this.arPanel1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -836,7 +810,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, 486);
+ this.tabControl1.Size = new System.Drawing.Size(1026, 696);
this.tabControl1.TabIndex = 0;
//
// tabPage1
@@ -847,7 +821,7 @@
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, 460);
+ this.tabPage1.Size = new System.Drawing.Size(1018, 670);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "일반사항";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -861,13 +835,13 @@
this.arPanel2.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(230)))), ((int)(((byte)(230)))), ((int)(((byte)(230)))));
this.arPanel2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
this.arPanel2.BorderSize = new System.Windows.Forms.Padding(1);
- this.arPanel2.Controls.Add(this.textBox6);
+ this.arPanel2.Controls.Add(this.richTextBoxEx2);
this.arPanel2.Controls.Add(this.arLabel7);
this.arPanel2.Font = new System.Drawing.Font("맑은 고딕", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.arPanel2.ForeColor = System.Drawing.Color.Khaki;
this.arPanel2.GradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical;
this.arPanel2.GradientRepeatBG = true;
- this.arPanel2.Location = new System.Drawing.Point(559, 252);
+ this.arPanel2.Location = new System.Drawing.Point(557, 7);
this.arPanel2.Name = "arPanel2";
this.arPanel2.Padding = new System.Windows.Forms.Padding(1);
this.arPanel2.ProgressColor1 = System.Drawing.Color.LightSkyBlue;
@@ -878,26 +852,13 @@
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(455, 202);
+ this.arPanel2.Size = new System.Drawing.Size(455, 656);
this.arPanel2.TabIndex = 89;
this.arPanel2.Text = "arPanel2";
this.arPanel2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.arPanel2.TextShadow = false;
this.arPanel2.UseProgressBar = false;
//
- // textBox6
- //
- this.textBox6.BorderStyle = System.Windows.Forms.BorderStyle.None;
- this.textBox6.DataBindings.Add(new System.Windows.Forms.Binding("Text", this.bs, "결과", true));
- this.textBox6.Dock = System.Windows.Forms.DockStyle.Fill;
- this.textBox6.ImeMode = System.Windows.Forms.ImeMode.Hangul;
- this.textBox6.Location = new System.Drawing.Point(1, 24);
- this.textBox6.Multiline = true;
- this.textBox6.Name = "textBox6";
- this.textBox6.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.textBox6.Size = new System.Drawing.Size(453, 177);
- this.textBox6.TabIndex = 0;
- //
// arLabel7
//
this.arLabel7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(229)))), ((int)(((byte)(231)))));
@@ -942,6 +903,62 @@
this.arLabel7.TextShadow = true;
this.arLabel7.TextVisible = true;
//
+ // richTextBoxEx1
+ //
+ this.richTextBoxEx1.AllowBullets = true;
+ this.richTextBoxEx1.AllowDefaultInsertText = true;
+ this.richTextBoxEx1.AllowDefaultSmartText = true;
+ this.richTextBoxEx1.AllowHyphenation = true;
+ this.richTextBoxEx1.AllowPictures = true;
+ this.richTextBoxEx1.AllowSpellCheck = true;
+ this.richTextBoxEx1.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
+ this.richTextBoxEx1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(224)))), ((int)(((byte)(192)))));
+ this.richTextBoxEx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.richTextBoxEx1.FilePath = "";
+ this.richTextBoxEx1.Location = new System.Drawing.Point(1, 24);
+ this.richTextBoxEx1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.richTextBoxEx1.Name = "richTextBoxEx1";
+ this.richTextBoxEx1.Rtf = "{\\rtf1\\ansi\\ansicpg1252\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\" +
+ "*\\generator Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBox" +
+ "Ex1\\par\r\n}\r\n";
+ this.richTextBoxEx1.SetColorWithFont = true;
+ this.richTextBoxEx1.ShowToolStrip = true;
+ this.richTextBoxEx1.Size = new System.Drawing.Size(545, 215);
+ this.richTextBoxEx1.TabIndex = 87;
+ //
+ // richTextBoxEx2
+ //
+ this.richTextBoxEx2.AllowBullets = true;
+ this.richTextBoxEx2.AllowDefaultInsertText = true;
+ this.richTextBoxEx2.AllowDefaultSmartText = true;
+ this.richTextBoxEx2.AllowHyphenation = true;
+ this.richTextBoxEx2.AllowPictures = true;
+ this.richTextBoxEx2.AllowSpellCheck = true;
+ this.richTextBoxEx2.AutoValidate = System.Windows.Forms.AutoValidate.EnablePreventFocusChange;
+ this.richTextBoxEx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.richTextBoxEx2.FilePath = "";
+ this.richTextBoxEx2.Location = new System.Drawing.Point(1, 24);
+ this.richTextBoxEx2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
+ this.richTextBoxEx2.Name = "richTextBoxEx2";
+ this.richTextBoxEx2.Rtf = "{\\rtf1\\ansi\\deff0\\nouicompat{\\fonttbl{\\f0\\fnil\\fcharset0 Arial;}}\r\n{\\*\\generator " +
+ "Riched20 10.0.18362}\\viewkind4\\uc1 \r\n\\pard\\fs20\\lang1042 richTextBoxEx2\\par\r\n}\r\n" +
+ "";
+ this.richTextBoxEx2.SetColorWithFont = true;
+ this.richTextBoxEx2.ShowToolStrip = true;
+ this.richTextBoxEx2.Size = new System.Drawing.Size(453, 631);
+ this.richTextBoxEx2.TabIndex = 87;
+ //
+ // bs
+ //
+ this.bs.DataMember = "EETGW_JobReport_EBoard";
+ this.bs.DataSource = this.dsPRJ;
+ this.bs.CurrentChanged += new System.EventHandler(this.bs_CurrentChanged);
+ //
+ // dsPRJ
+ //
+ this.dsPRJ.DataSetName = "dsPRJ";
+ this.dsPRJ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
+ //
// ta
//
this.ta.ClearBeforeFill = true;
@@ -970,26 +987,24 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1026, 511);
+ this.ClientSize = new System.Drawing.Size(1026, 721);
this.Controls.Add(this.tabControl1);
this.Controls.Add(this.bn);
this.MinimizeBox = false;
this.Name = "fEboardData";
this.Text = "전자실 업무 내역 편집";
this.Load += new System.EventHandler(this.fProjectData_Load);
- ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
this.bn.ResumeLayout(false);
this.bn.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.arPanel1.ResumeLayout(false);
- this.arPanel1.PerformLayout();
this.tabControl1.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
this.arPanel2.ResumeLayout(false);
- this.arPanel2.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.dsPRJ)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -999,13 +1014,12 @@
private dsPRJ dsPRJ;
private System.Windows.Forms.BindingSource bs;
- private System.Windows.Forms.TextBox sdateTextBox;
- private System.Windows.Forms.TextBox edateTextBox;
+ private System.Windows.Forms.TextBox tbSdate;
+ private System.Windows.Forms.TextBox tbEdate;
private System.Windows.Forms.TextBox tbCostRepair;
private System.Windows.Forms.TextBox tbCostOutSource;
private System.Windows.Forms.TextBox tbCostReduct;
private System.Windows.Forms.TextBox tbQty;
- private System.Windows.Forms.TextBox remark_reqTextBox;
private System.Windows.Forms.BindingNavigator bn;
private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem;
private System.Windows.Forms.ToolStripButton bindingNavigatorMoveFirstItem;
@@ -1026,7 +1040,6 @@
private System.Windows.Forms.TabControl tabControl1;
private System.Windows.Forms.TabPage tabPage1;
private arCtl.arPanel arPanel2;
- private System.Windows.Forms.TextBox textBox6;
private arCtl.arLabel arLabel7;
private dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter ta;
private System.Windows.Forms.TextBox tbCostNew;
@@ -1044,5 +1057,7 @@
private System.Windows.Forms.ComboBox cmb분류;
private System.Windows.Forms.TextBox repairTimeTextBox;
private System.Windows.Forms.ComboBox cmbBoardVender;
+ private RichTextBoxEx.RichTextBoxEx richTextBoxEx1;
+ private RichTextBoxEx.RichTextBoxEx richTextBoxEx2;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/EBoard/fEboardData.cs b/SubProject/FPJ0000/EBoard/fEboardData.cs
index 8883e75..923a481 100644
--- a/SubProject/FPJ0000/EBoard/fEboardData.cs
+++ b/SubProject/FPJ0000/EBoard/fEboardData.cs
@@ -105,7 +105,45 @@ namespace FPJ0000
}));
+ ///원인
+ if (string.IsNullOrEmpty(dr.원인2))
+ {
+ this.richTextBoxEx1.Text = dr.원인;
+ }
+ else
+ {
+ try
+ {
+ this.richTextBoxEx1.Rtf = dr.원인2;
+ }
+ catch (Exception ex)
+ {
+ this.richTextBoxEx1.Text = dr.원인;
+ }
+ }
+ ///결과
+ if (string.IsNullOrEmpty(dr.결과2))
+ {
+ this.richTextBoxEx2.Text = dr.결과;
+ }
+ else
+ {
+ try
+ {
+ this.richTextBoxEx2.Rtf = dr.결과2;
+ }
+ catch (Exception ex)
+ {
+ this.richTextBoxEx2.Text = dr.결과;
+ }
+ }
+
+
+
+
+ this.tbSdate.Text = dr.pdate;
+ this.tbEdate.Text = dr.수리완료일;
this.tbQty.Text = dr.QTY.ToString();
this.tbCostNew.Text = dr.NPrice.ToString();
this.tbCostOutSource.Text = dr.OPrice.ToString();
@@ -122,7 +160,6 @@ namespace FPJ0000
this.Validate();
this.bs.EndEdit();
-
var s1 = tbCostOutSource.Text.Trim();
var s2 = tbCostRepair.Text.Trim();
float v1;
@@ -145,12 +182,38 @@ namespace FPJ0000
tbCostRepair.Focus();
return;
}
- if(remark_reqTextBox.Text.isEmpty())
+
+
+ if(tbSdate.Text.isEmpty()==false)
{
- FCOMMON.Util.MsgE("요청 사항을 입력하세요");
- remark_reqTextBox.Focus();
- return;
+ if(tbSdate.Text.isDate()==false)
+ {
+ FCOMMON.Util.MsgE("날짜형태로 입력하세요\n\n예) 2000-01-01");
+ tbSdate.SelectAll();
+ tbSdate.Focus();
+ return;
+ }
}
+ if (tbEdate.Text.isEmpty() == false)
+ {
+ if (tbEdate.Text.isDate() == false)
+ {
+ FCOMMON.Util.MsgE("날짜형태로 입력하세요\n\n예) 2000-01-01");
+ tbEdate.SelectAll();
+ tbEdate.Focus();
+ return;
+ }
+ }
+
+ this.dr.원인 = richTextBoxEx1.Text;
+ this.dr.원인2 = richTextBoxEx1.Rtf;
+
+ this.dr.결과 = richTextBoxEx2.Text;
+ this.dr.결과2 = richTextBoxEx2.Rtf;
+
+
+ this.dr.pdate = tbSdate.Text.Trim();
+ this.dr.수리완료일 = tbEdate.Text.Trim();
this.dr.QTY = tbQty.Text.ToInt();
this.dr.NPrice = tbCostNew.Text.ToDecimal();
this.dr.OPrice = tbCostOutSource.Text.ToDecimal();
@@ -191,14 +254,14 @@ namespace FPJ0000
}
private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- SelectDate(sdateTextBox);
+ SelectDate(tbSdate);
}
private void linkLabel4_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- SelectDate(edateTextBox);
+ SelectDate(tbEdate);
//if (edateTextBox.Text.isEmpty() == false)
// cmbStatus.Text = "완료";
}
diff --git a/SubProject/FPJ0000/EBoard/fEboardData.resx b/SubProject/FPJ0000/EBoard/fEboardData.resx
index 53eac45..117f376 100644
--- a/SubProject/FPJ0000/EBoard/fEboardData.resx
+++ b/SubProject/FPJ0000/EBoard/fEboardData.resx
@@ -171,18 +171,15 @@
False
+
+ 164, 17
+
100, 17
17, 17
-
- 17, 17
-
-
- 164, 17
-
@@ -239,6 +236,9 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+
+ 17, 17
+
230, 17
diff --git a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs
index 682088d..07c26e0 100644
--- a/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs
+++ b/SubProject/FPJ0000/EBoard/fEboardList.Designer.cs
@@ -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 numberCellType57 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType113 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType114 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType115 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType116 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType117 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType118 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType119 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType120 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType121 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType122 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType123 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType124 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType125 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType58 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType59 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType60 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType61 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType62 = new FarPoint.Win.Spread.CellType.NumberCellType();
- FarPoint.Win.Spread.CellType.TextCellType textCellType126 = new FarPoint.Win.Spread.CellType.TextCellType();
- FarPoint.Win.Spread.CellType.NumberCellType numberCellType63 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType15 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ 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.TextCellType textCellType32 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType33 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType34 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType35 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType36 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType37 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType38 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType39 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType40 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType41 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType16 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType17 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType18 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType19 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType20 = new FarPoint.Win.Spread.CellType.NumberCellType();
+ FarPoint.Win.Spread.CellType.TextCellType textCellType42 = new FarPoint.Win.Spread.CellType.TextCellType();
+ FarPoint.Win.Spread.CellType.NumberCellType numberCellType21 = 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();
@@ -64,6 +64,7 @@
this.bindingNavigatorMoveLastItem = new System.Windows.Forms.ToolStripButton();
this.bindingNavigatorSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.btAdd = new System.Windows.Forms.ToolStripButton();
+ this.btCopy = new System.Windows.Forms.ToolStripButton();
this.btEdit = new System.Windows.Forms.ToolStripButton();
this.btDel = new System.Windows.Forms.ToolStripButton();
this.btSave = new System.Windows.Forms.ToolStripButton();
@@ -81,11 +82,13 @@
this.loadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
this.편집ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.편집ToolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
+ this.삭제ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator();
this.엑셀파일로저장ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.fpSpread1 = new FarPoint.Win.Spread.FpSpread();
+ this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.cmbYearS = new System.Windows.Forms.ToolStripComboBox();
@@ -122,22 +125,20 @@
this.btSearch = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button();
this.ta = new FPJ0000.dsPRJTableAdapters.EETGW_JobReport_EBoardTableAdapter();
- this.fpSpread1_Sheet1 = new FarPoint.Win.Spread.SheetView();
- this.btCopy = new System.Windows.Forms.ToolStripButton();
- this.복사ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.toolStripButton2 = new System.Windows.Forms.ToolStripButton();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).BeginInit();
this.cm.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
this.toolStrip1.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
this.panel4.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.panel3.SuspendLayout();
this.panel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).BeginInit();
this.SuspendLayout();
//
// bn
@@ -167,7 +168,8 @@
this.tbFind,
this.btFind,
this.toolStripSeparator6,
- this.toolStripButton1});
+ this.toolStripButton1,
+ this.toolStripButton2});
this.bn.Location = new System.Drawing.Point(0, 639);
this.bn.MoveFirstItem = this.bindingNavigatorMoveFirstItem;
this.bn.MoveLastItem = this.bindingNavigatorMoveLastItem;
@@ -268,6 +270,15 @@
this.btAdd.Text = "추가(&A)";
this.btAdd.Click += new System.EventHandler(this.bindingNavigatorAddNewItem_Click);
//
+ // btCopy
+ //
+ this.btCopy.Image = global::FPJ0000.Properties.Resources.copy;
+ this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.btCopy.Name = "btCopy";
+ this.btCopy.Size = new System.Drawing.Size(67, 22);
+ this.btCopy.Text = "복사(&C)";
+ this.btCopy.Click += new System.EventHandler(this.btCopy_Click);
+ //
// btEdit
//
this.btEdit.Image = ((System.Drawing.Image)(resources.GetObject("btEdit.Image")));
@@ -333,8 +344,8 @@
this.toolStripButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton1.Image")));
this.toolStripButton1.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton1.Name = "toolStripButton1";
- this.toolStripButton1.Size = new System.Drawing.Size(99, 22);
- this.toolStripButton1.Text = "자료가져오기";
+ this.toolStripButton1.Size = new System.Drawing.Size(75, 22);
+ this.toolStripButton1.Text = "가져오기";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click);
//
// cm
@@ -350,7 +361,7 @@
this.toolStripMenuItem1,
this.엑셀파일로저장ToolStripMenuItem});
this.cm.Name = "contextMenuStrip1";
- this.cm.Size = new System.Drawing.Size(243, 254);
+ this.cm.Size = new System.Drawing.Size(243, 232);
//
// columnSizeToolStripMenuItem
//
@@ -407,12 +418,12 @@
this.편집ToolStripMenuItem.Text = "추가";
this.편집ToolStripMenuItem.Click += new System.EventHandler(this.편집ToolStripMenuItem_Click);
//
- // 삭제ToolStripMenuItem
+ // 복사ToolStripMenuItem
//
- this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem";
- this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(242, 36);
- this.삭제ToolStripMenuItem.Text = "삭제";
- this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click);
+ this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem";
+ this.복사ToolStripMenuItem.Size = new System.Drawing.Size(242, 36);
+ this.복사ToolStripMenuItem.Text = "복사";
+ this.복사ToolStripMenuItem.Click += new System.EventHandler(this.복사ToolStripMenuItem_Click);
//
// 편집ToolStripMenuItem1
//
@@ -421,6 +432,13 @@
this.편집ToolStripMenuItem1.Text = "편집";
this.편집ToolStripMenuItem1.Click += new System.EventHandler(this.편집ToolStripMenuItem1_Click);
//
+ // 삭제ToolStripMenuItem
+ //
+ this.삭제ToolStripMenuItem.Name = "삭제ToolStripMenuItem";
+ this.삭제ToolStripMenuItem.Size = new System.Drawing.Size(242, 36);
+ this.삭제ToolStripMenuItem.Text = "삭제";
+ this.삭제ToolStripMenuItem.Click += new System.EventHandler(this.삭제ToolStripMenuItem_Click);
+ //
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
@@ -451,6 +469,166 @@
this.fpSpread1.TabIndex = 2;
this.fpSpread1.CellClick += new FarPoint.Win.Spread.CellClickEventHandler(this.fpSpread1_CellClick);
//
+ // fpSpread1_Sheet1
+ //
+ this.fpSpread1_Sheet1.Reset();
+ this.fpSpread1_Sheet1.SheetName = "Sheet1";
+ // Formulas and custom names must be loaded with R1C1 reference style
+ this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
+ this.fpSpread1_Sheet1.ColumnCount = 21;
+ this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
+ this.fpSpread1_Sheet1.ActiveRowIndex = -1;
+ this.fpSpread1_Sheet1.AutoGenerateColumns = false;
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Engineer";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "SITE";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "입고일";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "완료일";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Status";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Line";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Division";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Process";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Equipment";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Board Name";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "보드규격";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "S/N";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Qty";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "New Price($K)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "OutSourcing\r\nPrice($K)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).StyleName = " ";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Repair Cost\r\n($K)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Cost Reduction\r\n($K)";
+ this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "외주업체";
+ 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)))));
+ numberCellType15.DecimalPlaces = 0;
+ numberCellType15.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType15.MaximumValue = 2147483647D;
+ numberCellType15.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType15;
+ this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
+ this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
+ this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
+ this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX";
+ 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 = textCellType29;
+ 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 = textCellType30;
+ 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 = textCellType31;
+ this.fpSpread1_Sheet1.Columns.Get(3).DataField = "요청자";
+ this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청";
+ this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType32;
+ this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pdate";
+ this.fpSpread1_Sheet1.Columns.Get(4).Label = "입고일";
+ this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType33;
+ 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 = textCellType34;
+ 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 = textCellType35;
+ this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Line";
+ this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
+ this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType36;
+ 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 = textCellType37;
+ 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 = textCellType38;
+ 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 = textCellType39;
+ this.fpSpread1_Sheet1.Columns.Get(11).DataField = "BoardName";
+ this.fpSpread1_Sheet1.Columns.Get(11).Label = "Board Name";
+ this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType40;
+ this.fpSpread1_Sheet1.Columns.Get(12).DataField = "BoardVender";
+ this.fpSpread1_Sheet1.Columns.Get(12).Label = "보드규격";
+ this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType41;
+ 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;
+ numberCellType16.DecimalPlaces = 0;
+ numberCellType16.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
+ numberCellType16.MaximumValue = 2147483647D;
+ numberCellType16.MinimumValue = -2147483648D;
+ this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType16;
+ 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;
+ numberCellType17.MaximumValue = 999999999999999D;
+ numberCellType17.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType17;
+ 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;
+ numberCellType18.MaximumValue = 999999999999999D;
+ numberCellType18.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType18;
+ 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;
+ numberCellType19.MaximumValue = 999999999999999D;
+ numberCellType19.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType19;
+ 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)))));
+ numberCellType20.MaximumValue = 999999999999999D;
+ numberCellType20.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType20;
+ 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]";
+ this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
+ this.fpSpread1_Sheet1.Columns.Get(18).Label = "Cost Reduction\r\n($K)";
+ this.fpSpread1_Sheet1.Columns.Get(18).Tag = "costreduction";
+ 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 = textCellType42;
+ this.fpSpread1_Sheet1.Columns.Get(19).DataField = "외주업체";
+ numberCellType21.MaximumValue = 999999999999999D;
+ numberCellType21.MinimumValue = -999999999999999D;
+ this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType21;
+ 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)";
+ this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
+ this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
+ this.fpSpread1_Sheet1.DataSource = this.bs;
+ this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
+ this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
+ //
// toolStrip1
//
this.toolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden;
@@ -862,181 +1040,14 @@
//
this.ta.ClearBeforeFill = true;
//
- // fpSpread1_Sheet1
+ // toolStripButton2
//
- this.fpSpread1_Sheet1.Reset();
- this.fpSpread1_Sheet1.SheetName = "Sheet1";
- // Formulas and custom names must be loaded with R1C1 reference style
- this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.R1C1;
- this.fpSpread1_Sheet1.ColumnCount = 21;
- this.fpSpread1_Sheet1.ActiveColumnIndex = -1;
- this.fpSpread1_Sheet1.ActiveRowIndex = -1;
- this.fpSpread1_Sheet1.AutoGenerateColumns = false;
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 0).Value = "IDX";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 1).Value = "Engineer";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 2).Value = "SITE";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 3).Value = "요청";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 4).Value = "입고일";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 5).Value = "완료일";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 6).Value = "Status";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 7).Value = "Line";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 8).Value = "Division";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 9).Value = "Process";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 10).Value = "Equipment";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 11).Value = "Board Name";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 12).Value = "보드규격";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 13).Value = "S/N";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 14).Value = "Qty";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 15).Value = "New Price($K)";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 16).Value = "OutSourcing\r\nPrice($K)";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).StyleName = " ";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 17).Value = "Repair Cost\r\n($K)";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 18).Value = "Cost Reduction\r\n($K)";
- this.fpSpread1_Sheet1.ColumnHeader.Cells.Get(0, 19).Value = "외주업체";
- 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)))));
- numberCellType57.DecimalPlaces = 0;
- numberCellType57.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType57.MaximumValue = 2147483647D;
- numberCellType57.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(0).CellType = numberCellType57;
- this.fpSpread1_Sheet1.Columns.Get(0).DataField = "idx";
- this.fpSpread1_Sheet1.Columns.Get(0).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64)))));
- this.fpSpread1_Sheet1.Columns.Get(0).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Center;
- this.fpSpread1_Sheet1.Columns.Get(0).Label = "IDX";
- 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 = textCellType113;
- 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 = textCellType114;
- 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 = textCellType115;
- this.fpSpread1_Sheet1.Columns.Get(3).DataField = "요청자";
- this.fpSpread1_Sheet1.Columns.Get(3).Label = "요청";
- this.fpSpread1_Sheet1.Columns.Get(4).CellType = textCellType116;
- this.fpSpread1_Sheet1.Columns.Get(4).DataField = "pdate";
- this.fpSpread1_Sheet1.Columns.Get(4).Label = "입고일";
- this.fpSpread1_Sheet1.Columns.Get(5).CellType = textCellType117;
- 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 = textCellType118;
- 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 = textCellType119;
- this.fpSpread1_Sheet1.Columns.Get(7).DataField = "Line";
- this.fpSpread1_Sheet1.Columns.Get(8).AllowAutoFilter = true;
- this.fpSpread1_Sheet1.Columns.Get(8).CellType = textCellType120;
- 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 = textCellType121;
- 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 = textCellType122;
- 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 = textCellType123;
- this.fpSpread1_Sheet1.Columns.Get(11).DataField = "BoardName";
- this.fpSpread1_Sheet1.Columns.Get(11).Label = "Board Name";
- this.fpSpread1_Sheet1.Columns.Get(12).CellType = textCellType124;
- this.fpSpread1_Sheet1.Columns.Get(12).DataField = "BoardVender";
- this.fpSpread1_Sheet1.Columns.Get(12).Label = "보드규격";
- this.fpSpread1_Sheet1.Columns.Get(13).CellType = textCellType125;
- 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;
- numberCellType58.DecimalPlaces = 0;
- numberCellType58.LeadingZero = FarPoint.Win.Spread.CellType.LeadingZero.Yes;
- numberCellType58.MaximumValue = 2147483647D;
- numberCellType58.MinimumValue = -2147483648D;
- this.fpSpread1_Sheet1.Columns.Get(14).CellType = numberCellType58;
- 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;
- numberCellType59.MaximumValue = 999999999999999D;
- numberCellType59.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(15).CellType = numberCellType59;
- 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;
- numberCellType60.MaximumValue = 999999999999999D;
- numberCellType60.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(16).CellType = numberCellType60;
- 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;
- numberCellType61.MaximumValue = 999999999999999D;
- numberCellType61.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(17).CellType = numberCellType61;
- 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)))));
- numberCellType62.MaximumValue = 999999999999999D;
- numberCellType62.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(18).CellType = numberCellType62;
- 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]";
- this.fpSpread1_Sheet1.Columns.Get(18).HorizontalAlignment = FarPoint.Win.Spread.CellHorizontalAlignment.Right;
- this.fpSpread1_Sheet1.Columns.Get(18).Label = "Cost Reduction\r\n($K)";
- this.fpSpread1_Sheet1.Columns.Get(18).Tag = "costreduction";
- 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 = textCellType126;
- this.fpSpread1_Sheet1.Columns.Get(19).DataField = "외주업체";
- numberCellType63.MaximumValue = 999999999999999D;
- numberCellType63.MinimumValue = -999999999999999D;
- this.fpSpread1_Sheet1.Columns.Get(20).CellType = numberCellType63;
- 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)";
- this.fpSpread1_Sheet1.Columns.Get(20).VerticalAlignment = FarPoint.Win.Spread.CellVerticalAlignment.Center;
- this.fpSpread1_Sheet1.DataAutoSizeColumns = false;
- this.fpSpread1_Sheet1.DataSource = this.bs;
- this.fpSpread1_Sheet1.RowHeader.Columns.Default.Resizable = false;
- this.fpSpread1_Sheet1.ReferenceStyle = FarPoint.Win.Spread.Model.ReferenceStyle.A1;
- //
- // btCopy
- //
- this.btCopy.Image = global::FPJ0000.Properties.Resources.copy;
- this.btCopy.ImageTransparentColor = System.Drawing.Color.Magenta;
- this.btCopy.Name = "btCopy";
- this.btCopy.Size = new System.Drawing.Size(67, 22);
- this.btCopy.Text = "복사(&C)";
- this.btCopy.Click += new System.EventHandler(this.btCopy_Click);
- //
- // 복사ToolStripMenuItem
- //
- this.복사ToolStripMenuItem.Name = "복사ToolStripMenuItem";
- this.복사ToolStripMenuItem.Size = new System.Drawing.Size(242, 36);
- this.복사ToolStripMenuItem.Text = "복사";
- this.복사ToolStripMenuItem.Click += new System.EventHandler(this.복사ToolStripMenuItem_Click);
+ this.toolStripButton2.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton2.Image")));
+ this.toolStripButton2.ImageTransparentColor = System.Drawing.Color.Magenta;
+ this.toolStripButton2.Name = "toolStripButton2";
+ this.toolStripButton2.Size = new System.Drawing.Size(134, 22);
+ this.toolStripButton2.Text = "Performance Report";
+ this.toolStripButton2.Click += new System.EventHandler(this.toolStripButton2_Click_1);
//
// fEboardList
//
@@ -1057,6 +1068,7 @@
((System.ComponentModel.ISupportInitialize)(this.dsMSSQL)).EndInit();
this.cm.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.fpSpread1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.toolStrip1.ResumeLayout(false);
this.toolStrip1.PerformLayout();
this.tableLayoutPanel1.ResumeLayout(false);
@@ -1065,7 +1077,6 @@
this.panel3.ResumeLayout(false);
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.fpSpread1_Sheet1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1147,5 +1158,6 @@
private FarPoint.Win.Spread.SheetView fpSpread1_Sheet1;
private System.Windows.Forms.ToolStripButton btCopy;
private System.Windows.Forms.ToolStripMenuItem 복사ToolStripMenuItem;
+ private System.Windows.Forms.ToolStripButton toolStripButton2;
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/EBoard/fEboardList.cs b/SubProject/FPJ0000/EBoard/fEboardList.cs
index 28914c7..9b0cd8e 100644
--- a/SubProject/FPJ0000/EBoard/fEboardList.cs
+++ b/SubProject/FPJ0000/EBoard/fEboardList.cs
@@ -515,5 +515,11 @@ namespace FPJ0000
{
funcEdit();
}
+
+ private void toolStripButton2_Click_1(object sender, EventArgs e)
+ {
+ var f = new EBoard.fEBoardReport();
+ f.Show();
+ }
}
}
\ No newline at end of file
diff --git a/SubProject/FPJ0000/EBoard/fEboardList.resx b/SubProject/FPJ0000/EBoard/fEboardList.resx
index 1eaca15..338262d 100644
--- a/SubProject/FPJ0000/EBoard/fEboardList.resx
+++ b/SubProject/FPJ0000/EBoard/fEboardList.resx
@@ -209,6 +209,25 @@
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALxSURBVDhPhZPtS1NRHMf3Kv8G60Wvi9TKnlDoYalNjSzL
+ VEp8mlM0NdGVYVZMI1MXmuigIpKiFxXSg67p1JxzuuGMTLM0m48Jakvd09F77/x27t1wBkE/+HBenPP7
+ cH7fe66Ir/DrupSTVUZtTLXx96kqo4uuREDJryYSU9VHou4ahkPl+tqdcS+2CE2bK/J2j37RRn5Z7YSz
+ OlZhtfv4ZeMh+DpnQ+nbaUjrxpySXLWft9VT0RWGhRXnGtc3ycA0xcI0zcI4ycIwsQbd91VoRhxYZYHm
+ by6Uvp5C+v0x118SKnBRAQZmOHycYenKol+QrKF7fBVtI04qcGNgjoPpJ4Ny9TTE1zqfC80JSrHlfFXc
+ uqzhLNLrz6G+tRFlTUqIbwbiGEVSHoJwxQHUNNcIo9gJi/klJ8JLu1lBEF8tftU51IKWsUeoNxYJkuS6
+ KBQ9S0JeYyKkqtNIU6WheXAeLcN2vPu8gmWaU4SihwgCSa3EL7YynzOOduHpkAKVulxBktIQTZvPIOtB
+ JvTjDmGUjjEXtDSHJQeDiLJej4CvyIpuUvA4FeZxA1SmK7jTXogE5XGk1MXBPOmEmQbLB6z/4cnESgXh
+ ik2CIzduMgeLtyOpVoKBH30o78qGQl2AxHthaNS9wadZFmYabN8Eg17Kgo2B+JZXsFfuLwuWb0Pekwu4
+ 2BCJCzUnBEmBOgnypkx6kzDw+wPTHPr5T0yx0SAPlxg8gmC5/2ywfCs95I/gIn/EVoYh52Eq9CNalGuL
+ kf0yFdKGeJipwETfhpEKCONGiFznG+FoSQ+ZWyYYnOUEukd/4vLjLGTQRpkqEYVPLm3s8dA3h/35nT5B
+ 6FUdmbH6BP/DQUfYndnmExwq+OC0LDjW/3X4XxCGcweka+zedhpkVrtlfoXYLIsuNwWWBRfGvSzaGQE+
+ efqv8S/RzbndyzuS33/xtotE+7Jac4Kkre17ZFprkKyVbJDhITBD40GqIQFSzdKutPcdganqdJFIJPoD
+ 0NqjIcbQ72sAAAAASUVORK5CYII=
+
+
+
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
diff --git a/SubProject/FPJ0000/EBoardReport.xlsx b/SubProject/FPJ0000/EBoardReport.xlsx
new file mode 100644
index 0000000..f0b481d
Binary files /dev/null and b/SubProject/FPJ0000/EBoardReport.xlsx differ
diff --git a/SubProject/FPJ0000/FPJ0000.csproj b/SubProject/FPJ0000/FPJ0000.csproj
index 7926c77..e4ccd7e 100644
--- a/SubProject/FPJ0000/FPJ0000.csproj
+++ b/SubProject/FPJ0000/FPJ0000.csproj
@@ -158,6 +158,12 @@
fEBoardImport.cs
+
+ Form
+
+
+ fEBoardReport.cs
+
Model1.tt
@@ -429,6 +435,9 @@
fEBoardImport.cs
+
+ fEBoardReport.cs
+
fHistAddDay.cs
@@ -612,6 +621,9 @@
EntityModelCodeGenerator
Model1.Designer.cs
+
+ PreserveNewest
+
Model1.edmx
diff --git a/SubProject/FPJ0000/MethodExtentions.cs b/SubProject/FPJ0000/MethodExtentions.cs
index 5326ef7..f26861c 100644
--- a/SubProject/FPJ0000/MethodExtentions.cs
+++ b/SubProject/FPJ0000/MethodExtentions.cs
@@ -145,6 +145,12 @@ namespace FPJ0000
return string.IsNullOrEmpty(input);
}
+ public static Boolean isDate(this string input)
+ {
+ DateTime v;
+ return DateTime.TryParse(input, out v);
+ }
+
///
/// default 인코딩을 사용하여 문자열로 반환합니다.
///
diff --git a/SubProject/FPJ0000/dsPRJ.Designer.cs b/SubProject/FPJ0000/dsPRJ.Designer.cs
index c6b0fca..38b96d7 100644
--- a/SubProject/FPJ0000/dsPRJ.Designer.cs
+++ b/SubProject/FPJ0000/dsPRJ.Designer.cs
@@ -8280,6 +8280,10 @@ namespace FPJ0000 {
private global::System.Data.DataColumn columnBoardVender;
+ private global::System.Data.DataColumn column원인2;
+
+ private global::System.Data.DataColumn column결과2;
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public EETGW_JobReport_EBoardDataTable() {
@@ -8569,6 +8573,22 @@ namespace FPJ0000 {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public global::System.Data.DataColumn 원인2Column {
+ get {
+ return this.column원인2;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public global::System.Data.DataColumn 결과2Column {
+ get {
+ return this.column결과2;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -8637,7 +8657,9 @@ namespace FPJ0000 {
string 원인,
string 결과,
string memo,
- string BoardVender) {
+ string BoardVender,
+ string 원인2,
+ string 결과2) {
EETGW_JobReport_EBoardRow rowEETGW_JobReport_EBoardRow = ((EETGW_JobReport_EBoardRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
null,
@@ -8671,7 +8693,9 @@ namespace FPJ0000 {
원인,
결과,
memo,
- BoardVender};
+ BoardVender,
+ 원인2,
+ 결과2};
rowEETGW_JobReport_EBoardRow.ItemArray = columnValuesArray;
this.Rows.Add(rowEETGW_JobReport_EBoardRow);
return rowEETGW_JobReport_EBoardRow;
@@ -8733,6 +8757,8 @@ namespace FPJ0000 {
this.column결과 = base.Columns["결과"];
this.columnmemo = base.Columns["memo"];
this.columnBoardVender = base.Columns["BoardVender"];
+ this.column원인2 = base.Columns["원인2"];
+ this.column결과2 = base.Columns["결과2"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -8802,6 +8828,10 @@ namespace FPJ0000 {
base.Columns.Add(this.columnmemo);
this.columnBoardVender = new global::System.Data.DataColumn("BoardVender", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnBoardVender);
+ this.column원인2 = new global::System.Data.DataColumn("원인2", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.column원인2);
+ this.column결과2 = new global::System.Data.DataColumn("결과2", typeof(string), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.column결과2);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnidx}, true));
this.columnidx.AutoIncrement = true;
@@ -8838,6 +8868,8 @@ namespace FPJ0000 {
this.column결과.MaxLength = 2147483647;
this.columnmemo.MaxLength = 255;
this.columnBoardVender.MaxLength = 100;
+ this.column원인2.MaxLength = 2147483647;
+ this.column결과2.MaxLength = 2147483647;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -17084,6 +17116,38 @@ namespace FPJ0000 {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public string 원인2 {
+ get {
+ if (this.Is원인2Null()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableEETGW_JobReport_EBoard.원인2Column]));
+ }
+ }
+ set {
+ this[this.tableEETGW_JobReport_EBoard.원인2Column] = value;
+ }
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public string 결과2 {
+ get {
+ if (this.Is결과2Null()) {
+ return string.Empty;
+ }
+ else {
+ return ((string)(this[this.tableEETGW_JobReport_EBoard.결과2Column]));
+ }
+ }
+ set {
+ this[this.tableEETGW_JobReport_EBoard.결과2Column] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
public bool IspdateNull() {
@@ -17419,6 +17483,30 @@ namespace FPJ0000 {
public void SetBoardVenderNull() {
this[this.tableEETGW_JobReport_EBoard.BoardVenderColumn] = global::System.Convert.DBNull;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public bool Is원인2Null() {
+ return this.IsNull(this.tableEETGW_JobReport_EBoard.원인2Column);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public void Set원인2Null() {
+ this[this.tableEETGW_JobReport_EBoard.원인2Column] = global::System.Convert.DBNull;
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public bool Is결과2Null() {
+ return this.IsNull(this.tableEETGW_JobReport_EBoard.결과2Column);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")]
+ public void Set결과2Null() {
+ this[this.tableEETGW_JobReport_EBoard.결과2Column] = global::System.Convert.DBNull;
+ }
}
///
@@ -30751,6 +30839,8 @@ SELECT idx, pidx, title, pdate, edate, process, remark, remark2, wuid, wdate, so
tableMapping.ColumnMappings.Add("결과", "결과");
tableMapping.ColumnMappings.Add("memo", "memo");
tableMapping.ColumnMappings.Add("BoardVender", "BoardVender");
+ tableMapping.ColumnMappings.Add("원인2", "원인2");
+ tableMapping.ColumnMappings.Add("결과2", "결과2");
this._adapter.TableMappings.Add(tableMapping);
this._adapter.DeleteCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.DeleteCommand.Connection = this.Connection;
@@ -30836,8 +30926,8 @@ SELECT idx, pidx, title, pdate, edate, process, remark, remark2, wuid, wdate, so
this._adapter.DeleteCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BoardVender", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BoardVender", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.InsertCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.InsertCommand.Connection = this.Connection;
- this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Model], [BoardName], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [import], [wuid], [wdate], [Site], [원인], [결과], [memo], [Process], [BoardVender]) VALUES (@gcode, @pdate, @uid, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Model, @BoardName, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @import, @wuid, @wdate, @Site, @원인, @결과, @memo, @Process, @BoardVender);
-SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
+ this._adapter.InsertCommand.CommandText = @"INSERT INTO [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Model], [BoardName], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [import], [wuid], [wdate], [Site], [원인], [결과], [memo], [Process], [BoardVender], [원인2], [결과2]) VALUES (@gcode, @pdate, @uid, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Model, @BoardName, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @import, @wuid, @wdate, @Site, @원인, @결과, @memo, @Process, @BoardVender, @원인2, @결과2);
+SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC";
this._adapter.InsertCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -30868,6 +30958,8 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line,
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BoardVender", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BoardVender", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@원인2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "원인2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.InsertCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@결과2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "결과2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand = new global::System.Data.SqlClient.SqlCommand();
this._adapter.UpdateCommand.Connection = this.Connection;
this._adapter.UpdateCommand.CommandText = "UPDATE [EETGW_JobReport_EBoard] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @" +
@@ -30877,37 +30969,37 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line,
"irCost] = @RepairCost, [CostReduction] = @CostReduction, [외주업체] = @외주업체, [Repair" +
"Time] = @RepairTime, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [Site" +
"] = @Site, [원인] = @원인, [결과] = @결과, [memo] = @memo, [Process] = @Process, [BoardV" +
- "ender] = @BoardVender WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gc" +
- "ode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)" +
- ") AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@Is" +
- "Null_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 " +
- "= 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = " +
- "1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 A" +
- "ND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS " +
- "NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS" +
- " NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] I" +
- "S NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Model = 1 AND [Model] IS NUL" +
- "L) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] I" +
- "S NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_SN = 1 AND [SN] IS" +
- " NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([Q" +
- "TY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice" +
- "] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPric" +
- "e] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) O" +
- "R ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [Co" +
- "stReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsN" +
- "ull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_Rep" +
- "airTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) " +
- "AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import))" +
- " AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Sit" +
- "e = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_memo = 1 A" +
- "ND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_Process = 1 AND [" +
- "Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_BoardVender " +
- "= 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender)));\r\nSE" +
- "LECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model" +
- ", BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTim" +
- "e, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate)" +
- " AS ww, Site, 원인, 결과, memo, Process, BoardVender FROM EETGW_JobReport_EBoard WHE" +
- "RE (idx = @idx) ORDER BY pdate DESC";
+ "ender] = @BoardVender, [원인2] = @원인2, [결과2] = @결과2 WHERE (([idx] = @Original_idx)" +
+ " AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR" +
+ " ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid]" +
+ " = @Original_uid)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Origina" +
+ "l_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완" +
+ "료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Sta" +
+ "tus)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@Is" +
+ "Null_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Di" +
+ "vision = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@" +
+ "IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_" +
+ "Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_Boa" +
+ "rdName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND " +
+ "((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY =" +
+ " 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [" +
+ "NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND " +
+ "[OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1" +
+ " AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNu" +
+ "ll_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Origina" +
+ "l_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Origi" +
+ "nal_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTim" +
+ "e] = @Original_RepairTime)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([" +
+ "import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Origi" +
+ "nal_wdate) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Sit" +
+ "e)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND" +
+ " ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)" +
+ ") AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @" +
+ "Original_BoardVender)));\r\nSELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류," +
+ " Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, Co" +
+ "stReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS user" +
+ "name, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인" +
+ "2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = @idx) ORDER BY pdate DESC";
this._adapter.UpdateCommand.CommandType = global::System.Data.CommandType.Text;
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pdate", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -30938,6 +31030,8 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line,
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@memo", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "memo", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Process", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "Process", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BoardVender", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "BoardVender", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@원인2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "원인2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
+ this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@결과2", global::System.Data.SqlDbType.NVarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "결과2", global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_idx", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "idx", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_gcode", global::System.Data.SqlDbType.VarChar, 0, global::System.Data.ParameterDirection.Input, 0, 0, "gcode", global::System.Data.DataRowVersion.Original, false, null, "", "", ""));
this._adapter.UpdateCommand.Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IsNull_pdate", global::System.Data.SqlDbType.Int, 0, global::System.Data.ParameterDirection.Input, 0, 0, "pdate", global::System.Data.DataRowVersion.Original, true, null, "", "", ""));
@@ -31007,7 +31101,7 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line,
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = @"SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import,
- wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender
+ wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2
FROM EETGW_JobReport_EBoard
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid)
ORDER BY pdate DESC";
@@ -31416,7 +31510,9 @@ ORDER BY pdate DESC";
string 결과,
string memo,
string Process,
- string BoardVender) {
+ string BoardVender,
+ string 원인2,
+ string 결과2) {
if ((gcode == null)) {
throw new global::System.ArgumentNullException("gcode");
}
@@ -31586,6 +31682,18 @@ ORDER BY pdate DESC";
else {
this.Adapter.InsertCommand.Parameters[28].Value = ((string)(BoardVender));
}
+ if ((원인2 == null)) {
+ this.Adapter.InsertCommand.Parameters[29].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.InsertCommand.Parameters[29].Value = ((string)(원인2));
+ }
+ if ((결과2 == null)) {
+ this.Adapter.InsertCommand.Parameters[30].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.InsertCommand.Parameters[30].Value = ((string)(결과2));
+ }
global::System.Data.ConnectionState previousConnectionState = this.Adapter.InsertCommand.Connection.State;
if (((this.Adapter.InsertCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -31636,6 +31744,8 @@ ORDER BY pdate DESC";
string memo,
string Process,
string BoardVender,
+ string 원인2,
+ string 결과2,
int Original_idx,
string Original_gcode,
string Original_pdate,
@@ -31834,213 +31944,225 @@ ORDER BY pdate DESC";
else {
this.Adapter.UpdateCommand.Parameters[28].Value = ((string)(BoardVender));
}
- this.Adapter.UpdateCommand.Parameters[29].Value = ((int)(Original_idx));
+ if ((원인2 == null)) {
+ this.Adapter.UpdateCommand.Parameters[29].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[29].Value = ((string)(원인2));
+ }
+ if ((결과2 == null)) {
+ this.Adapter.UpdateCommand.Parameters[30].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(결과2));
+ }
+ this.Adapter.UpdateCommand.Parameters[31].Value = ((int)(Original_idx));
if ((Original_gcode == null)) {
throw new global::System.ArgumentNullException("Original_gcode");
}
else {
- this.Adapter.UpdateCommand.Parameters[30].Value = ((string)(Original_gcode));
+ this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_gcode));
}
if ((Original_pdate == null)) {
- this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[32].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.UpdateCommand.Parameters[31].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[32].Value = ((string)(Original_pdate));
- }
- if ((Original_uid == null)) {
this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[34].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[33].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_uid));
+ this.Adapter.UpdateCommand.Parameters[34].Value = ((string)(Original_pdate));
}
- if ((Original_요청자 == null)) {
+ if ((Original_uid == null)) {
this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[36].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[35].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_요청자));
+ this.Adapter.UpdateCommand.Parameters[36].Value = ((string)(Original_uid));
}
- if ((Original_수리완료일 == null)) {
+ if ((Original_요청자 == null)) {
this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[38].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[37].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_수리완료일));
+ this.Adapter.UpdateCommand.Parameters[38].Value = ((string)(Original_요청자));
}
- if ((Original_Status == null)) {
+ if ((Original_수리완료일 == null)) {
this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[40].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[39].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_Status));
+ this.Adapter.UpdateCommand.Parameters[40].Value = ((string)(Original_수리완료일));
}
- if ((Original_분류 == null)) {
+ if ((Original_Status == null)) {
this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[42].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[41].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_분류));
+ this.Adapter.UpdateCommand.Parameters[42].Value = ((string)(Original_Status));
}
- if ((Original_Line == null)) {
+ if ((Original_분류 == null)) {
this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[44].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[43].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_Line));
+ this.Adapter.UpdateCommand.Parameters[44].Value = ((string)(Original_분류));
}
- if ((Original_Division == null)) {
+ if ((Original_Line == null)) {
this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[46].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[45].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_Division));
+ this.Adapter.UpdateCommand.Parameters[46].Value = ((string)(Original_Line));
}
- if ((Original_Team == null)) {
+ if ((Original_Division == null)) {
this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[48].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[47].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_Team));
+ this.Adapter.UpdateCommand.Parameters[48].Value = ((string)(Original_Division));
}
- if ((Original_Model == null)) {
+ if ((Original_Team == null)) {
this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[50].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[49].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_Model));
+ this.Adapter.UpdateCommand.Parameters[50].Value = ((string)(Original_Team));
}
- if ((Original_BoardName == null)) {
+ if ((Original_Model == null)) {
this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[52].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[51].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_BoardName));
+ this.Adapter.UpdateCommand.Parameters[52].Value = ((string)(Original_Model));
}
- if ((Original_SN == null)) {
+ if ((Original_BoardName == null)) {
this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[54].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[53].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_SN));
+ this.Adapter.UpdateCommand.Parameters[54].Value = ((string)(Original_BoardName));
}
- if ((Original_QTY.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[56].Value = ((int)(Original_QTY.Value));
- }
- else {
+ if ((Original_SN == null)) {
this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[56].Value = global::System.DBNull.Value;
}
- if ((Original_NPrice.HasValue == true)) {
+ else {
+ this.Adapter.UpdateCommand.Parameters[55].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[56].Value = ((string)(Original_SN));
+ }
+ if ((Original_QTY.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[58].Value = ((decimal)(Original_NPrice.Value));
+ this.Adapter.UpdateCommand.Parameters[58].Value = ((int)(Original_QTY.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[57].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[58].Value = global::System.DBNull.Value;
}
- if ((Original_OPrice.HasValue == true)) {
+ if ((Original_NPrice.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[60].Value = ((decimal)(Original_OPrice.Value));
+ this.Adapter.UpdateCommand.Parameters[60].Value = ((decimal)(Original_NPrice.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[59].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[60].Value = global::System.DBNull.Value;
}
- if ((Original_RepairCost.HasValue == true)) {
+ if ((Original_OPrice.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[62].Value = ((decimal)(Original_RepairCost.Value));
+ this.Adapter.UpdateCommand.Parameters[62].Value = ((decimal)(Original_OPrice.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[61].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[62].Value = global::System.DBNull.Value;
}
- if ((Original_CostReduction.HasValue == true)) {
+ if ((Original_RepairCost.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[64].Value = ((decimal)(Original_CostReduction.Value));
+ this.Adapter.UpdateCommand.Parameters[64].Value = ((decimal)(Original_RepairCost.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[63].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[64].Value = global::System.DBNull.Value;
}
- if ((Original_외주업체 == null)) {
+ if ((Original_CostReduction.HasValue == true)) {
+ this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[66].Value = ((decimal)(Original_CostReduction.Value));
+ }
+ else {
this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[66].Value = global::System.DBNull.Value;
}
- else {
- this.Adapter.UpdateCommand.Parameters[65].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[66].Value = ((string)(Original_외주업체));
- }
- if ((Original_RepairTime.HasValue == true)) {
- this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[68].Value = ((double)(Original_RepairTime.Value));
- }
- else {
+ if ((Original_외주업체 == null)) {
this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[68].Value = global::System.DBNull.Value;
}
- if ((Original_import.HasValue == true)) {
+ else {
+ this.Adapter.UpdateCommand.Parameters[67].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[68].Value = ((string)(Original_외주업체));
+ }
+ if ((Original_RepairTime.HasValue == true)) {
this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[70].Value = ((bool)(Original_import.Value));
+ this.Adapter.UpdateCommand.Parameters[70].Value = ((double)(Original_RepairTime.Value));
}
else {
this.Adapter.UpdateCommand.Parameters[69].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[70].Value = global::System.DBNull.Value;
}
+ if ((Original_import.HasValue == true)) {
+ this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[72].Value = ((bool)(Original_import.Value));
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[71].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[72].Value = global::System.DBNull.Value;
+ }
if ((Original_wuid == null)) {
throw new global::System.ArgumentNullException("Original_wuid");
}
else {
- this.Adapter.UpdateCommand.Parameters[71].Value = ((string)(Original_wuid));
+ this.Adapter.UpdateCommand.Parameters[73].Value = ((string)(Original_wuid));
}
- this.Adapter.UpdateCommand.Parameters[72].Value = ((System.DateTime)(Original_wdate));
+ this.Adapter.UpdateCommand.Parameters[74].Value = ((System.DateTime)(Original_wdate));
if ((Original_Site == null)) {
- this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(1));
- this.Adapter.UpdateCommand.Parameters[74].Value = global::System.DBNull.Value;
- }
- else {
- this.Adapter.UpdateCommand.Parameters[73].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[74].Value = ((string)(Original_Site));
- }
- if ((Original_memo == null)) {
this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[76].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[75].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[76].Value = ((string)(Original_memo));
+ this.Adapter.UpdateCommand.Parameters[76].Value = ((string)(Original_Site));
}
- if ((Original_Process == null)) {
+ if ((Original_memo == null)) {
this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[78].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[77].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_Process));
+ this.Adapter.UpdateCommand.Parameters[78].Value = ((string)(Original_memo));
}
- if ((Original_BoardVender == null)) {
+ if ((Original_Process == null)) {
this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(1));
this.Adapter.UpdateCommand.Parameters[80].Value = global::System.DBNull.Value;
}
else {
this.Adapter.UpdateCommand.Parameters[79].Value = ((object)(0));
- this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_BoardVender));
+ this.Adapter.UpdateCommand.Parameters[80].Value = ((string)(Original_Process));
}
- this.Adapter.UpdateCommand.Parameters[81].Value = ((int)(idx));
+ if ((Original_BoardVender == null)) {
+ this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(1));
+ this.Adapter.UpdateCommand.Parameters[82].Value = global::System.DBNull.Value;
+ }
+ else {
+ this.Adapter.UpdateCommand.Parameters[81].Value = ((object)(0));
+ this.Adapter.UpdateCommand.Parameters[82].Value = ((string)(Original_BoardVender));
+ }
+ this.Adapter.UpdateCommand.Parameters[83].Value = ((int)(idx));
global::System.Data.ConnectionState previousConnectionState = this.Adapter.UpdateCommand.Connection.State;
if (((this.Adapter.UpdateCommand.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -32091,6 +32213,8 @@ ORDER BY pdate DESC";
string memo,
string Process,
string BoardVender,
+ string 원인2,
+ string 결과2,
int Original_idx,
string Original_gcode,
string Original_pdate,
@@ -32119,7 +32243,7 @@ ORDER BY pdate DESC";
string Original_memo,
string Original_Process,
string Original_BoardVender) {
- return this.Update(gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, Site, 원인, 결과, memo, Process, BoardVender, Original_idx, Original_gcode, Original_pdate, Original_uid, Original_요청자, Original_수리완료일, Original_Status, Original_분류, Original_Line, Original_Division, Original_Team, Original_Model, Original_BoardName, Original_SN, Original_QTY, Original_NPrice, Original_OPrice, Original_RepairCost, Original_CostReduction, Original_외주업체, Original_RepairTime, Original_import, Original_wuid, Original_wdate, Original_Site, Original_memo, Original_Process, Original_BoardVender, Original_idx);
+ return this.Update(gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2, Original_idx, Original_gcode, Original_pdate, Original_uid, Original_요청자, Original_수리완료일, Original_Status, Original_분류, Original_Line, Original_Division, Original_Team, Original_Model, Original_BoardName, Original_SN, Original_QTY, Original_NPrice, Original_OPrice, Original_RepairCost, Original_CostReduction, Original_외주업체, Original_RepairTime, Original_import, Original_wuid, Original_wdate, Original_Site, Original_memo, Original_Process, Original_BoardVender, Original_idx);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
diff --git a/SubProject/FPJ0000/dsPRJ.xsd b/SubProject/FPJ0000/dsPRJ.xsd
index 2ca991d..5c2bdf9 100644
--- a/SubProject/FPJ0000/dsPRJ.xsd
+++ b/SubProject/FPJ0000/dsPRJ.xsd
@@ -2196,8 +2196,8 @@ SELECT idx, pidx, title, pdate, edate, process, remark, remark2, wuid, wdate, so
- INSERT INTO [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Model], [BoardName], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [import], [wuid], [wdate], [Site], [원인], [결과], [memo], [Process], [BoardVender]) VALUES (@gcode, @pdate, @uid, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Model, @BoardName, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @import, @wuid, @wdate, @Site, @원인, @결과, @memo, @Process, @BoardVender);
-SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC
+ INSERT INTO [EETGW_JobReport_EBoard] ([gcode], [pdate], [uid], [요청자], [수리완료일], [Status], [분류], [Line], [Division], [Team], [Model], [BoardName], [SN], [QTY], [NPrice], [OPrice], [RepairCost], [CostReduction], [외주업체], [RepairTime], [import], [wuid], [wdate], [Site], [원인], [결과], [memo], [Process], [BoardVender], [원인2], [결과2]) VALUES (@gcode, @pdate, @uid, @요청자, @수리완료일, @Status, @분류, @Line, @Division, @Team, @Model, @BoardName, @SN, @QTY, @NPrice, @OPrice, @RepairCost, @CostReduction, @외주업체, @RepairTime, @import, @wuid, @wdate, @Site, @원인, @결과, @memo, @Process, @BoardVender, @원인2, @결과2);
+SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = SCOPE_IDENTITY()) ORDER BY pdate DESC
@@ -2228,13 +2228,15 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line,
+
+
SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import,
- wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender
+ wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2
FROM EETGW_JobReport_EBoard
WHERE (gcode = @gcode) AND (pdate BETWEEN @sd AND @ed) AND (uid LIKE @uid)
ORDER BY pdate DESC
@@ -2248,8 +2250,8 @@ ORDER BY pdate DESC
- UPDATE [EETGW_JobReport_EBoard] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @uid, [요청자] = @요청자, [수리완료일] = @수리완료일, [Status] = @Status, [분류] = @분류, [Line] = @Line, [Division] = @Division, [Team] = @Team, [Model] = @Model, [BoardName] = @BoardName, [SN] = @SN, [QTY] = @QTY, [NPrice] = @NPrice, [OPrice] = @OPrice, [RepairCost] = @RepairCost, [CostReduction] = @CostReduction, [외주업체] = @외주업체, [RepairTime] = @RepairTime, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [Site] = @Site, [원인] = @원인, [결과] = @결과, [memo] = @memo, [Process] = @Process, [BoardVender] = @BoardVender WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender)));
-SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender FROM EETGW_JobReport_EBoard WHERE (idx = @idx) ORDER BY pdate DESC
+ UPDATE [EETGW_JobReport_EBoard] SET [gcode] = @gcode, [pdate] = @pdate, [uid] = @uid, [요청자] = @요청자, [수리완료일] = @수리완료일, [Status] = @Status, [분류] = @분류, [Line] = @Line, [Division] = @Division, [Team] = @Team, [Model] = @Model, [BoardName] = @BoardName, [SN] = @SN, [QTY] = @QTY, [NPrice] = @NPrice, [OPrice] = @OPrice, [RepairCost] = @RepairCost, [CostReduction] = @CostReduction, [외주업체] = @외주업체, [RepairTime] = @RepairTime, [import] = @import, [wuid] = @wuid, [wdate] = @wdate, [Site] = @Site, [원인] = @원인, [결과] = @결과, [memo] = @memo, [Process] = @Process, [BoardVender] = @BoardVender, [원인2] = @원인2, [결과2] = @결과2 WHERE (([idx] = @Original_idx) AND ([gcode] = @Original_gcode) AND ((@IsNull_pdate = 1 AND [pdate] IS NULL) OR ([pdate] = @Original_pdate)) AND ((@IsNull_uid = 1 AND [uid] IS NULL) OR ([uid] = @Original_uid)) AND ((@IsNull_요청자 = 1 AND [요청자] IS NULL) OR ([요청자] = @Original_요청자)) AND ((@IsNull_수리완료일 = 1 AND [수리완료일] IS NULL) OR ([수리완료일] = @Original_수리완료일)) AND ((@IsNull_Status = 1 AND [Status] IS NULL) OR ([Status] = @Original_Status)) AND ((@IsNull_분류 = 1 AND [분류] IS NULL) OR ([분류] = @Original_분류)) AND ((@IsNull_Line = 1 AND [Line] IS NULL) OR ([Line] = @Original_Line)) AND ((@IsNull_Division = 1 AND [Division] IS NULL) OR ([Division] = @Original_Division)) AND ((@IsNull_Team = 1 AND [Team] IS NULL) OR ([Team] = @Original_Team)) AND ((@IsNull_Model = 1 AND [Model] IS NULL) OR ([Model] = @Original_Model)) AND ((@IsNull_BoardName = 1 AND [BoardName] IS NULL) OR ([BoardName] = @Original_BoardName)) AND ((@IsNull_SN = 1 AND [SN] IS NULL) OR ([SN] = @Original_SN)) AND ((@IsNull_QTY = 1 AND [QTY] IS NULL) OR ([QTY] = @Original_QTY)) AND ((@IsNull_NPrice = 1 AND [NPrice] IS NULL) OR ([NPrice] = @Original_NPrice)) AND ((@IsNull_OPrice = 1 AND [OPrice] IS NULL) OR ([OPrice] = @Original_OPrice)) AND ((@IsNull_RepairCost = 1 AND [RepairCost] IS NULL) OR ([RepairCost] = @Original_RepairCost)) AND ((@IsNull_CostReduction = 1 AND [CostReduction] IS NULL) OR ([CostReduction] = @Original_CostReduction)) AND ((@IsNull_외주업체 = 1 AND [외주업체] IS NULL) OR ([외주업체] = @Original_외주업체)) AND ((@IsNull_RepairTime = 1 AND [RepairTime] IS NULL) OR ([RepairTime] = @Original_RepairTime)) AND ((@IsNull_import = 1 AND [import] IS NULL) OR ([import] = @Original_import)) AND ([wuid] = @Original_wuid) AND ([wdate] = @Original_wdate) AND ((@IsNull_Site = 1 AND [Site] IS NULL) OR ([Site] = @Original_Site)) AND ((@IsNull_memo = 1 AND [memo] IS NULL) OR ([memo] = @Original_memo)) AND ((@IsNull_Process = 1 AND [Process] IS NULL) OR ([Process] = @Original_Process)) AND ((@IsNull_BoardVender = 1 AND [BoardVender] IS NULL) OR ([BoardVender] = @Original_BoardVender)));
+SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line, Division, Team, Model, BoardName, SN, QTY, NPrice, OPrice, RepairCost, CostReduction, 외주업체, RepairTime, import, wuid, wdate, dbo.getUserName(uid) AS username, dbo.getWorkWeek(pdate) AS ww, Site, 원인, 결과, memo, Process, BoardVender, 원인2, 결과2 FROM EETGW_JobReport_EBoard WHERE (idx = @idx) ORDER BY pdate DESC
@@ -2280,6 +2282,8 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line,
+
+
@@ -2371,6 +2375,8 @@ SELECT idx, gcode, pdate, uid, 요청자, 수리완료일, Status, 분류, Line,
+
+
@@ -2611,7 +2617,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -2842,7 +2848,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -2886,7 +2892,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -2931,7 +2937,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3047,7 +3053,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3172,7 +3178,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3206,7 +3212,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3244,7 +3250,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3360,7 +3366,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3411,7 +3417,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3424,7 +3430,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3594,7 +3600,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3764,7 +3770,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3809,7 +3815,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -3877,7 +3883,7 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
-
+
@@ -4050,10 +4056,24 @@ SELECT idx, gcode, pdate, pidx, projectName, uid, requestpart, package, status,
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/SubProject/FPJ0000/dsPRJ.xss b/SubProject/FPJ0000/dsPRJ.xss
index 3c570d0..aaff10a 100644
--- a/SubProject/FPJ0000/dsPRJ.xss
+++ b/SubProject/FPJ0000/dsPRJ.xss
@@ -4,7 +4,7 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
-->
-
+
@@ -15,11 +15,11 @@
-
+
-
-
+
+