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

UAS-MES/FunctionCode/Make/Make_PalletCollection.Designer.cs

@@ -47,8 +47,8 @@
             this.pa_prodcode = new UAS_MES.CustomControl.ValueLabel.ValueLabel();
             this.Clean = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.OperateResult = new UAS_MES.CustomControl.RichText.RichTextAutoBottom();
-            this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
-            this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
+            this.pa_outboxcode = new UAS_MES.CustomControl.TextBoxWithIcon.SnCollectionBox();
             this.Printlab = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.ReleasePallet = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.NewPalletCode = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
@@ -571,8 +571,8 @@
         private CustomControl.ButtonUtil.NormalButton NewPalletCode;
         private CustomControl.ButtonUtil.NormalButton ReleasePallet;
         private CustomControl.ButtonUtil.NormalButton Printlab;
-        private CustomControl.TextBoxWithIcon.EnterTextBox pa_outboxcode;
-        private CustomControl.TextBoxWithIcon.EnterTextBox outboxcode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox pa_outboxcode;
+        private CustomControl.TextBoxWithIcon.SnCollectionBox outboxcode;
         private System.Windows.Forms.Label outboxcode_label;
         private CustomControl.RichText.RichTextAutoBottom OperateResult;
         private CustomControl.ButtonUtil.NormalButton Clean;

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -252,7 +252,6 @@ namespace UAS_MES.Make
         private void bc_groupcode_SelectedIndexChanged(object sender, EventArgs e)
         {
             LoadBadCodeListView();
-            Filter.Text = "";
         }
 
         /// <summary>
@@ -278,6 +277,7 @@ namespace UAS_MES.Make
         /// </summary>
         private void LoadBadCodeListView()
         {
+            Console.WriteLine(bc_groupcode.SelectedValue);
             object bg_code = bc_groupcode.SelectedValue;
             sql.Clear();
             sql.Append("select bg_code||':'||bg_name bg_code,bc_code,bc_name,'' bc_remark from badgroupdetail ");