添加选择默认不良代码组

UAS-MES/Entity/User.cs

@@ -54,5 +54,9 @@
         /// 资源所属工作中心
         /// </summary>
         public static string WorkCenter;
+        /// <summary>
+        /// 默认不良组别
+        /// </summary>
+        public static string DefaultBadGroup;
     }
 }

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -225,7 +225,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 pr_kind ");
+            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");
             bc_groupcode.DisplayMember = "bg_name";
             bc_groupcode.ValueMember = "bg_code";

UAS-MES/Login.cs

@@ -144,12 +144,13 @@ namespace UAS_MES
             //设置全局用户信息
             string[] field = { "em_code,em_depart,em_type,em_name,em_position,em_professname,em_type,ug_code,ug_name" };
             UserInf = dh.getFieldsDataByCondition("Employee left join cs$userresource on ur_emcode=em_code left join cs$usergroup on ug_code=ur_groupcode", field, "upper(em_code)='" + UserName.Text.ToUpper() + "'");
-            DataTable dt = dh.getFieldsDataByCondition("source", new string[] { "sc_wccode","sc_code", "sc_stepcode", "sc_stepname", "sc_linecode" }, "upper(sc_code)='" + Source.Text.ToUpper() + "'");
+            DataTable dt = dh.getFieldsDataByCondition("source left join step on sc_stepcode=st_code", new string[] { "st_badgroupcode", "sc_wccode", "sc_code", "sc_stepcode", "sc_stepname", "sc_linecode" }, "upper(sc_code)='" + Source.Text.ToUpper() + "'");
             //存在岗位资源则要求添加
             if (dt.Rows.Count > 0)
             {
                 User.CurrentStepCode = dt.Rows[0]["sc_stepcode"].ToString();
                 User.CurrentStepName = dt.Rows[0]["sc_stepname"].ToString();
+                User.DefaultBadGroup = dt.Rows[0]["st_badgroupcode"].ToString();
                 User.UserLineCode = dt.Rows[0]["sc_linecode"].ToString();
                 User.UserSourceCode = dt.Rows[0]["sc_code"].ToString();
                 User.WorkCenter = dt.Rows[0]["sc_wccode"].ToString();