Browse Source

添加不良组别排序

章政 8 years ago
parent
commit
dff3daf81a

+ 2 - 1
UAS-MES/FunctionCode/Make/Make_TestCollection.Designer.cs

@@ -809,10 +809,11 @@
             // 
             // Filter
             // 
+            this.Filter.BackColor = System.Drawing.Color.Transparent;
             this.Filter.Font = new System.Drawing.Font("宋体", 10.8F);
             this.Filter.Location = new System.Drawing.Point(124, 357);
             this.Filter.Name = "Filter";
-            this.Filter.PlaceHolder = "查询不良";
+            this.Filter.PlaceHolder = "不良名称搜索";
             this.Filter.Size = new System.Drawing.Size(234, 28);
             this.Filter.TabIndex = 76;
             this.Filter.UserControlTextChanged += new UAS_MES.CustomControl.TextBoxWithIcon.TextBoxWithPlaceHolder.OnTextChange(this.Filter_UserControlTextChanged);

+ 2 - 2
UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -242,7 +242,7 @@ namespace UAS_MES.Make
             sql.Append("select bg_code||':'||bg_name bg_name,bg_code from badgroup left join (select pb_badgroup,pr_kind ");
             sql.Append("from product left join productkind on pk_name=pr_kind ");
             sql.Append("left join productbadgroup on pk_code=PB_KINDCODE where pr_code='" + ma_prodcode.Text + "')");
-            sql.Append("on pb_badgroup=bg_code order by case when bg_code='" + User.DefaultBadGroup + "' then 0 else 1 end");
+            sql.Append("on pb_badgroup=bg_code order by bg_code");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
             bc_groupcode.DisplayMember = "bg_name";
             bc_groupcode.ValueMember = "bg_code";
@@ -654,7 +654,7 @@ namespace UAS_MES.Make
         /// <param name="sender"></param>
         /// <param name="e"></param>
         private void ma_code_UserControlTextChanged(object sender, EventArgs e)
-        {
+        { 
             if (ma_code.Text.Length > 4)
             {
                 mcd_inqty.Text = "";