Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/CustomControl/TextBoxWithIcon/SnCollectionBox.Designer.cs

@@ -33,21 +33,7 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
             components = new System.ComponentModel.Container();
         }
 
-        public override string Text
-        {
-            get
-            {
-                if (SystemInf.UpperCollection)
-                    return base.Text.ToUpper();
-                else
-                    return base.Text;
-            }
-
-            set
-            {
-                base.Text = value;
-            }
-        }
+      
 
         #endregion
     }

UAS-MES/CustomControl/TextBoxWithIcon/SnCollectionBox.cs

@@ -6,6 +6,7 @@ using System.Data;
 using System.Linq;
 using System.Text;
 using System.Windows.Forms;
+using UAS_MES.Entity;
 
 namespace UAS_MES.CustomControl.TextBoxWithIcon
 {
@@ -15,5 +16,21 @@ namespace UAS_MES.CustomControl.TextBoxWithIcon
         {
             InitializeComponent();
         }
+
+        public override string Text
+        {
+            get
+            {
+                if (SystemInf.UpperCollection)
+                    return base.Text.ToUpper();
+                else
+                    return base.Text;
+            }
+
+            set
+            {
+                base.Text = value;
+            }
+        }
     }
 }