Merge remote-tracking branch 'refs/remotes/origin/master'

UAS-MES/FunctionCode/Make/Make_ColorBoxLabelPrint.cs

@@ -115,6 +115,7 @@ namespace UAS_MES.Make
                                     OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Green);
                                     mcd_okqty.Text = int.Parse(mcd_okqty.Text) + 1 + "";
                                     mcd_remainqty.Text = int.Parse(mcd_remainqty.Text) - 1 + "";
+                                    sncode.Text = "";
                                 }
                                 else
                                 {

UAS-MES/FunctionCode/SystemSetting/SystemSetting_LabelMaintain.Designer.cs

@@ -49,7 +49,7 @@
             this.LabelParam = new System.Windows.Forms.Panel();
             this.label2 = new System.Windows.Forms.Label();
             this.pagination1 = new UAS_MES.CustomControl.Pagination.PaginationDbFind();
-            this.pr_code2 = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.pr_code2 = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Save = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.la_type = new UAS_MES.CustomControl.ComBoxWithFocus.ComBoxWithFocus();
             this.la_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
@@ -73,8 +73,8 @@
             this.pr_code = new UAS_MES.CustomControl.TextBoxWithIcon.SearchTextBox();
             this.UpdateGrid = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             this.Screen = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
-            this.pr_spec = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
-            this.pr_detail = new UAS_MES.CustomControl.TextBoxWithIcon.MaCodeTextBox();
+            this.pr_spec = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
+            this.pr_detail = new UAS_MES.CustomControl.TextBoxWithIcon.EnterTextBox();
             this.Delete = new UAS_MES.CustomControl.ButtonUtil.NormalButton();
             ((System.ComponentModel.ISupportInitialize)(this.LabelDataGridView)).BeginInit();
             this.SuspendLayout();
@@ -266,7 +266,6 @@
             this.pr_code2.BackColor = System.Drawing.Color.White;
             this.pr_code2.ID = null;
             this.pr_code2.Location = new System.Drawing.Point(103, 14);
-            this.pr_code2.Lock = false;
             this.pr_code2.Name = "pr_code2";
             this.pr_code2.Power = null;
             this.pr_code2.Size = new System.Drawing.Size(150, 21);
@@ -557,7 +556,6 @@
             this.pr_spec.BackColor = System.Drawing.Color.White;
             this.pr_spec.ID = null;
             this.pr_spec.Location = new System.Drawing.Point(675, 12);
-            this.pr_spec.Lock = false;
             this.pr_spec.Name = "pr_spec";
             this.pr_spec.Power = null;
             this.pr_spec.Size = new System.Drawing.Size(150, 21);
@@ -573,7 +571,6 @@
             this.pr_detail.BackColor = System.Drawing.Color.White;
             this.pr_detail.ID = null;
             this.pr_detail.Location = new System.Drawing.Point(373, 13);
-            this.pr_detail.Lock = false;
             this.pr_detail.Name = "pr_detail";
             this.pr_detail.Power = null;
             this.pr_detail.Size = new System.Drawing.Size(150, 21);
@@ -651,10 +648,10 @@
         }
 
         #endregion
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_detail;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pr_detail;
         private System.Windows.Forms.Label pr_code_label;
         private System.Windows.Forms.Label pr_detail_label;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_spec;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pr_spec;
         private System.Windows.Forms.Label pr_spec_label;
       
         private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
@@ -682,7 +679,7 @@
         private CustomControl.TextBoxWithIcon.SearchTextBox la_code;
         private System.Windows.Forms.Panel LabelParam;
         private System.Windows.Forms.Label label2;
-        private CustomControl.TextBoxWithIcon.MaCodeTextBox pr_code2;
+        private CustomControl.TextBoxWithIcon.EnterTextBox pr_code2;
         private System.Windows.Forms.DataGridViewCheckBoxColumn Choose;
         private System.Windows.Forms.DataGridViewTextBoxColumn la_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn pl_detno;

UAS-MES/FunctionCode/SystemSetting/SystemSetting_LabelMaintain.cs

@@ -18,7 +18,7 @@ namespace UAS_MES.SystemSetting
         DataTable dt;
         //设置Grid中Combox的静态数据，这个格式是必须的，#前面是展示值，#后面是实际值
         string[] labeltype = { "机身标#机身标", "彩盒标#彩盒标", "卡通箱标#卡通箱标", "大箱标#大箱标", "栈板标#栈板标" };
-        string[] defaultype = { "是#-1", "否#0" };
+        string[] defaultype = { "是#1", "否#0" };
         //用于拼接条件查询
         StringBuilder condition = new StringBuilder();
         LogStringBuilder sql = new LogStringBuilder();
@@ -294,6 +294,7 @@ namespace UAS_MES.SystemSetting
 
         private void LoadData()
         {
+       
             //如果没有任何筛选条件直接选取productlabel的数据
             if (sql.GetString().Length == 0)
             {
@@ -353,6 +354,7 @@ namespace UAS_MES.SystemSetting
                     }
                     pl_id2 = "";
                     MessageBox.Show("保存成功!");
+                    sql.Clear();
                     LoadData();
                 }
             }