This commit is contained in:
chi
2021-03-31 17:55:06 +09:00
parent d7a6cb25c5
commit 33ef66b173
11 changed files with 418 additions and 979 deletions

View File

@@ -30,8 +30,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(fEquipment));
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
this.bn = new System.Windows.Forms.BindingNavigator(this.components);
this.bindingNavigatorAddNewItem = new System.Windows.Forms.ToolStripButton();
this.bsB = new System.Windows.Forms.BindingSource(this.components);
@@ -54,28 +54,10 @@
this.toolStripButton1 = new System.Windows.Forms.ToolStripButton();
this.prb1 = new System.Windows.Forms.ToolStripProgressBar();
this.dv = new System.Windows.Forms.DataGridView();
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ing = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.except = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.plant = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.grp2 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.flag = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.type = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.lineT = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.lineP = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_param = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.primary = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.memo = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.autosizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.label1 = new System.Windows.Forms.Label();
this.cmbGrp = new System.Windows.Forms.ComboBox();
this.cbTeamPart = new System.Windows.Forms.ComboBox();
this.label2 = new System.Windows.Forms.Label();
this.cmbLine = new System.Windows.Forms.ComboBox();
this.label3 = new System.Windows.Forms.Label();
@@ -93,8 +75,6 @@
this.radioButton1 = new System.Windows.Forms.RadioButton();
this.radioButton2 = new System.Windows.Forms.RadioButton();
this.radioButton3 = new System.Windows.Forms.RadioButton();
this.cmbCate = new System.Windows.Forms.ComboBox();
this.cmbGrp2 = new System.Windows.Forms.Label();
this.cmbPlant = new System.Windows.Forms.ComboBox();
this.label6 = new System.Windows.Forms.Label();
this.toolStrip1 = new System.Windows.Forms.ToolStrip();
@@ -105,7 +85,7 @@
this.applyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripButton4 = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripButton6 = new System.Windows.Forms.ToolStripButton();
this.btRefresh = new System.Windows.Forms.ToolStripButton();
this.cmbDate = new System.Windows.Forms.ToolStripComboBox();
this.toolStripLabel2 = new System.Windows.Forms.ToolStripLabel();
this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripButton();
@@ -123,6 +103,23 @@
this.taOther = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter();
this.taAll = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentTableAdapter();
this.bsAll = new System.Windows.Forms.BindingSource(this.components);
this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.ing = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.except = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.plant = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.flag = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.type = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn8 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn5 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn6 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.lineT = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.lineP = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dvc_param = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn7 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn4 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.dataGridViewTextBoxColumn3 = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.primary = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.memo = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
this.bn.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.bsB)).BeginInit();
@@ -313,8 +310,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(181, 22);
this.toolStripButton1.Text = "Tem/Part/Plant/Grp2 Update";
this.toolStripButton1.Size = new System.Drawing.Size(150, 22);
this.toolStripButton1.Text = "Tem/Part/Plant Update";
this.toolStripButton1.ToolTipText = "Tem/Part 정보는 서버의 정보를 기준으로 변경 합니다.";
this.toolStripButton1.Click += new System.EventHandler(this.toolStripButton1_Click_1);
//
@@ -334,10 +331,7 @@
this.ing,
this.except,
this.plant,
this.grp2,
this.dataGridViewTextBoxColumn3,
this.flag,
this.dataGridViewTextBoxColumn4,
this.type,
this.dataGridViewTextBoxColumn8,
this.dataGridViewTextBoxColumn5,
@@ -346,142 +340,19 @@
this.lineP,
this.dvc_param,
this.dataGridViewTextBoxColumn7,
this.dataGridViewTextBoxColumn4,
this.dataGridViewTextBoxColumn3,
this.primary,
this.memo});
this.dv.ContextMenuStrip = this.cm1;
this.dv.DataSource = this.bsB;
this.dv.Dock = System.Windows.Forms.DockStyle.Fill;
this.dv.Location = new System.Drawing.Point(0, 165);
this.dv.Location = new System.Drawing.Point(0, 117);
this.dv.Name = "dv";
this.dv.RowTemplate.Height = 23;
this.dv.Size = new System.Drawing.Size(1105, 431);
this.dv.Size = new System.Drawing.Size(1105, 479);
this.dv.TabIndex = 1;
//
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle1;
this.dataGridViewTextBoxColumn1.HeaderText = "idx";
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.ReadOnly = true;
this.dataGridViewTextBoxColumn1.Width = 47;
//
// ing
//
this.ing.DataPropertyName = "ing";
this.ing.HeaderText = "잉여";
this.ing.Name = "ing";
//
// except
//
this.except.DataPropertyName = "except";
this.except.HeaderText = "제외";
this.except.Name = "except";
this.except.Width = 49;
//
// plant
//
this.plant.DataPropertyName = "plant";
this.plant.HeaderText = "plant";
this.plant.Name = "plant";
//
// grp2
//
this.grp2.DataPropertyName = "grp2";
this.grp2.HeaderText = "Cate";
this.grp2.Name = "grp2";
//
// dataGridViewTextBoxColumn3
//
this.dataGridViewTextBoxColumn3.DataPropertyName = "asset";
this.dataGridViewTextBoxColumn3.HeaderText = "asset";
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
this.dataGridViewTextBoxColumn3.Width = 61;
//
// flag
//
this.flag.DataPropertyName = "flag";
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.flag.DefaultCellStyle = dataGridViewCellStyle2;
this.flag.HeaderText = "flag";
this.flag.Name = "flag";
//
// dataGridViewTextBoxColumn4
//
this.dataGridViewTextBoxColumn4.DataPropertyName = "grp";
this.dataGridViewTextBoxColumn4.HeaderText = "grp";
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
this.dataGridViewTextBoxColumn4.Width = 48;
//
// type
//
this.type.DataPropertyName = "type";
this.type.HeaderText = "type";
this.type.Name = "type";
this.type.Width = 54;
//
// dataGridViewTextBoxColumn8
//
this.dataGridViewTextBoxColumn8.DataPropertyName = "manu";
this.dataGridViewTextBoxColumn8.HeaderText = "manu";
this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
this.dataGridViewTextBoxColumn8.Width = 62;
//
// dataGridViewTextBoxColumn5
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "model";
this.dataGridViewTextBoxColumn5.HeaderText = "model";
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.Width = 65;
//
// dataGridViewTextBoxColumn6
//
this.dataGridViewTextBoxColumn6.DataPropertyName = "linecode";
this.dataGridViewTextBoxColumn6.HeaderText = "linecode";
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
this.dataGridViewTextBoxColumn6.Width = 78;
//
// lineT
//
this.lineT.DataPropertyName = "lineT";
this.lineT.HeaderText = "Team";
this.lineT.Name = "lineT";
//
// lineP
//
this.lineP.DataPropertyName = "lineP";
this.lineP.HeaderText = "Part";
this.lineP.Name = "lineP";
//
// dvc_param
//
this.dvc_param.DataPropertyName = "param1";
this.dvc_param.HeaderText = "Wafer Size";
this.dvc_param.Name = "dvc_param";
//
// dataGridViewTextBoxColumn7
//
this.dataGridViewTextBoxColumn7.DataPropertyName = "serial";
this.dataGridViewTextBoxColumn7.HeaderText = "serial";
this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
this.dataGridViewTextBoxColumn7.Width = 61;
//
// primary
//
this.primary.DataPropertyName = "primary";
this.primary.HeaderText = "primary";
this.primary.Name = "primary";
this.primary.Width = 54;
//
// memo
//
this.memo.DataPropertyName = "memo";
this.memo.HeaderText = "memo";
this.memo.Name = "memo";
this.memo.Width = 66;
//
// cm1
//
this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -499,26 +370,26 @@
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(40, 38);
this.label1.Location = new System.Drawing.Point(232, 62);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(25, 12);
this.label1.Size = new System.Drawing.Size(76, 12);
this.label1.TabIndex = 0;
this.label1.Text = "Grp";
this.label1.Text = "Team && Part";
//
// cmbGrp
// cbTeamPart
//
this.cmbGrp.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cmbGrp.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cmbGrp.FormattingEnabled = true;
this.cmbGrp.Location = new System.Drawing.Point(72, 35);
this.cmbGrp.Name = "cmbGrp";
this.cmbGrp.Size = new System.Drawing.Size(142, 20);
this.cmbGrp.TabIndex = 1;
this.cbTeamPart.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cbTeamPart.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cbTeamPart.FormattingEnabled = true;
this.cbTeamPart.Location = new System.Drawing.Point(314, 58);
this.cbTeamPart.Name = "cbTeamPart";
this.cbTeamPart.Size = new System.Drawing.Size(142, 20);
this.cbTeamPart.TabIndex = 1;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(8, 61);
this.label2.Location = new System.Drawing.Point(15, 36);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(57, 12);
this.label2.TabIndex = 2;
@@ -529,7 +400,7 @@
this.cmbLine.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cmbLine.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cmbLine.FormattingEnabled = true;
this.cmbLine.Location = new System.Drawing.Point(72, 58);
this.cmbLine.Location = new System.Drawing.Point(79, 32);
this.cmbLine.Name = "cmbLine";
this.cmbLine.Size = new System.Drawing.Size(142, 20);
this.cmbLine.TabIndex = 3;
@@ -537,18 +408,18 @@
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(28, 84);
this.label3.Location = new System.Drawing.Point(32, 61);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(37, 12);
this.label3.Size = new System.Drawing.Size(40, 12);
this.label3.TabIndex = 4;
this.label3.Text = "Manu";
this.label3.Text = "Maker";
//
// cmbManu
//
this.cmbManu.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cmbManu.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cmbManu.FormattingEnabled = true;
this.cmbManu.Location = new System.Drawing.Point(72, 81);
this.cmbManu.Location = new System.Drawing.Point(79, 57);
this.cmbManu.Name = "cmbManu";
this.cmbManu.Size = new System.Drawing.Size(142, 20);
this.cmbManu.TabIndex = 5;
@@ -556,18 +427,18 @@
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(31, 107);
this.label4.Location = new System.Drawing.Point(255, 13);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(34, 12);
this.label4.Size = new System.Drawing.Size(52, 12);
this.label4.TabIndex = 6;
this.label4.Text = "Type";
this.label4.Text = "Process";
//
// cmbType
//
this.cmbType.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cmbType.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cmbType.FormattingEnabled = true;
this.cmbType.Location = new System.Drawing.Point(72, 104);
this.cmbType.Location = new System.Drawing.Point(314, 9);
this.cmbType.Name = "cmbType";
this.cmbType.Size = new System.Drawing.Size(142, 20);
this.cmbType.TabIndex = 7;
@@ -575,15 +446,15 @@
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(21, 15);
this.label5.Location = new System.Drawing.Point(27, 12);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(44, 12);
this.label5.Size = new System.Drawing.Size(45, 12);
this.label5.TabIndex = 8;
this.label5.Text = "search";
this.label5.Text = "Search";
//
// tbSearch
//
this.tbSearch.Location = new System.Drawing.Point(72, 11);
this.tbSearch.Location = new System.Drawing.Point(79, 8);
this.tbSearch.Name = "tbSearch";
this.tbSearch.Size = new System.Drawing.Size(142, 21);
this.tbSearch.TabIndex = 9;
@@ -593,12 +464,12 @@
this.groupBox1.Controls.Add(this.radexpy);
this.groupBox1.Controls.Add(this.radexpa);
this.groupBox1.Controls.Add(this.radexpn);
this.groupBox1.Location = new System.Drawing.Point(237, 73);
this.groupBox1.Location = new System.Drawing.Point(469, 15);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(186, 48);
this.groupBox1.TabIndex = 13;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "except";
this.groupBox1.Text = "제외";
//
// radexpy
//
@@ -636,9 +507,8 @@
//
// panel1
//
this.panel1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(200)))), ((int)(((byte)(200)))), ((int)(((byte)(200)))));
this.panel1.Controls.Add(this.groupBox2);
this.panel1.Controls.Add(this.cmbCate);
this.panel1.Controls.Add(this.cmbGrp2);
this.panel1.Controls.Add(this.cmbPlant);
this.panel1.Controls.Add(this.label6);
this.panel1.Controls.Add(this.groupBox1);
@@ -650,12 +520,12 @@
this.panel1.Controls.Add(this.label3);
this.panel1.Controls.Add(this.cmbLine);
this.panel1.Controls.Add(this.label2);
this.panel1.Controls.Add(this.cmbGrp);
this.panel1.Controls.Add(this.cbTeamPart);
this.panel1.Controls.Add(this.label1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 30);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1105, 135);
this.panel1.Size = new System.Drawing.Size(1105, 87);
this.panel1.TabIndex = 2;
this.panel1.Visible = false;
//
@@ -664,12 +534,13 @@
this.groupBox2.Controls.Add(this.radioButton1);
this.groupBox2.Controls.Add(this.radioButton2);
this.groupBox2.Controls.Add(this.radioButton3);
this.groupBox2.Location = new System.Drawing.Point(431, 73);
this.groupBox2.Location = new System.Drawing.Point(665, 15);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(186, 48);
this.groupBox2.TabIndex = 14;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "잉여";
this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter);
//
// radioButton1
//
@@ -703,31 +574,12 @@
this.radioButton3.Text = "No";
this.radioButton3.UseVisualStyleBackColor = true;
//
// cmbCate
//
this.cmbCate.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cmbCate.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cmbCate.FormattingEnabled = true;
this.cmbCate.Location = new System.Drawing.Point(301, 39);
this.cmbCate.Name = "cmbCate";
this.cmbCate.Size = new System.Drawing.Size(142, 20);
this.cmbCate.TabIndex = 17;
//
// cmbGrp2
//
this.cmbGrp2.AutoSize = true;
this.cmbGrp2.Location = new System.Drawing.Point(237, 43);
this.cmbGrp2.Name = "cmbGrp2";
this.cmbGrp2.Size = new System.Drawing.Size(56, 12);
this.cmbGrp2.TabIndex = 16;
this.cmbGrp2.Text = "Category";
//
// cmbPlant
//
this.cmbPlant.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
this.cmbPlant.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
this.cmbPlant.FormattingEnabled = true;
this.cmbPlant.Location = new System.Drawing.Point(301, 16);
this.cmbPlant.Location = new System.Drawing.Point(314, 33);
this.cmbPlant.Name = "cmbPlant";
this.cmbPlant.Size = new System.Drawing.Size(142, 20);
this.cmbPlant.TabIndex = 15;
@@ -735,7 +587,7 @@
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(237, 20);
this.label6.Location = new System.Drawing.Point(275, 37);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(33, 12);
this.label6.TabIndex = 14;
@@ -750,7 +602,7 @@
this.toolStripButton2,
this.toolStripButton4,
this.toolStripSeparator2,
this.toolStripButton6,
this.btRefresh,
this.cmbDate,
this.toolStripLabel2,
this.toolStripDropDownButton1,
@@ -818,15 +670,15 @@
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(6, 30);
//
// toolStripButton6
// btRefresh
//
this.toolStripButton6.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripButton6.Image = ((System.Drawing.Image)(resources.GetObject("toolStripButton6.Image")));
this.toolStripButton6.ImageTransparentColor = System.Drawing.Color.Magenta;
this.toolStripButton6.Name = "toolStripButton6";
this.toolStripButton6.Size = new System.Drawing.Size(82, 27);
this.toolStripButton6.Text = "Data View";
this.toolStripButton6.Click += new System.EventHandler(this.toolStripButton6_Click);
this.btRefresh.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.btRefresh.Image = ((System.Drawing.Image)(resources.GetObject("btRefresh.Image")));
this.btRefresh.ImageTransparentColor = System.Drawing.Color.Magenta;
this.btRefresh.Name = "btRefresh";
this.btRefresh.Size = new System.Drawing.Size(82, 27);
this.btRefresh.Text = "Data View";
this.btRefresh.Click += new System.EventHandler(this.toolStripButton6_Click);
//
// cmbDate
//
@@ -931,6 +783,129 @@
this.bsAll.DataMember = "EETGW_Equipment";
this.bsAll.DataSource = this.dsEQ;
//
// dataGridViewTextBoxColumn1
//
this.dataGridViewTextBoxColumn1.DataPropertyName = "idx";
dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224)))));
this.dataGridViewTextBoxColumn1.DefaultCellStyle = dataGridViewCellStyle3;
this.dataGridViewTextBoxColumn1.HeaderText = "idx";
this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
this.dataGridViewTextBoxColumn1.ReadOnly = true;
this.dataGridViewTextBoxColumn1.Width = 47;
//
// ing
//
this.ing.DataPropertyName = "ing";
this.ing.HeaderText = "잉여";
this.ing.Name = "ing";
//
// except
//
this.except.DataPropertyName = "except";
this.except.HeaderText = "제외";
this.except.Name = "except";
this.except.Width = 49;
//
// plant
//
this.plant.DataPropertyName = "plant";
this.plant.HeaderText = "plant";
this.plant.Name = "plant";
this.plant.Width = 50;
//
// flag
//
this.flag.DataPropertyName = "flag";
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
this.flag.DefaultCellStyle = dataGridViewCellStyle4;
this.flag.HeaderText = "flag";
this.flag.Name = "flag";
//
// type
//
this.type.DataPropertyName = "type";
this.type.HeaderText = "Process";
this.type.Name = "type";
this.type.Width = 120;
//
// dataGridViewTextBoxColumn8
//
this.dataGridViewTextBoxColumn8.DataPropertyName = "manu";
this.dataGridViewTextBoxColumn8.HeaderText = "Maker";
this.dataGridViewTextBoxColumn8.Name = "dataGridViewTextBoxColumn8";
this.dataGridViewTextBoxColumn8.Width = 120;
//
// dataGridViewTextBoxColumn5
//
this.dataGridViewTextBoxColumn5.DataPropertyName = "model";
this.dataGridViewTextBoxColumn5.HeaderText = "model";
this.dataGridViewTextBoxColumn5.Name = "dataGridViewTextBoxColumn5";
this.dataGridViewTextBoxColumn5.Width = 120;
//
// dataGridViewTextBoxColumn6
//
this.dataGridViewTextBoxColumn6.DataPropertyName = "linecode";
this.dataGridViewTextBoxColumn6.HeaderText = "linecode";
this.dataGridViewTextBoxColumn6.Name = "dataGridViewTextBoxColumn6";
this.dataGridViewTextBoxColumn6.Width = 70;
//
// lineT
//
this.lineT.DataPropertyName = "lineT";
this.lineT.HeaderText = "Team";
this.lineT.Name = "lineT";
this.lineT.Width = 50;
//
// lineP
//
this.lineP.DataPropertyName = "lineP";
this.lineP.HeaderText = "Part";
this.lineP.Name = "lineP";
this.lineP.Width = 50;
//
// dvc_param
//
this.dvc_param.DataPropertyName = "param1";
this.dvc_param.HeaderText = "Wafer Size";
this.dvc_param.Name = "dvc_param";
this.dvc_param.Width = 50;
//
// dataGridViewTextBoxColumn7
//
this.dataGridViewTextBoxColumn7.DataPropertyName = "serial";
this.dataGridViewTextBoxColumn7.HeaderText = "serial";
this.dataGridViewTextBoxColumn7.Name = "dataGridViewTextBoxColumn7";
this.dataGridViewTextBoxColumn7.Width = 61;
//
// dataGridViewTextBoxColumn4
//
this.dataGridViewTextBoxColumn4.DataPropertyName = "grp";
this.dataGridViewTextBoxColumn4.HeaderText = "grp";
this.dataGridViewTextBoxColumn4.Name = "dataGridViewTextBoxColumn4";
this.dataGridViewTextBoxColumn4.Width = 48;
//
// dataGridViewTextBoxColumn3
//
this.dataGridViewTextBoxColumn3.DataPropertyName = "asset";
this.dataGridViewTextBoxColumn3.HeaderText = "asset";
this.dataGridViewTextBoxColumn3.Name = "dataGridViewTextBoxColumn3";
this.dataGridViewTextBoxColumn3.Width = 61;
//
// primary
//
this.primary.DataPropertyName = "primary";
this.primary.HeaderText = "primary";
this.primary.Name = "primary";
this.primary.Width = 54;
//
// memo
//
this.memo.DataPropertyName = "memo";
this.memo.HeaderText = "memo";
this.memo.Name = "memo";
this.memo.Width = 66;
//
// fEquipment
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
@@ -988,7 +963,7 @@
private dsEQ dsEQ;
private dsEQTableAdapters.EquipmentBTableAdapter taB;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.ComboBox cmbGrp;
private System.Windows.Forms.ComboBox cbTeamPart;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ComboBox cmbLine;
private System.Windows.Forms.Label label3;
@@ -1015,7 +990,7 @@
private System.Windows.Forms.ToolStripButton toolStripButton4;
private System.Windows.Forms.ToolStripButton toolStripButton5;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripButton toolStripButton6;
private System.Windows.Forms.ToolStripButton btRefresh;
private System.Windows.Forms.ToolStripComboBox cmbDate;
private System.Windows.Forms.ToolStripLabel toolStripLabel2;
private System.Windows.Forms.ToolStripButton toolStripDropDownButton1;
@@ -1033,18 +1008,19 @@
private System.Windows.Forms.ToolStripProgressBar prb1;
private System.Windows.Forms.BindingSource bsOther;
private dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter taOther;
private System.Windows.Forms.ComboBox cmbCate;
private System.Windows.Forms.Label cmbGrp2;
private System.Windows.Forms.ComboBox cmbPlant;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.RadioButton radioButton1;
private System.Windows.Forms.RadioButton radioButton2;
private System.Windows.Forms.RadioButton radioButton3;
private dsEQTableAdapters.EETGW_EquipmentTableAdapter taAll;
private System.Windows.Forms.BindingSource bsAll;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
private System.Windows.Forms.DataGridViewCheckBoxColumn ing;
private System.Windows.Forms.DataGridViewCheckBoxColumn except;
private System.Windows.Forms.DataGridViewTextBoxColumn plant;
private System.Windows.Forms.DataGridViewTextBoxColumn grp2;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
private System.Windows.Forms.DataGridViewTextBoxColumn flag;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
private System.Windows.Forms.DataGridViewTextBoxColumn type;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
@@ -1053,13 +1029,9 @@
private System.Windows.Forms.DataGridViewTextBoxColumn lineP;
private System.Windows.Forms.DataGridViewTextBoxColumn dvc_param;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn7;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn4;
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn3;
private System.Windows.Forms.DataGridViewCheckBoxColumn primary;
private System.Windows.Forms.DataGridViewTextBoxColumn memo;
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.RadioButton radioButton1;
private System.Windows.Forms.RadioButton radioButton2;
private System.Windows.Forms.RadioButton radioButton3;
private dsEQTableAdapters.EETGW_EquipmentTableAdapter taAll;
private System.Windows.Forms.BindingSource bsAll;
}
}

View File

@@ -17,48 +17,56 @@ namespace FEQ0000
public enum eTabletype
{
ALL,
MOLD,
FOL,
BUMP,
ING,
OTHER
//MOLD,
//FOL,
//BUMP,
//ING,
//OTHER
}
string tableName = string.Empty;
eTabletype dataType = eTabletype.FOL;
eTabletype dataType = eTabletype.ALL;
public fEquipment(eTabletype type_)
{
InitializeComponent();
dataType = type_;
if (dataType == eTabletype.MOLD)
{
tableName = "EquipmentME";
this.dsEQ.EquipmentME.TableNewRow += Equipment_TableNewRow;
dvc_param.Visible = false;
}
else if (dataType == eTabletype.FOL)
{
this.tbSearch.KeyDown += (s1, e1) => {
if(e1.KeyCode == Keys.Enter)
{
btRefresh.PerformClick();
}
};
//if (dataType == eTabletype.MOLD)
//{
tableName = "EquipmentF";
this.dsEQ.EquipmentF.TableNewRow += Equipment_TableNewRow;
dvc_param.Visible = false;
}
else if (dataType == eTabletype.ING)
{
// tableName = "EquipmentME";
// this.dsEQ.EquipmentME.TableNewRow += Equipment_TableNewRow;
// dvc_param.Visible = false;
//}
//else if (dataType == eTabletype.FOL)
//{
tableName = "EETGW_EquipmentIng";
this.dsEQ.EETGW_EquipmentIng.TableNewRow += Equipment_TableNewRow;
dvc_param.Visible = false;
}
else if (dataType == eTabletype.OTHER)
{
// tableName = "EquipmentF";
// this.dsEQ.EquipmentF.TableNewRow += Equipment_TableNewRow;
// dvc_param.Visible = false;
//}
//else if (dataType == eTabletype.ING)
//{
tableName = "EETGW_EquipmentOther";
this.dsEQ.EETGW_EquipmentOther.TableNewRow += Equipment_TableNewRow;
dvc_param.Visible = false;
}
else if (dataType == eTabletype.ALL)
// tableName = "EETGW_EquipmentIng";
// this.dsEQ.EETGW_EquipmentIng.TableNewRow += Equipment_TableNewRow;
// dvc_param.Visible = false;
//}
//else if (dataType == eTabletype.OTHER)
//{
// tableName = "EETGW_EquipmentOther";
// this.dsEQ.EETGW_EquipmentOther.TableNewRow += Equipment_TableNewRow;
// dvc_param.Visible = false;
//}
//else
if (dataType == eTabletype.ALL)
{
tableName = "EETGW_Equipment";
@@ -74,7 +82,7 @@ namespace FEQ0000
dvc_param.Visible = true;
}
this.FormClosed += fEquipment_FormClosed;
}
void fEquipment_FormClosed(object sender, FormClosedEventArgs e)
@@ -89,11 +97,7 @@ namespace FEQ0000
var taDateList = new dsEQTableAdapters.EqDateListTableAdapter();
DataTable dtList = null;
if (dataType == eTabletype.BUMP) dtList = taDateList.GetDateListB();
else if (dataType == eTabletype.FOL) dtList = taDateList.GetDateListF();
else if (dataType == eTabletype.ING) dtList = taDateList.GetDateListIng();
else if (dataType == eTabletype.OTHER) dtList = taDateList.GetDateListOther();
else if (dataType == eTabletype.ALL) dtList = taDateList.GetDateListAll();
if (dataType == eTabletype.ALL) dtList = taDateList.GetDateListAll();
else dtList = taDateList.GetDateListME();
this.cmbDate.Items.Clear();
@@ -118,33 +122,33 @@ namespace FEQ0000
RefreshDate();
//목록을 가져온다.
var grpList = DatabaseManager.getEQGroupLiist("grp", this.tableName);
var tlList = DatabaseManager.getEQGroupLiist("linet +'-' + linep ", this.tableName);
var lcList = DatabaseManager.getEQGroupLiist("linecode", this.tableName);
var manuList = DatabaseManager.getEQGroupLiist("manu", this.tableName);
var typeList = DatabaseManager.getEQGroupLiist("type", this.tableName);
var plantList = DatabaseManager.getEQGroupLiist("plant", this.tableName);
var grp2List = DatabaseManager.getEQGroupLiist("grp2", this.tableName);
//var grp2List = DatabaseManager.getEQGroupLiist("grp2", this.tableName);
cmbGrp.Items.Add("-- All --");
cbTeamPart.Items.Add("-- All --");
cmbLine.Items.Add("-- All --");
cmbManu.Items.Add("-- All --");
cmbType.Items.Add("-- All --");
cmbPlant.Items.Add("-- All --");
cmbCate.Items.Add("-- All --");
// cmbCate.Items.Add("-- All --");
foreach (var item in grpList) this.cmbGrp.Items.Add(item);
foreach (var item in tlList) this.cbTeamPart.Items.Add(item);
foreach (var item in lcList) this.cmbLine.Items.Add(item);
foreach (var item in manuList) this.cmbManu.Items.Add(item);
foreach (var item in typeList) this.cmbType.Items.Add(item);
foreach (var item in plantList) this.cmbPlant.Items.Add(item);
foreach (var item in grp2List) this.cmbCate.Items.Add(item);
// foreach (var item in grp2List) this.cmbCate.Items.Add(item);
if (this.cmbGrp.Items.Count > 0) cmbGrp.SelectedIndex = 0;
if (this.cbTeamPart.Items.Count > 0) cbTeamPart.SelectedIndex = 0;
if (this.cmbLine.Items.Count > 0) cmbLine.SelectedIndex = 0;
if (this.cmbManu.Items.Count > 0) cmbManu.SelectedIndex = 0;
if (this.cmbType.Items.Count > 0) cmbType.SelectedIndex = 0;
if (this.cmbPlant.Items.Count > 0) cmbPlant.SelectedIndex = 0;
if (this.cmbCate.Items.Count > 0) cmbCate.SelectedIndex = 0;
//if (this.cmbCate.Items.Count > 0) cmbCate.SelectedIndex = 0;
//if (this.dataType == eTabletype.ING)
// dvc_param.HeaderText = "RCS Flag";
@@ -164,31 +168,7 @@ namespace FEQ0000
try
{
if (dataType == eTabletype.BUMP)
{
this.taB.Update(this.dsEQ.EquipmentB);
}
else if (dataType == eTabletype.MOLD)
{
this.taME.Update(this.dsEQ.EquipmentME);
}
else if (dataType == eTabletype.ING)
{
this.taIng.Update(this.dsEQ.EETGW_EquipmentIng);
}
else if (dataType == eTabletype.OTHER)
{
this.taOther.Update(this.dsEQ.EETGW_EquipmentOther);
}
else if (dataType == eTabletype.ALL)
{
taAll.Update(this.dsEQ.EETGW_Equipment);
}
else
{
this.taF.Update(this.dsEQ.EquipmentF);
}
taAll.Update(this.dsEQ.EETGW_Equipment);
this.dsEQ.AcceptChanges();
}
catch (Exception ex)
@@ -212,12 +192,7 @@ namespace FEQ0000
try
{
DataRow[] dRows = null;
if (dataType == eTabletype.BUMP) dRows = this.dsEQ.EquipmentB.Select(filter);
else if (dataType == eTabletype.MOLD) dRows = this.dsEQ.EquipmentME.Select(filter);
else if (dataType == eTabletype.ING) dRows = this.dsEQ.EETGW_EquipmentIng.Select(filter);
else if (dataType == eTabletype.OTHER) dRows = this.dsEQ.EETGW_EquipmentOther.Select(filter);
else if (dataType == eTabletype.ALL) dRows = this.dsEQ.EETGW_Equipment.Select(filter);
else dRows = this.dsEQ.EquipmentF.Select(filter);
dRows = this.dsEQ.EETGW_Equipment.Select(filter);
int cnt = 0;
foreach (DataRow dr in dRows)
@@ -256,12 +231,7 @@ namespace FEQ0000
}
try
{
if (dataType == eTabletype.MOLD) this.bsME.Filter = filter;
else if (dataType == eTabletype.BUMP) this.bsB.Filter = filter;
else if (dataType == eTabletype.ING) this.bsIng.Filter = filter;
else if (dataType == eTabletype.OTHER) this.bsOther.Filter = filter;
else if (dataType == eTabletype.ALL) this.bsAll.Filter = filter;
else this.bsF.Filter = filter;
this.bsAll.Filter = filter;
if (key.isEmpty()) this.tbFilter.BackColor = Color.White;
else this.tbFilter.BackColor = Color.Lime;
@@ -284,22 +254,14 @@ namespace FEQ0000
private void toolStripButton4_Click(object sender, EventArgs e)
{
if(this.dataType == eTabletype.ALL)
if (this.dsEQ.EETGW_Equipment.Count < 1)
{
if(this.dsEQ.EETGW_Equipment.Count < 1)
{
FCOMMON.Util.MsgE("자료가 없습니다. 자료를 조회하고 시도하세요");
return;
}
var f = new rpt_equipmentAll(this.dsEQ.EETGW_Equipment,this.grp2name);
f.Show();
FCOMMON.Util.MsgE("자료가 없습니다. 자료를 조회하고 시도하세요");
return;
}
else
{
var f = new rpt_equipmentB(dataType, this.cmbDate.Text);
f.Show();
}
var f = new rpt_equipmentAll(this.dsEQ.EETGW_Equipment, "Equipment");
f.Show();
}
private void toolStripButton2_Click(object sender, EventArgs e)
@@ -314,7 +276,7 @@ namespace FEQ0000
RefreshDate();
}
string grp2name = string.Empty;
//string grp2name = string.Empty;
private void toolStripButton6_Click(object sender, EventArgs e)
{
if (cmbDate.SelectedIndex < 0)
@@ -324,16 +286,16 @@ namespace FEQ0000
}
this.grp2name = this.cmbCate.Text;
// this.grp2name = this.cmbCate.Text;
//select query
string newSQL = "select * from {0}";
string newWhere = "pdate = '{1}'";
if (cmbGrp.SelectedIndex != 0 && !cmbGrp.Text.isEmpty())
if (cbTeamPart.SelectedIndex != 0 && !cbTeamPart.Text.isEmpty())
{
if (!newWhere.isEmpty()) newWhere += " and ";
newWhere += "grp='" + cmbGrp.Text + "'";
newWhere += "linet +'-' + linep ='" + cbTeamPart.Text + "'";
}
if (this.cmbManu.SelectedIndex != 0 && !cmbManu.Text.isEmpty())
{
@@ -353,18 +315,14 @@ namespace FEQ0000
if (!this.tbSearch.Text.isEmpty())
{
if (!newWhere.isEmpty()) newWhere += " and ";
newWhere += string.Format("(asset like '%{0}%' or model like '%{0}%' or serial like '%{0}%')", tbSearch.Text);
newWhere += string.Format("(asset like '%{0}%' or type like '%{0}%' or manu like '%{0}%' or model like '%{0}%' or linet like '%{0}%' or linep like '%{0}%' or linecode like '%{0}%' or serial like '%{0}%')", tbSearch.Text);
}
if (this.cmbPlant.SelectedIndex > 0 && !this.cmbPlant.Text.isEmpty())
if (this.cmbPlant.SelectedIndex > 0 && !this.cmbPlant.Text.isEmpty())
{
if (!newWhere.isEmpty()) newWhere += " and ";
newWhere += "[plant]='" + cmbPlant.Text + "'";
}
if (this.cmbCate.SelectedIndex > 0 && !this.cmbCate.Text.isEmpty())
{
if (!newWhere.isEmpty()) newWhere += " and ";
newWhere += "[grp2]='" + cmbCate.Text + "'";
}
if (radexpn.Checked)
{
if (!newWhere.isEmpty()) newWhere += " and ";
@@ -389,86 +347,25 @@ namespace FEQ0000
string CommandText = newSQL;
if (!newWhere.isEmpty()) CommandText += " where " + newWhere;
switch (dataType)
{
case eTabletype.MOLD:
//select command
if (this.taME.Adapter.SelectCommand == null)
this.taME.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
this.taME.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentME", this.cmbDate.Text);
this.dsEQ.EquipmentME.Clear();
taME.Fill(this.dsEQ.EquipmentME, this.cmbDate.Text);
this.dsEQ.EquipmentME.AcceptChanges();
dv.DataSource = bsME;
bn.BindingSource = bsME;
break;
case eTabletype.BUMP:
//select command
if (this.taB.Adapter.SelectCommand == null)
this.taB.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
this.taB.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentB", this.cmbDate.Text);
this.dsEQ.EquipmentB.Clear();
taB.Fill(this.dsEQ.EquipmentB, this.cmbDate.Text);
this.dsEQ.EquipmentB.AcceptChanges();
dv.DataSource = bsB;
bn.BindingSource = bsB;
break;
case eTabletype.FOL:
//select command
if (this.taF.Adapter.SelectCommand == null)
this.taF.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
this.taF.Adapter.SelectCommand.CommandText = string.Format(CommandText, "equipmentF",this.cmbDate.Text);
this.dsEQ.EquipmentF.Clear();
taF.Fill(this.dsEQ.EquipmentF, this.cmbDate.Text);
this.dsEQ.EquipmentF.AcceptChanges();
dv.DataSource = bsF;
bn.BindingSource = bsF;
break;
case eTabletype.ING:
//select command
if (this.taIng.Adapter.SelectCommand == null)
this.taIng.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
this.taIng.Adapter.SelectCommand.CommandText = string.Format(CommandText, "EETGW_EquipmentIng", this.cmbDate.Text);
this.dsEQ.EETGW_EquipmentIng.Clear();
taIng.Fill(this.dsEQ.EETGW_EquipmentIng, this.cmbDate.Text);
this.dsEQ.EETGW_EquipmentIng.AcceptChanges();
dv.DataSource = bsIng;
bn.BindingSource = bsIng;
break;
case eTabletype.ALL:
CommandText = string.Format(CommandText, "EETGW_Equipment", this.cmbDate.Text);
var cmd = new System.Data.SqlClient.SqlCommand(CommandText, this.taAll.Connection);
var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
dsEQ.EETGW_Equipment.Clear();
da.Fill(this.dsEQ.EETGW_Equipment);
dsEQ.EETGW_Equipment.AcceptChanges();
////select command
//if (this.taAll.Adapter.SelectCommand == null)
// this.taAll.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
//this.taAll.Adapter.SelectCommand.CommandText = string.Format(CommandText, "EETGW_Equipment");
//this.dsEQ.EETGW_Equipment.Clear();
//taAll.Fill(this.dsEQ.EETGW_Equipment, this.cmbDate.Text);
//this.dsEQ.EETGW_Equipment.AcceptChanges();
dv.DataSource = bsAll;
bn.BindingSource = bsAll;
break;
case eTabletype.OTHER:
//select command
if (this.taOther.Adapter.SelectCommand == null)
this.taOther.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
this.taOther.Adapter.SelectCommand.CommandText = string.Format(CommandText, "EETGW_Equipment");
this.dsEQ.EETGW_EquipmentOther.Clear();
taOther.Fill(this.dsEQ.EETGW_EquipmentOther, this.cmbDate.Text);
this.dsEQ.EETGW_EquipmentOther.AcceptChanges();
dv.DataSource = bsOther;
bn.BindingSource = bsOther;
break;
}
CommandText = string.Format(CommandText, "EETGW_Equipment", this.cmbDate.Text);
var cmd = new System.Data.SqlClient.SqlCommand(CommandText, this.taAll.Connection);
var da = new System.Data.SqlClient.SqlDataAdapter(cmd);
dsEQ.EETGW_Equipment.Clear();
da.Fill(this.dsEQ.EETGW_Equipment);
dsEQ.EETGW_Equipment.AcceptChanges();
////select command
//if (this.taAll.Adapter.SelectCommand == null)
// this.taAll.Adapter.SelectCommand = new System.Data.SqlClient.SqlCommand();
//this.taAll.Adapter.SelectCommand.CommandText = string.Format(CommandText, "EETGW_Equipment");
//this.dsEQ.EETGW_Equipment.Clear();
//taAll.Fill(this.dsEQ.EETGW_Equipment, this.cmbDate.Text);
//this.dsEQ.EETGW_Equipment.AcceptChanges();
dv.DataSource = bsAll;
bn.BindingSource = bsAll;
}
@@ -484,7 +381,7 @@ namespace FEQ0000
private void applyToolStripMenuItem_Click(object sender, EventArgs e)
{
var f = new EQFilterApply(this.dataType == eTabletype.ING ? "I" : "E");
var f = new EQFilterApply("E");
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
var dlg = FCOMMON.Util.MsgQ("매크로를 적용 하시겠습니까?");
@@ -506,8 +403,8 @@ namespace FEQ0000
private void toolStripButton7_Click(object sender, EventArgs e)
{
var eqdiv = this.dataType == eTabletype.ING ? "I" : "E";
var f = new EQfilterManager(eqdiv);
//var eqdiv = this.dataType == eTabletype.ING ? "I" : "E";
var f = new EQfilterManager("E");
if (f.ShowDialog() == System.Windows.Forms.DialogResult.OK)
{
var filter = f.filter;
@@ -581,142 +478,37 @@ namespace FEQ0000
var ucnt = 0;
var taLIne = new dsEQTableAdapters.LineCodeTableAdapter();
var dtLineCode = taLIne.GetData();
if (dataType == eTabletype.MOLD)
this.prb1.Maximum = this.dsEQ.EETGW_Equipment.Count;
foreach (dsEQ.EETGW_EquipmentRow dr in this.dsEQ.EETGW_Equipment)
{
this.prb1.Maximum = this.dsEQ.EquipmentME.Count;
foreach (dsEQ.EquipmentMERow dr in this.dsEQ.EquipmentME)
if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
if (linedata != null)
{
if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
if (linedata != null)
if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
{
if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
{
dr.lineP = linedata.part;
dr.lineT = linedata.team;
dr.plant = linedata.plant;
dr.grp2 = linedata.grp2;
dr.EndEdit();
ucnt += 1;
}
}
}
}
else if (dataType == eTabletype.FOL)
{
this.prb1.Maximum = this.dsEQ.EquipmentF.Count;
foreach (dsEQ.EquipmentFRow dr in this.dsEQ.EquipmentF)
{
if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
if (linedata != null)
{
if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
{
dr.lineP = linedata.part;
dr.lineT = linedata.team;
dr.plant = linedata.plant;
dr.grp2 = linedata.grp2;
dr.EndEdit();
ucnt += 1;
}
}
}
}
else if (dataType == eTabletype.ING)
{
this.prb1.Maximum = this.dsEQ.EETGW_EquipmentIng.Count;
foreach (dsEQ.EETGW_EquipmentIngRow dr in this.dsEQ.EETGW_EquipmentIng)
{
if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
if (linedata != null)
{
if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
{
dr.lineP = linedata.part;
dr.lineT = linedata.team;
dr.plant = linedata.plant;
dr.grp2 = linedata.grp2;
dr.EndEdit();
ucnt += 1;
}
}
}
}
else if (dataType == eTabletype.OTHER)
{
this.prb1.Maximum = this.dsEQ.EETGW_EquipmentOther.Count;
foreach (dsEQ.EETGW_EquipmentOtherRow dr in this.dsEQ.EETGW_EquipmentOther)
{
if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
if (linedata != null)
{
if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
{
dr.lineP = linedata.part;
dr.lineT = linedata.team;
dr.plant = linedata.plant;
dr.grp2 = linedata.grp2;
dr.EndEdit();
ucnt += 1;
}
}
}
}
else if (dataType == eTabletype.ALL)
{
this.prb1.Maximum = this.dsEQ.EETGW_Equipment.Count;
foreach (dsEQ.EETGW_EquipmentRow dr in this.dsEQ.EETGW_Equipment)
{
if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
if (linedata != null)
{
if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
{
dr.lineP = linedata.part;
dr.lineT = linedata.team;
dr.plant = linedata.plant;
dr.grp2 = linedata.grp2;
dr.EndEdit();
ucnt += 1;
}
}
}
}
else
{
this.prb1.Maximum = this.dsEQ.EquipmentB.Count;
foreach (dsEQ.EquipmentBRow dr in this.dsEQ.EquipmentB)
{
if (this.prb1.Value < this.prb1.Maximum) this.prb1.Value += 1;
if (dr.RowState == DataRowState.Deleted || dr.RowState == DataRowState.Detached) continue;
var linedata = dtLineCode.Where(t => t.code == dr.linecode).FirstOrDefault();
if (linedata != null)
{
if (dr.grp2 != linedata.grp2 || dr.lineP != linedata.part || dr.lineT != linedata.team || dr.plant != linedata.plant)
{
dr.lineP = linedata.part;
dr.lineT = linedata.team;
dr.plant = linedata.plant;
dr.grp2 = linedata.grp2;
dr.EndEdit();
ucnt += 1;
}
dr.lineP = linedata.part;
dr.lineT = linedata.team;
dr.plant = linedata.plant;
dr.grp2 = linedata.grp2;
dr.EndEdit();
ucnt += 1;
}
}
}
FCOMMON.Util.MsgI($"{ucnt} 건의 자료가 변경 되었습니다. 적용하려면 '저장' 버튼을 누르세요");
}
private void groupBox2_Enter(object sender, EventArgs e)
{
}
}
}

View File

@@ -228,6 +228,9 @@
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>147, 17</value>
</metadata>
<metadata name="ing.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -237,9 +240,6 @@
<metadata name="plant.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="grp2.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="flag.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -274,17 +274,6 @@
IAxiQ4WJB6MGDJQBgfU7xcKa9lwvmXPtZcmCGy/aN7/5D8IgNkgMJAdSA1WOHfjXrxdI6jt5uHPru//d
2z+AMYgNEgPJQZXhB6Hlu/mToYaANfefPAQSg0oTBwIq1gmnTjyzP3XCyf0h9TuEoMKkAZBGgpqj2vb7
xHQcbCUHg/QypE44tQQWWKRikF6G2K4juSAGOTi260guAHNTC7nWY2FZAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE5SURBVDhPnZJLS8NAFIVHf2dbzGRt9zXFQCqYuqmKuLOi
laaCRJ0UqjvtqjVNVuoPiKAVRJc+KIy515nSmIexBw5c5tzvDAND0sQ5WRicFPSBXVyFWRznEwB+V7Ue
b9cnYL+rWLlLdF1f9NjS8fiuPuGvLQ6GGc4gE2vJQtiJwrMlrqN0Uksg8M9pZ3y/EYOloQR2Ys/BNzPV
yoKlYWfEaHtaAsPIoe08sDSWhAyWDO2i9hSYXzLsX9b5Wq2Mc6up8aP9Ks41o4yZ3HsOdj5vTksrxD2L
Flz1TG6IgoM9jR82fwoMY5lfX5jRArtUwWd4jDbeHhrvMvzLsAsMwlIeUzdfgt2PJGDWibCU59CtrBLI
4CKxnqy0EoTDTKxl63fJv2ApnynbAM4Fg+CTDO1C1Q3/yfTXxUTIN1uh6VOm+F1TAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -294,11 +283,11 @@
s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6
Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef
/oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjlx//ByEtxy+GcQQ23N4YufW
d/+7t3/4X7/u5p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
d/+7t3/4X7/u+p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
IC+0zli9rr6+ngksiQVEdxwNKZh/42nx7CtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb
qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv
O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY
AP72Lw00N2hvAAAAAElFTkSuQmCC
APaQLwl0R0q7AAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -313,17 +302,17 @@
GBaNWcvqk2DqGRgYGADjf2uwh5UJoAAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton6.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="btRefresh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV+i7BNGlU0S3
BqQwMzVf2m1ba8s1s7TNXTe1VhPFl6ISDT0VdOmFMusSUWRNuzFSq0vWA7/L/P7PMMMwqlpoqO0Bs2sX
M9MBh9kZ1Gsxby+qfkeDrXVZPWF/MHf7nC1CKCVz/wHZk7OiuBEJAGhAo9WIZT3uFsLpu9KXWJlI/uZ9
zhnA0Hg1Bgc3nLy4elOSy+FPLgpqcr0PKXJINs4oST+TKbxD45p/FilyVoKHESWpMthWmEKKnCUuySsJ
P5MRY3btWZEiR2/3q4+uXxTFcoT8+ZMGdw8gRc6IiW4nPcKDkihFep15l8CgcTkAUM06itnB91Il3Bt7
PL55lcmJ3GVpfiMUGp8mOpDyDbBaW/WrbHSVj33M2NzuIYJosawHJ2x8YmeJi6cW2Cijd/gHVRDWIeUb
YKQ6jXZun41noW7Z4xPlRlTVZhSzd5to7oBLnMJZihEA2GxCVW0mDXSPhfal+VQOisePjGltbaj6G1rS
s8gf5KF0AukDoeW/o8bt/VOEi5CugZb+gUr1CRb3l19ObxlcAAAAAElFTkSuQmCC
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNNSwJBHIctKiJ6vQR9gujUV/C7BNGlU0S3
BqQwMzVN17bVtlw1S9vcdVNzNSt8KXrBSk8FQVHR+yWiyJp2YyQ3l7QHfpf5/Z9hhmEU5VCTK0qTZw0z
USGnyR3WaTB/J6r+Ro252sy+WDCcvXk5fIBQTOb+EzL7Jw/CRgQAoAaNliKU1VYvHzu4zX+LvxM/vvyY
dIcwNF6K3sn2pc4u3uXkQrj9szsVsdCFFCkEk6DlpOJk7j6gwRWcQIqUufBOXE76HWw5RiJFip1NcXJC
cTJCTJ6IGSlSdI6gavfqVVYshM+dPqutXiVSpPQbqWbCxz/KiWLE17F4eBqNSwGArNeS9Kolks5b/VtP
e9dvEjmZPc9bFqPRoTG8BSk/ALO5UTfPbJLsxue4zevtxfGGqYXwsI1LrtrZRHqa2aR1zmCPAsIqpPwA
DGSrwcGuM4lDqJ31BQS5FlXlGcAc7UaK3WaTR3CCpHkAlupQVZ4RPdUxRQUOuHQWCsePD2psTaiqDA3h
m+G2c1A8gfiB0HLlqKyO7lHcg4vXQEv/QKH4AvQCl0+zwKvQAAAAAElFTkSuQmCC
</value>
</data>
<data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -349,6 +338,17 @@
mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
TgDQASA1MVpwzwAAAABJRU5ErkJggg==
</value>
</data>
<data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95piIPURV1WR7mzR
SlNBok4K6k5dtabJKr8gaqEguvRBYcy9zpTGPIweOHCZc78zDAzJEudkYXBa0gd2eQ1mcVxMAPh91XoM
NqZgv69YhUt0XV/02NLJONia8pcOB8MMZ5CJtXQh7MTh+RLXUXqZJRD4F7Q3DswELA0lsJN4Dr6ZqVYe
LA07I0a7sxIYRg7tFoGlsSRisGRol7WncPNThnfX23y9XsW509L4cbuGc92oYib3JuH+x/1ZZZW45/GC
m0uTG6Lg8EDjR63vAsNY5rdXZrzArqzgMzxGG68PjTcZ/mbYBQZhKY+pO89h8z0NmHcqLOU5dDevBDK4
SKynK6sE4SgTa/n6WfInWMpnyh6A/4JB8EmGdqnmRv9k9usSIuQLjcrpDAPKoXQAAAAASUVORK5CYII=
</value>
</data>
<metadata name="taB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

View File

@@ -13,37 +13,17 @@ namespace FEQ0000
{
DataTable dt = null;
DataTable dtExcel = new DataTable();
fEquipment.eTabletype imptype = fEquipment.eTabletype.MOLD;
// fEquipment.eTabletype imptype = fEquipment.eTabletype.MOLD;
public fImpEquipment(fEquipment.eTabletype type_)
{
InitializeComponent();
this.FormClosed += __Closed;
imptype = type_;
switch (imptype)
{
case fEquipment.eTabletype.FOL:
dt = new dsEQ.EquipmentFDataTable();
break;
case fEquipment.eTabletype.MOLD:
dt = new dsEQ.EquipmentMEDataTable();
break;
case fEquipment.eTabletype.BUMP:
dt = new dsEQ.EquipmentBDataTable();
break;
case fEquipment.eTabletype.ING:
dt = new dsEQ.EETGW_EquipmentIngDataTable();
break;
case fEquipment.eTabletype.OTHER:
dt = new dsEQ.EETGW_EquipmentOtherDataTable();
break;
}
dt = new dsEQ.EETGW_EquipmentDataTable();
}
private void __Load(object sender, EventArgs e)
{
this.Text = string.Format("Data Import({0})", this.imptype);
this.Text = string.Format("Data Import({0})", "ALL");
var form = this as Form;
FCOMMON.Util.SetFormStatus(ref form, this.Name, true);
this.Show();
@@ -274,29 +254,8 @@ namespace FEQ0000
dlg = FCOMMON.Util.MsgQ("기존에 등록된 자료를 삭제할까요?\n자료를 추가하려면 아니오를 클릭하세요");
if (dlg == DialogResult.Yes)
{
switch (imptype)
{
case fEquipment.eTabletype.MOLD:
var taE = new dsEQTableAdapters.EquipmentMETableAdapter();
taE.DeleteData(dateStr);
break;
case fEquipment.eTabletype.BUMP:
var taB = new dsEQTableAdapters.EquipmentBTableAdapter();
taB.DeleteData(dateStr);
break;
case fEquipment.eTabletype.FOL:
var taF = new dsEQTableAdapters.EquipmentFTableAdapter();
taF.DeleteData(dateStr);
break;
case fEquipment.eTabletype.ING:
var taI = new dsEQTableAdapters.EETGW_EquipmentIngTableAdapter();
taI.DeleteData(dateStr);
break;
case fEquipment.eTabletype.OTHER:
var taO = new dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter();
taO.DeleteData(dateStr);
break;
}
var taE = new dsEQTableAdapters.EETGW_EquipmentTableAdapter();
taE.DeleteData(dateStr);
}
//12,13
@@ -384,7 +343,7 @@ namespace FEQ0000
newdr["memo"] = string.Empty;
newdr["flag"] = rcsflag; //rcs flag 210325
if (imptype == fEquipment.eTabletype.BUMP) newdr["param1"] = "8\"";
if (grp2.ToUpper() == "BUMP") newdr["param1"] = "8\"";
else newdr["param1"] = string.Empty;
dt.Rows.Add(newdr);
}
@@ -392,34 +351,11 @@ namespace FEQ0000
taLine.Update(lineTd);
lineTd.AcceptChanges();
switch (imptype)
{
case fEquipment.eTabletype.MOLD:
var taE = new dsEQTableAdapters.EquipmentMETableAdapter();
//taE.DeleteData(dateStr);
taE.Update((dsEQ.EquipmentMEDataTable)dt);
break;
case fEquipment.eTabletype.BUMP:
var taB = new dsEQTableAdapters.EquipmentBTableAdapter();
//taB.DeleteData(dateStr);
taB.Update((dsEQ.EquipmentBDataTable)dt);
break;
case fEquipment.eTabletype.FOL:
var taF = new dsEQTableAdapters.EquipmentFTableAdapter();
//taF.DeleteData(dateStr);
taF.Update((dsEQ.EquipmentFDataTable)dt);
break;
case fEquipment.eTabletype.ING:
var taI = new dsEQTableAdapters.EETGW_EquipmentIngTableAdapter();
//taI.DeleteData(dateStr);
taI.Update((dsEQ.EETGW_EquipmentIngDataTable)dt);
break;
case fEquipment.eTabletype.OTHER:
var taO = new dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter();
//taI.DeleteData(dateStr);
taO.Update((dsEQ.EETGW_EquipmentOtherDataTable)dt);
break;
}
var taO = new dsEQTableAdapters.EETGW_EquipmentTableAdapter();
//taI.DeleteData(dateStr);
taO.Update((dsEQ.EETGW_EquipmentDataTable)dt);
dt.AcceptChanges();
FCOMMON.Util.MsgI("Save OK");
}

View File

@@ -49,7 +49,7 @@
this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportB.rdlc";
this.rpv1.Location = new System.Drawing.Point(0, 0);
this.rpv1.Name = "rpv1";
this.rpv1.Size = new System.Drawing.Size(676, 487);
this.rpv1.Size = new System.Drawing.Size(905, 545);
this.rpv1.TabIndex = 0;
//
// dsEQ
@@ -81,13 +81,13 @@
//
this.taSum.ClearBeforeFill = true;
//
// rpt_equipmentB
// rpt_equipmentAll
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(676, 487);
this.ClientSize = new System.Drawing.Size(905, 545);
this.Controls.Add(this.rpv1);
this.Name = "rpt_equipmentB";
this.Name = "rpt_equipmentAll";
this.Text = "Equipment Report (Bump)";
this.Load += new System.EventHandler(this.rpt_equipment_Load);
((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit();

View File

@@ -39,9 +39,6 @@ namespace FEQ0000
var grpMod = gItemM.GroupBy(t => t.model);
foreach (var gItemMod in grpMod)
{
var grpLine = gItemMod.GroupBy(t => t.lineT + "-" + t.lineP);
foreach (var gItemLine in grpLine)
{
@@ -84,7 +81,7 @@ namespace FEQ0000
Microsoft.Reporting.WinForms.ReportDataSource DsEQ = new Microsoft.Reporting.WinForms.ReportDataSource();
DsEQ.Name = "DataSet1";
this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportA.rdlc";
this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.Equipment.ReportB.rdlc";
DsEQ.Value = dtSum;
this.rpv1.LocalReport.DataSources.Add(DsEQ);