출력물 동적으로 데이터소스 연결 FOL 데이터 입력하여 출력 확인 - 매크로를 서로 공유하도록 함 , 매크로편집화면 변

Project/_Management/fEquipment.cs

@@ -21,19 +21,20 @@ namespace Project._Management
             BUMP
         }
         string tableName = string.Empty;
+        eTabletype dataType = eTabletype.FOL;
 
-        public fEquipment(eTabletype type)
+        public fEquipment(eTabletype type_)
         {
             InitializeComponent();
-
-            if (type == eTabletype.MOLD)
+            dataType = type_;
+            if (dataType == eTabletype.MOLD)
             {
                 rade.Checked = true;
                 tableName = "EquipmentME";
                 this.dsEQ.EquipmentME.TableNewRow += Equipment_TableNewRow;
                 dvc_param.Visible = false;
             }
-            else if (type == eTabletype.FOL)
+            else if (dataType == eTabletype.FOL)
             {
                 radf.Checked = true;
                 tableName = "EquipmentF";
@@ -56,14 +57,8 @@ namespace Project._Management
             Pub.SetFormStatus(ref form, this.Name + this.tableName, false);
         }
 
-       
-        private void __Load(object sender, EventArgs e)
+       void RefreshDate()
         {
-            var form = this as Form;
-            Pub.SetFormStatus(ref form,  this.Name + this.tableName,true);
-            this.Show();
-            Application.DoEvents();
-
             //등록된 날짜 목록을 가져온다.
             var taDateList = new dsEQTableAdapters.EqDateListTableAdapter();
             DataTable dtList = null;
@@ -79,6 +74,15 @@ namespace Project._Management
                 }
             }
             if (this.cmbDate.Items.Count > 0) this.cmbDate.SelectedIndex = 0;
+        }
+        private void __Load(object sender, EventArgs e)
+        {
+            var form = this as Form;
+            Pub.SetFormStatus(ref form,  this.Name + this.tableName,true);
+            this.Show();
+            Application.DoEvents();
+
+            RefreshDate();
 
             //목록을 가져온다.
             var grpList = Manager.DatabaseManager.getEQGroupLiist("grp", this.tableName);
@@ -236,7 +240,7 @@ namespace Project._Management
 
         private void button1_Click(object sender, EventArgs e)
         {
-            _Management.rpt_equipmentB f = new _Management.rpt_equipmentB(this.cmbDate.Text);
+            _Management.rpt_equipmentB f = new _Management.rpt_equipmentB(dataType, this.cmbDate.Text);
             f.Show();
         }
 
@@ -308,5 +312,12 @@ namespace Project._Management
             }
             
         }
+
+        private void button2_Click(object sender, EventArgs e)
+        {
+            _Management.fImpEquipment f = new _Management.fImpEquipment(dataType);
+            f.ShowDialog();
+            RefreshDate();
+        }
     }
 }