장비목록 테이블 정리 및 버젼 정보 기록

Project/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호가 자동으로
 // 지정되도록 할 수 있습니다.
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("21.08.06.1020")]
+[assembly: AssemblyVersion("21.08.10.1450")]
-[assembly: AssemblyFileVersion("21.08.06.1020")]
+[assembly: AssemblyFileVersion("21.08.10.1450")]

Project/fMain.cs

@@ -153,16 +153,15 @@ namespace Project
             }
 
 
-
+            ////서버ON
-            //서버ON
+            //try
-            try
+            //{
-            {
+            //    this.server.Start(7979);//기본 79포트로 설정한다
-                this.server.Start(7979);//기본 79포트로 설정한다
+            //}
-            }
+            //catch (Exception ex)
-            catch (Exception ex)
+            //{
-            {
+            //    Console.WriteLine(ex.Message);
-                Console.WriteLine(ex.Message);
+            //}
-            }
 
         }
         void Update_Site()

SubProject/FEQ0000/Equipment/fEquipment.Designer.cs

@@ -30,12 +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();
             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);
-            this.dsEQ = new FEQ0000.dsEQ();
             this.bindingNavigatorCountItem = new System.Windows.Forms.ToolStripLabel();
             this.bindingNavigatorDeleteItem = new System.Windows.Forms.ToolStripButton();
             this.bindingNavigatorMoveFirstItem = new System.Windows.Forms.ToolStripButton();
@@ -54,23 +50,6 @@
             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.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();
             this.cm1 = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.autosizeColumnsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.label1 = new System.Windows.Forms.Label();
@@ -108,39 +87,43 @@
             this.toolStripDropDownButton1 = new System.Windows.Forms.ToolStripButton();
             this.toolStripDropDownButton2 = new System.Windows.Forms.ToolStripDropDownButton();
             this.장비모델생성공통07ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.taB = new FEQ0000.dsEQTableAdapters.EquipmentBTableAdapter();
-            this.bsF = new System.Windows.Forms.BindingSource(this.components);
-            this.taF = new FEQ0000.dsEQTableAdapters.EquipmentFTableAdapter();
-            this.tam = new FEQ0000.dsEQTableAdapters.TableAdapterManager();
-            this.taME = new FEQ0000.dsEQTableAdapters.EquipmentMETableAdapter();
-            this.bsME = new System.Windows.Forms.BindingSource(this.components);
-            this.bsIng = new System.Windows.Forms.BindingSource(this.components);
-            this.taIng = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentIngTableAdapter();
-            this.bsOther = new System.Windows.Forms.BindingSource(this.components);
-            this.taOther = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter();
-            this.taAll = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentTableAdapter();
             this.bsAll = new System.Windows.Forms.BindingSource(this.components);
+            this.dsEQ = new FEQ0000.dsEQ();
+            this.tam = new FEQ0000.dsEQTableAdapters.TableAdapterManager();
+            this.taAll = new FEQ0000.dsEQTableAdapters.EETGW_EquipmentTableAdapter();
+            this.primaryDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.ingDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.exceptDataGridViewCheckBoxColumn = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.assetDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.grpDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.typeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.flagDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.plantDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.grp2DataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.modelDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.linecodeDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.lineTDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.linePDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.serialDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.manuDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.version = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dvc_param = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.memoDataGridViewTextBoxColumn = new System.Windows.Forms.DataGridViewTextBoxColumn();
             ((System.ComponentModel.ISupportInitialize)(this.bn)).BeginInit();
             this.bn.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsB)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dv)).BeginInit();
             this.cm1.SuspendLayout();
             this.groupBox1.SuspendLayout();
             this.panel1.SuspendLayout();
             this.groupBox2.SuspendLayout();
             this.toolStrip1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsF)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsME)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsIng)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsOther)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsAll)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).BeginInit();
             this.SuspendLayout();
             // 
             // bn
             // 
             this.bn.AddNewItem = this.bindingNavigatorAddNewItem;
-            this.bn.BindingSource = this.bsB;
             this.bn.CountItem = this.bindingNavigatorCountItem;
             this.bn.DeleteItem = this.bindingNavigatorDeleteItem;
             this.bn.Dock = System.Windows.Forms.DockStyle.Bottom;
@@ -182,16 +165,6 @@
             this.bindingNavigatorAddNewItem.Size = new System.Drawing.Size(65, 22);
             this.bindingNavigatorAddNewItem.Text = "Add(&A)";
             // 
-            // bsB
-            // 
-            this.bsB.DataMember = "EquipmentB";
-            this.bsB.DataSource = this.dsEQ;
-            // 
-            // dsEQ
-            // 
-            this.dsEQ.DataSetName = "dsEQ";
-            this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
             // bindingNavigatorCountItem
             // 
             this.bindingNavigatorCountItem.Name = "bindingNavigatorCountItem";
@@ -234,7 +207,6 @@
             // 
             this.bindingNavigatorPositionItem.AccessibleName = "위치";
             this.bindingNavigatorPositionItem.AutoSize = false;
-            this.bindingNavigatorPositionItem.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.bindingNavigatorPositionItem.Name = "bindingNavigatorPositionItem";
             this.bindingNavigatorPositionItem.Size = new System.Drawing.Size(50, 23);
             this.bindingNavigatorPositionItem.Text = "0";
@@ -290,7 +262,6 @@
             // tbFilter
             // 
             this.tbFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tbFilter.Font = new System.Drawing.Font("맑은 고딕", 9F);
             this.tbFilter.Name = "tbFilter";
             this.tbFilter.Size = new System.Drawing.Size(150, 25);
             this.tbFilter.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tbFilter_KeyDown);
@@ -327,25 +298,26 @@
             this.dv.ColumnHeadersHeight = 30;
             this.dv.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing;
             this.dv.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
-            this.dataGridViewTextBoxColumn1,
+            this.primaryDataGridViewCheckBoxColumn,
-            this.ing,
+            this.ingDataGridViewCheckBoxColumn,
-            this.except,
+            this.exceptDataGridViewCheckBoxColumn,
-            this.plant,
+            this.assetDataGridViewTextBoxColumn,
-            this.flag,
+            this.grpDataGridViewTextBoxColumn,
-            this.type,
+            this.typeDataGridViewTextBoxColumn,
-            this.dataGridViewTextBoxColumn8,
+            this.flagDataGridViewTextBoxColumn,
-            this.dataGridViewTextBoxColumn5,
+            this.plantDataGridViewTextBoxColumn,
-            this.dataGridViewTextBoxColumn6,
+            this.grp2DataGridViewTextBoxColumn,
-            this.lineT,
+            this.modelDataGridViewTextBoxColumn,
-            this.lineP,
+            this.linecodeDataGridViewTextBoxColumn,
+            this.lineTDataGridViewTextBoxColumn,
+            this.linePDataGridViewTextBoxColumn,
+            this.serialDataGridViewTextBoxColumn,
+            this.manuDataGridViewTextBoxColumn,
+            this.version,
             this.dvc_param,
-            this.dataGridViewTextBoxColumn7,
+            this.memoDataGridViewTextBoxColumn});
-            this.dataGridViewTextBoxColumn4,
-            this.dataGridViewTextBoxColumn3,
-            this.primary,
-            this.memo});
             this.dv.ContextMenuStrip = this.cm1;
-            this.dv.DataSource = this.bsB;
+            this.dv.DataSource = this.bsAll;
             this.dv.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dv.Location = new System.Drawing.Point(0, 117);
             this.dv.Name = "dv";
@@ -353,129 +325,6 @@
             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";
-            this.plant.Width = 50;
-            // 
-            // flag
-            // 
-            this.flag.DataPropertyName = "flag";
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.flag.DefaultCellStyle = dataGridViewCellStyle2;
-            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;
-            // 
             // cm1
             // 
             this.cm1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
@@ -844,67 +693,137 @@
             this.장비모델생성공통07ToolStripMenuItem.Text = "장비모델생성(공통07)";
             this.장비모델생성공통07ToolStripMenuItem.Click += new System.EventHandler(this.장비모델생성공통07ToolStripMenuItem_Click);
             // 
-            // taB
+            // bsAll
             // 
-            this.taB.ClearBeforeFill = true;
+            this.bsAll.DataMember = "EETGW_Equipment";
+            this.bsAll.DataSource = this.dsEQ;
             // 
-            // bsF
+            // dsEQ
             // 
-            this.bsF.DataMember = "EquipmentF";
+            this.dsEQ.DataSetName = "dsEQ";
-            this.bsF.DataSource = this.dsEQ;
+            this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
-            // 
-            // taF
-            // 
-            this.taF.ClearBeforeFill = true;
             // 
             // tam
             // 
             this.tam.BackupDataSetBeforeUpdate = false;
-            this.tam.EETGW_EquipmentIngTableAdapter = null;
+            this.tam.Connection = null;
-            this.tam.EETGW_EquipmentOtherTableAdapter = null;
             this.tam.EETGW_EquipmentTableAdapter = null;
-            this.tam.EquipmentBTableAdapter = this.taB;
+            this.tam.EqDateListTableAdapter = null;
             this.tam.EquipmentFilterTableAdapter = null;
-            this.tam.EquipmentFTableAdapter = this.taF;
-            this.tam.EquipmentMETableAdapter = this.taME;
             this.tam.LineCodeTableAdapter = null;
             this.tam.UpdateOrder = FEQ0000.dsEQTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete;
             // 
-            // taME
-            // 
-            this.taME.ClearBeforeFill = true;
-            // 
-            // bsME
-            // 
-            this.bsME.DataMember = "EquipmentME";
-            this.bsME.DataSource = this.dsEQ;
-            // 
-            // bsIng
-            // 
-            this.bsIng.DataMember = "EETGW_EquipmentIng";
-            this.bsIng.DataSource = this.dsEQ;
-            // 
-            // taIng
-            // 
-            this.taIng.ClearBeforeFill = true;
-            // 
-            // bsOther
-            // 
-            this.bsOther.DataMember = "EETGW_EquipmentOther";
-            this.bsOther.DataSource = this.dsEQ;
-            // 
-            // taOther
-            // 
-            this.taOther.ClearBeforeFill = true;
-            // 
             // taAll
             // 
             this.taAll.ClearBeforeFill = true;
             // 
-            // bsAll
+            // primaryDataGridViewCheckBoxColumn
             // 
-            this.bsAll.DataMember = "EETGW_Equipment";
+            this.primaryDataGridViewCheckBoxColumn.DataPropertyName = "primary";
-            this.bsAll.DataSource = this.dsEQ;
+            this.primaryDataGridViewCheckBoxColumn.HeaderText = "primary";
+            this.primaryDataGridViewCheckBoxColumn.Name = "primaryDataGridViewCheckBoxColumn";
+            // 
+            // ingDataGridViewCheckBoxColumn
+            // 
+            this.ingDataGridViewCheckBoxColumn.DataPropertyName = "ing";
+            this.ingDataGridViewCheckBoxColumn.HeaderText = "잉여";
+            this.ingDataGridViewCheckBoxColumn.Name = "ingDataGridViewCheckBoxColumn";
+            // 
+            // exceptDataGridViewCheckBoxColumn
+            // 
+            this.exceptDataGridViewCheckBoxColumn.DataPropertyName = "except";
+            this.exceptDataGridViewCheckBoxColumn.HeaderText = "제외";
+            this.exceptDataGridViewCheckBoxColumn.Name = "exceptDataGridViewCheckBoxColumn";
+            // 
+            // assetDataGridViewTextBoxColumn
+            // 
+            this.assetDataGridViewTextBoxColumn.DataPropertyName = "asset";
+            this.assetDataGridViewTextBoxColumn.HeaderText = "asset";
+            this.assetDataGridViewTextBoxColumn.Name = "assetDataGridViewTextBoxColumn";
+            // 
+            // grpDataGridViewTextBoxColumn
+            // 
+            this.grpDataGridViewTextBoxColumn.DataPropertyName = "grp";
+            this.grpDataGridViewTextBoxColumn.HeaderText = "grp";
+            this.grpDataGridViewTextBoxColumn.Name = "grpDataGridViewTextBoxColumn";
+            // 
+            // typeDataGridViewTextBoxColumn
+            // 
+            this.typeDataGridViewTextBoxColumn.DataPropertyName = "type";
+            this.typeDataGridViewTextBoxColumn.HeaderText = "type";
+            this.typeDataGridViewTextBoxColumn.Name = "typeDataGridViewTextBoxColumn";
+            // 
+            // flagDataGridViewTextBoxColumn
+            // 
+            this.flagDataGridViewTextBoxColumn.DataPropertyName = "flag";
+            this.flagDataGridViewTextBoxColumn.HeaderText = "flag";
+            this.flagDataGridViewTextBoxColumn.Name = "flagDataGridViewTextBoxColumn";
+            // 
+            // plantDataGridViewTextBoxColumn
+            // 
+            this.plantDataGridViewTextBoxColumn.DataPropertyName = "plant";
+            this.plantDataGridViewTextBoxColumn.HeaderText = "plant";
+            this.plantDataGridViewTextBoxColumn.Name = "plantDataGridViewTextBoxColumn";
+            // 
+            // grp2DataGridViewTextBoxColumn
+            // 
+            this.grp2DataGridViewTextBoxColumn.DataPropertyName = "grp2";
+            this.grp2DataGridViewTextBoxColumn.HeaderText = "grp2";
+            this.grp2DataGridViewTextBoxColumn.Name = "grp2DataGridViewTextBoxColumn";
+            // 
+            // modelDataGridViewTextBoxColumn
+            // 
+            this.modelDataGridViewTextBoxColumn.DataPropertyName = "model";
+            this.modelDataGridViewTextBoxColumn.HeaderText = "model";
+            this.modelDataGridViewTextBoxColumn.Name = "modelDataGridViewTextBoxColumn";
+            // 
+            // linecodeDataGridViewTextBoxColumn
+            // 
+            this.linecodeDataGridViewTextBoxColumn.DataPropertyName = "linecode";
+            this.linecodeDataGridViewTextBoxColumn.HeaderText = "linecode";
+            this.linecodeDataGridViewTextBoxColumn.Name = "linecodeDataGridViewTextBoxColumn";
+            // 
+            // lineTDataGridViewTextBoxColumn
+            // 
+            this.lineTDataGridViewTextBoxColumn.DataPropertyName = "lineT";
+            this.lineTDataGridViewTextBoxColumn.HeaderText = "lineT";
+            this.lineTDataGridViewTextBoxColumn.Name = "lineTDataGridViewTextBoxColumn";
+            // 
+            // linePDataGridViewTextBoxColumn
+            // 
+            this.linePDataGridViewTextBoxColumn.DataPropertyName = "lineP";
+            this.linePDataGridViewTextBoxColumn.HeaderText = "lineP";
+            this.linePDataGridViewTextBoxColumn.Name = "linePDataGridViewTextBoxColumn";
+            // 
+            // serialDataGridViewTextBoxColumn
+            // 
+            this.serialDataGridViewTextBoxColumn.DataPropertyName = "serial";
+            this.serialDataGridViewTextBoxColumn.HeaderText = "serial";
+            this.serialDataGridViewTextBoxColumn.Name = "serialDataGridViewTextBoxColumn";
+            // 
+            // manuDataGridViewTextBoxColumn
+            // 
+            this.manuDataGridViewTextBoxColumn.DataPropertyName = "manu";
+            this.manuDataGridViewTextBoxColumn.HeaderText = "manu";
+            this.manuDataGridViewTextBoxColumn.Name = "manuDataGridViewTextBoxColumn";
+            // 
+            // version
+            // 
+            this.version.DataPropertyName = "version";
+            this.version.HeaderText = "version";
+            this.version.Name = "version";
+            // 
+            // dvc_param
+            // 
+            this.dvc_param.DataPropertyName = "param1";
+            this.dvc_param.HeaderText = "param1";
+            this.dvc_param.Name = "dvc_param";
+            // 
+            // memoDataGridViewTextBoxColumn
+            // 
+            this.memoDataGridViewTextBoxColumn.DataPropertyName = "memo";
+            this.memoDataGridViewTextBoxColumn.HeaderText = "memo";
+            this.memoDataGridViewTextBoxColumn.Name = "memoDataGridViewTextBoxColumn";
             // 
             // fEquipment
             // 
@@ -921,8 +840,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.bn)).EndInit();
             this.bn.ResumeLayout(false);
             this.bn.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsB)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dv)).EndInit();
             this.cm1.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
@@ -933,11 +850,8 @@
             this.groupBox2.PerformLayout();
             this.toolStrip1.ResumeLayout(false);
             this.toolStrip1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.bsF)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsME)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsIng)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bsOther)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.bsAll)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -945,7 +859,6 @@
 
         #endregion
 
-        private System.Windows.Forms.BindingSource bsB;
         private System.Windows.Forms.BindingNavigator bn;
         private System.Windows.Forms.ToolStripButton bindingNavigatorAddNewItem;
         private System.Windows.Forms.ToolStripLabel bindingNavigatorCountItem;
@@ -961,7 +874,6 @@
         private System.Windows.Forms.ToolStripButton equipmentBindingNavigatorSaveItem;
         private System.Windows.Forms.DataGridView dv;
         private dsEQ dsEQ;
-        private dsEQTableAdapters.EquipmentBTableAdapter taB;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.ComboBox cbTeamPart;
         private System.Windows.Forms.Label label2;
@@ -977,11 +889,7 @@
         private System.Windows.Forms.RadioButton radexpa;
         private System.Windows.Forms.RadioButton radexpn;
         private System.Windows.Forms.Panel panel1;
-        private System.Windows.Forms.BindingSource bsF;
-        private dsEQTableAdapters.EquipmentFTableAdapter taF;
         private dsEQTableAdapters.TableAdapterManager tam;
-        private dsEQTableAdapters.EquipmentMETableAdapter taME;
-        private System.Windows.Forms.BindingSource bsME;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripLabel toolStripLabel1;
         private System.Windows.Forms.ToolStripTextBox tbFilter;
@@ -1002,12 +910,8 @@
         private System.Windows.Forms.ToolStripButton toolStripButton7;
         private System.Windows.Forms.ToolStripDropDownButton toolStripDropDownButton2;
         private System.Windows.Forms.ToolStripMenuItem 장비모델생성공통07ToolStripMenuItem;
-        private System.Windows.Forms.BindingSource bsIng;
-        private dsEQTableAdapters.EETGW_EquipmentIngTableAdapter taIng;
         private System.Windows.Forms.ToolStripButton toolStripButton1;
         private System.Windows.Forms.ToolStripProgressBar prb1;
-        private System.Windows.Forms.BindingSource bsOther;
-        private dsEQTableAdapters.EETGW_EquipmentOtherTableAdapter taOther;
         private System.Windows.Forms.ComboBox cmbPlant;
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.GroupBox groupBox2;
@@ -1017,21 +921,29 @@
         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 flag;
-        private System.Windows.Forms.DataGridViewTextBoxColumn type;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn8;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn5;
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn6;
-        private System.Windows.Forms.DataGridViewTextBoxColumn lineT;
-        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.DataGridViewCheckBoxColumn primaryDataGridViewCheckBoxColumn;
-        private System.Windows.Forms.DataGridViewTextBoxColumn memo;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn ingDataGridViewCheckBoxColumn;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn exceptDataGridViewCheckBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn assetDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn grpDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn typeDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn flagDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn plantDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn grp2DataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn modelDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn linecodeDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn lineTDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn linePDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn serialDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn manuDataGridViewTextBoxColumn;
+        private System.Windows.Forms.DataGridViewTextBoxColumn version;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dvc_param;
+        private System.Windows.Forms.DataGridViewTextBoxColumn memoDataGridViewTextBoxColumn;
     }
 }

SubProject/FEQ0000/Equipment/fEquipment.cs

@@ -66,21 +66,21 @@ namespace FEQ0000
             //    dvc_param.Visible = false;
             //}
             //else
-            if (dataType == eTabletype.ALL)
+            //if (dataType == eTabletype.ALL)
-            {
+            //{
 
                 tableName = "EETGW_Equipment";
-                this.dsEQ.EETGW_EquipmentOther.TableNewRow += Equipment_TableNewRow;
+                //this.dsEQ.EETGW_EquipmentOther.TableNewRow += Equipment_TableNewRow;
                 dvc_param.Visible = false;
                 panel1.Visible = true; //필터창보이게
-            }
+            //}
-            else
+            //else
-            {
+            //{
 
-                tableName = "EquipmentB";
+            //    tableName = "EquipmentB";
-                this.dsEQ.EquipmentB.TableNewRow += Equipment_TableNewRow;
+            //    //this.dsEQ.EquipmentB.TableNewRow += Equipment_TableNewRow;
-                dvc_param.Visible = true;
+            //    dvc_param.Visible = true;
-            }
+            //}
             this.FormClosed += fEquipment_FormClosed;
 
         }
@@ -97,8 +97,8 @@ namespace FEQ0000
             var taDateList = new dsEQTableAdapters.EqDateListTableAdapter();
             DataTable dtList = null;
 
-            if (dataType == eTabletype.ALL) dtList = taDateList.GetDateListAll();
+            if (dataType == eTabletype.ALL) dtList = taDateList.GetData();
-            else dtList = taDateList.GetDateListME();
+            else dtList = taDateList.GetData();
 
             this.cmbDate.Items.Clear();
             if (dtList != null)
@@ -160,11 +160,7 @@ namespace FEQ0000
         private void equipmentBindingNavigatorSaveItem_Click(object sender, EventArgs e)
         {
             this.Validate();
-            this.bsB.EndEdit();
+            this.bsAll.EndEdit();
-            this.bsF.EndEdit();
-            this.bsME.EndEdit();
-            this.bsIng.EndEdit();
-            this.bsOther.EndEdit();
 
             try
             {

SubProject/FEQ0000/Equipment/fEquipment.resx

@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <metadata name="bn.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>81, 17</value>
+    <value>17, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="bindingNavigatorAddNewItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -133,12 +133,6 @@
         rkJggg==
 </value>
   </data>
-  <metadata name="bsB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>147, 17</value>
-  </metadata>
   <data name="bindingNavigatorDeleteItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -228,41 +222,20 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="ing.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+  <metadata name="version.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="except.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="plant.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>
-  <metadata name="type.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="lineT.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="lineP.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="dvc_param.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="primary.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
-  <metadata name="memo.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="cm1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>342, 17</value>
+  </metadata>
+  <metadata name="bsAll.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>493, 17</value>
+  </metadata>
+  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>83, 17</value>
   </metadata>
   <metadata name="toolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>662, 17</value>
+    <value>236, 17</value>
   </metadata>
   <data name="btImport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -271,17 +244,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
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE4SURBVDhPnZJLS8NAFIVHf2dbzGRt95piIKlSV1URd7Zo
-        pakgUScFdaeuWtNklV8Q20Wh6NIHhTH3OlMa8zB64MBlzv3OMDAkS5yTlcFFSR/Y5S2YxXExAeD3VSsM
-        zDnY7ytW4RJd11c9tnY+Drbn/KXDwTDDGWRiLV0IO3F4ucR1lF5mCQT+Ne2Ng50ELA0lsJN4Dr6ZqVYe
-        LA07I0a7ixIYRg7tFoGlsSRisGRol7VJWP+U4ePdLq+bVZw7LY2ftWs4m0YVM7k3DQ8/ni4rm8S9ihfc
-        3zS4IQpOjjV+2vouMIx1/nDbiBfYlQ18hsdo8/W5+SbD3wy7wCAs5TF1bxYevacBy06FpTyH7ueVQAYX
-        ifV0ZZUgHGViLV8/S/4ES/lMOQDwXzAIPsnQLtXc6J8sfl1ChHwB8t3o2JbHURQAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -291,11 +253,22 @@
         s9wremanoeO0rt072re8/d+x+e3/uO5j7VAtCFDaOU+1vHtOeUXfXCWoEApI6DneBTMgofNoJ1QYASq6
         Z+dBmVgBQS9Uds9NhjKxgg37L5nsPXv33P5zd8+u3XPRCCqMAHUTF5Qv2namZNG200AaE28+dO3Uw9ef
         /oPwjhM3ZzPEtu0WTuk/tbNo3rVrCV3Hl7TNXrvy////jFDzMMDmo1dCjlx//ByEtxy+GcQQ23N4YufW
-        d/+7t3/4X7/u6p+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
+        d/+7t3/4X7/uyp+iCVsPQdXiBMv2HBdftPOCGJgT23MMzYBtR8ASeIBv5UbxwPqdUANAXug7uStv9uWb
         IC+0zli9rr6+ngksiQVEdxwNKZh/42nx7CtPYjsOB0GFEWDG6gPllV2zy0BpARtO7913CuRaEE7qPzEb
         qg0Blmw9kwplYgWxnftNMqacvpA+9cz56M49mNG4aMfpHCgTK1i16grb5sNX+4C4F8SGCiPA4u2n1Bdv
         O527ePtpSagQCthy/HrnvRcf/oPw1mPXMfMCCMzZcIR34fYz7ou2nwlFxxsPXd0IMwBkGFQL8QDVC1fY
-        AO4qLwXbx/l9AAAAAElFTkSuQmCC
+        AOn3LwMH9jJlAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripButton7.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVDhPnZJLS8NAFIVHf2dbzGRt95piMOmirqoi7qxo
+        pakgUScFdaeuWtNklR8gIy4KRZc+KIy515nSmIfRAwcuc+53hoEheRKCLA3PKubQrW7ALI/LCYBwoDuP
+        0eYMHA40p3SJaZrLAVs55ZE9Ey9dAYYZziCTa9lC2EvCiyW+p/VzSyAIL2mfR80UrAwlsJN6Dr6Z6U4R
+        rAw7Y0Z78xIYxh7tlYGVsSRmsGTkVo1nbn2q8P5mSzTtOs7djiFODhs421YdM7U34XsfD+e1deJfJAtu
+        r1rCkgVHB4Y47nwXWNaquLtuJQvc2ho+I2C0/frUflPhb4ZdYBBWCpi+PeX771nAojNhpcCjO0UlkMFF
+        cj1beSUIx5lcK9bPkj/BSiHTdgH8FwyCTzJyKw0//ifzX5cSIV9X/+ikBDsqowAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="toolStripButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -313,14 +286,14 @@
   <data name="btRefresh.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGlSURBVDhPlZNbLwNBGIZLEBHHG4lfIK78hf4XibhxJeLO
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGkSURBVDhPlZNNLwNBHIdLEBGvF4lPIE6+Qr+LRFycRNxM
-        JA2p6kkPtta2lm5V6Vrd7aqy2qbSA6HSSl2RIBLifCNCVMeujOjqRutJ3pt5v2cyk8moKqEl19RW3yZm
+        0pCqaqsvttaWpdvq0lrdtapsqyF9IbRK6kQ0LsRLuYgQ1bEr07DtRutJfpf5/Z/JTCajqoSWXFdb6G3M
-        pTY8Vm/YqMMC3aj6Gy222GGnI6Fw/uYl9wChlOx9EbKZkwdxIwIAUIdGyxHLWodfiBzeFr7E34nlLj+m
+        Qm25LMtBgw7zd6Pqb7SYu8PmCweCmbvX0xyEUtKPBcgmL3LiRgQAoA6NliOWtXavEE7d57/F0kROrj+n
-        vBsYGi/H5OEGUmcX70ryd/jM2Z2GWOpBihyCTTBKUmmydx/QvBgyIEXOfHgvpiT9DrYaIZEix8WleCWh
+        l7cwNF6O0cUNxLPZDyW5GD6ZfdAQnh6kyCHYKKMk/U764ROa3IEppMhZDB5GlKTSYGthEily5rk4ryT8
-        NFkxVt+WHSlyjO6QZv/qVVH8jnB8+qx1+NVIkTNooVoJWnhUEqVIrzPtExg0LgcAslFPMuu2rXTBEdh5
+        TlqMhd6xIUWOwRnQHN28KYrFCOeXL1q7V40UOYNmqpXwCU9KohTpdWZogUHjcgAgG/Uks2neSeTt/v3n
-        Orh+k8nJ/Hlhenl7e2QCb0PKD8BubzYusHFXIFqcdPr9/TjeZFsKjzr55LqLS6Rn2Dhj9IT6VBDWIOUH
+        49t3mRzLXOVnVkKhkQm8DSk/AJut2bDE7hFMqDDp8Hr7cbzJ6gmOOvjY5jwXTcyye4zBFehTQViDlB+A
-        YCbbzW4uyiZyUD9HB0W5HlWVGcLcnRaK2+WSR9BAMgIAKw2oqsyYieqyUcFDPp2H4vFjwzpnC6qqQ0fQ
+        iWw3ObldNnoK9Qu+DVGuR1VlhjBnp5niDrjYGZwiGQGA1QZUVWbMSHVZqY0Un8hA8fiRYZ2jBVXVoSN8
-        s/zuMZROIH0gtFw9Goe7dxz34dI10NI/UKk+AdEclz8RrkwTAAAAAElFTkSuQmCC
+        c/zBOZROIH0gtFw9GruzdxyncekaaOkfqFRfrjaXL4oXSHsAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="toolStripDropDownButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -348,40 +321,13 @@
         TgDQASA1MVpwzwAAAABJRU5ErkJggg==
 </value>
   </data>
-  <metadata name="taB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>227, 17</value>
+    <value>83, 17</value>
-  </metadata>
-  <metadata name="bsF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>289, 17</value>
-  </metadata>
-  <metadata name="taF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>359, 17</value>
   </metadata>
   <metadata name="tam.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>427, 17</value>
+    <value>163, 17</value>
-  </metadata>
-  <metadata name="taME.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>582, 17</value>
-  </metadata>
-  <metadata name="bsME.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>500, 17</value>
-  </metadata>
-  <metadata name="bsIng.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>92, 56</value>
-  </metadata>
-  <metadata name="taIng.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>231, 56</value>
-  </metadata>
-  <metadata name="bsOther.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>311, 56</value>
-  </metadata>
-  <metadata name="taOther.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>407, 56</value>
   </metadata>
   <metadata name="taAll.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>501, 56</value>
+    <value>417, 17</value>
-  </metadata>
-  <metadata name="bsAll.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>577, 56</value>
   </metadata>
 </root>

SubProject/FEQ0000/Equipment/fImpEquipment.cs

@@ -278,8 +278,9 @@ namespace FEQ0000
                 i += 1;
                 if (i % 1000 == 0) Application.DoEvents();
 
-                var linecode = dr[12].ToString();
+                var version = dr[11].ToString();
-                var linedesc = dr[13].ToString();
+                var linecode = dr[12+1].ToString();
+                var linedesc = dr[13+1].ToString();
                 var lineT = string.Empty;
                 var lineP = string.Empty;
                 var grp2 = string.Empty;
@@ -359,6 +360,7 @@ namespace FEQ0000
                 newdr["except"] = false;
                 newdr["memo"] = string.Empty;
                 newdr["flag"] = rcsflag;  //rcs flag  210325
+                newdr["version"] = version; //210810
 
                 if (grp2.ToUpper() == "BUMP") newdr["param1"] = "8\"";
                 else newdr["param1"] = string.Empty;

SubProject/FEQ0000/Equipment/rpt_equipmentAll.Designer.cs

@@ -28,27 +28,26 @@
         /// </summary>
         private void InitializeComponent()
         {
-            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource1 = new Microsoft.Reporting.WinForms.ReportDataSource();
+            this.components = new System.ComponentModel.Container();
+            Microsoft.Reporting.WinForms.ReportDataSource reportDataSource2 = new Microsoft.Reporting.WinForms.ReportDataSource();
             this.rpv1 = new Microsoft.Reporting.WinForms.ReportViewer();
             this.dsEQ = new FEQ0000.dsEQ();
-            this.taB = new FEQ0000.dsEQTableAdapters.vEquStockBTableAdapter();
+            this.bs = new System.Windows.Forms.BindingSource(this.components);
-            this.taF = new FEQ0000.dsEQTableAdapters.vEquStockFTableAdapter();
+            this.ta = new FEQ0000.dsEQTableAdapters.vEquStockAllTableAdapter();
-            this.taE = new FEQ0000.dsEQTableAdapters.vEquStockMETableAdapter();
-            this.taI = new FEQ0000.dsEQTableAdapters.vEquStockIngTableAdapter();
-            this.taO = new FEQ0000.dsEQTableAdapters.vEquStockOtherTableAdapter();
-            this.taSum = new FEQ0000.dsEQTableAdapters.vEquStockSummaryTableAdapter();
             ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).BeginInit();
             this.SuspendLayout();
             // 
             // rpv1
             // 
             this.rpv1.Dock = System.Windows.Forms.DockStyle.Fill;
-            reportDataSource1.Name = "DataSet1";
+            reportDataSource2.Name = "DataSet1";
-            reportDataSource1.Value = null;
+            reportDataSource2.Value = null;
-            this.rpv1.LocalReport.DataSources.Add(reportDataSource1);
+            this.rpv1.LocalReport.DataSources.Add(reportDataSource2);
             this.rpv1.LocalReport.ReportEmbeddedResource = "FEQ0000.ReportB.rdlc";
             this.rpv1.Location = new System.Drawing.Point(0, 0);
             this.rpv1.Name = "rpv1";
+            this.rpv1.ServerReport.BearerToken = null;
             this.rpv1.Size = new System.Drawing.Size(905, 545);
             this.rpv1.TabIndex = 0;
             // 
@@ -57,29 +56,14 @@
             this.dsEQ.DataSetName = "dsEQ";
             this.dsEQ.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema;
             // 
-            // taB
+            // bs
             // 
-            this.taB.ClearBeforeFill = true;
+            this.bs.DataMember = "vEquStockAll";
+            this.bs.DataSource = this.dsEQ;
             // 
-            // taF
+            // ta
             // 
-            this.taF.ClearBeforeFill = true;
+            this.ta.ClearBeforeFill = true;
-            // 
-            // taE
-            // 
-            this.taE.ClearBeforeFill = true;
-            // 
-            // taI
-            // 
-            this.taI.ClearBeforeFill = true;
-            // 
-            // taO
-            // 
-            this.taO.ClearBeforeFill = true;
-            // 
-            // taSum
-            // 
-            this.taSum.ClearBeforeFill = true;
             // 
             // rpt_equipmentAll
             // 
@@ -91,6 +75,7 @@
             this.Text = "Equipment Report (Bump)";
             this.Load += new System.EventHandler(this.rpt_equipment_Load);
             ((System.ComponentModel.ISupportInitialize)(this.dsEQ)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.bs)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -99,11 +84,7 @@
 
         private Microsoft.Reporting.WinForms.ReportViewer rpv1;
         private dsEQ dsEQ;
-        private dsEQTableAdapters.vEquStockBTableAdapter taB;
+        private System.Windows.Forms.BindingSource bs;
-        private dsEQTableAdapters.vEquStockFTableAdapter taF;
+        private dsEQTableAdapters.vEquStockAllTableAdapter ta;
-        private dsEQTableAdapters.vEquStockMETableAdapter taE;
-        private dsEQTableAdapters.vEquStockIngTableAdapter taI;
-        private dsEQTableAdapters.vEquStockOtherTableAdapter taO;
-        private dsEQTableAdapters.vEquStockSummaryTableAdapter taSum;
     }
 }

SubProject/FEQ0000/Equipment/rpt_equipmentAll.resx

@@ -120,22 +120,10 @@
   <metadata name="dsEQ.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="taB.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="bs.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>97, 17</value>
   </metadata>
-  <metadata name="taF.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="ta.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>166, 17</value>
+    <value>161, 17</value>
-  </metadata>
-  <metadata name="taE.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>234, 17</value>
-  </metadata>
-  <metadata name="taI.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>303, 17</value>
-  </metadata>
-  <metadata name="taO.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>369, 17</value>
-  </metadata>
-  <metadata name="taSum.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>441, 17</value>
   </metadata>
 </root>

SubProject/FEQ0000/dsEQ.xss

@@ -4,24 +4,13 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="972" ViewPortY="169" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
-    <Shape ID="DesignTable:EqDateList" ZOrder="16" X="70" Y="69" Height="420" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
+    <Shape ID="DesignTable:EqDateList" ZOrder="5" X="71" Y="68" Height="96" Width="207" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="46" />
-    <Shape ID="DesignTable:EquipmentF" ZOrder="15" X="347" Y="70" Height="324" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EquipmentFilter" ZOrder="4" X="576" Y="435" Height="229" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:EquipmentB" ZOrder="14" X="632" Y="70" Height="324" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:LineCode" ZOrder="1" X="324" Y="460" Height="229" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:EquipmentME" ZOrder="13" X="918" Y="70" Height="324" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:EETGW_Equipment" ZOrder="2" X="305" Y="68" Height="324" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vEquStockB" ZOrder="12" X="1215" Y="70" Height="248" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:vEquStockAll" ZOrder="3" X="595" Y="91" Height="286" Width="221" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:vEquStockF" ZOrder="11" X="1498" Y="70" Height="248" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:vEquStockME" ZOrder="10" X="1780" Y="70" Height="248" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:EquipmentFilter" ZOrder="9" X="2074" Y="70" Height="229" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:LineCode" ZOrder="8" X="1264" Y="689" Height="229" Width="199" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:EETGW_EquipmentIng" ZOrder="7" X="476" Y="456" Height="324" Width="274" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vEquStockIng" ZOrder="6" X="1865" Y="364" Height="248" Width="225" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:EETGW_EquipmentOther" ZOrder="5" X="823" Y="458" Height="324" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vEquStockOther" ZOrder="4" X="1333" Y="363" Height="248" Width="239" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:vEquStockSummary" ZOrder="3" X="1589" Y="402" Height="286" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:EETGW_Equipment" ZOrder="2" X="369" Y="428" Height="324" Width="255" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:vEquStockAll" ZOrder="1" X="1678" Y="733" Height="286" Width="221" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
   </Shapes>
   <Connectors />
 </DiagramLayout>

SubProject/FPJ0000/JobReport_/fJobReport_Add.cs

@@ -176,15 +176,15 @@ namespace FPJ0000.JobReport_
             this.Show();
             Application.DoEvents();
 
-            if (this.richTextBoxEx1.Text.Trim() != "")
+            //if (this.richTextBoxEx1.Text.Trim() != "")
-            {
+            //{
-                this.richTextBoxEx1.Focus();
+            //    this.richTextBoxEx1.Focus();
-            }
+            //}
-            else
+            //else
-            {
+            //{
-                tbProject.Focus();
+            cmbRequest.Focus();
-                tbProject.SelectAll();
+            //    tbProject.SelectAll();
-            }
+            //}
             tbProject.Tag = tbProject.Text;
 
             //  if (string.IsNullOrEmpty(richTextBox1.Text)) richTextBox1.Text = dr.description;
@@ -490,7 +490,7 @@ namespace FPJ0000.JobReport_
 
                 //프로젝트 제목 서포트
                 var dr0 = db.EETGW_DocuForm.Where(t => t.gcode == FCOMMON.info.Login.gcode && t.cate == "J2" && t.title == formname).FirstOrDefault();
-                if(dr0 != null)
+                if (dr0 != null)
                 {
                     var rtx = new RichTextBox();
                     rtx.Rtf = dr0.body;