章政 8 years ago
parent
commit
3e16a9ab37
1 changed files with 2 additions and 2 deletions
  1. 2 2
      UAS-MES/FunctionCode/Make/Make_TestCollection.cs

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