维修采集去除不良代码限制，测试采集不良原因组调整

UAS-MES/FunctionCode/Make/Make_NewMatainInf.cs

@@ -169,17 +169,13 @@ namespace UAS_MES.Make
                 {
                     string macode = dt.Rows[0]["ms_makecode"].ToString();
                     string mbr_id = dh.GetSEQ("makebadreason_seq");
-                    if (!dh.CheckExist("makebadreason", "mbr_sncode='" + sncode + "' and mbr_badcode='" + bccode + "' "))
-                    {
-                        sql.Clear();
-                        sql.Append("insert into makebadreason (mbr_mbid,mbr_id,mbr_brcode,mbr_solutioncode,");
-                        sql.Append("mbr_dutycode,mbr_brgcode,mbr_badcode,mbr_sncode,mbr_makecode,mbr_indate,");
-                        sql.Append("mbr_inman) select '" + mbid + "','" + mbr_id + "','" + nrcode + "',");
-                        sql.Append("'" + mbrsolutioncode + "','" + mbrdutycode + "','" + nrgcode + "','" + bccode + "',");
-                        sql.Append("'" + sncode + "','" + macode + "',sysdate,'" + User.UserCode + "' from dual");
-                        dh.ExecuteSql(sql.GetString(), "insert");
-                    }
-                    else ErrorMessage = "序列号" + sncode + "已存在不良代码" + bccode + "\n";
+                    sql.Clear();
+                    sql.Append("insert into makebadreason (mbr_mbid,mbr_id,mbr_brcode,mbr_solutioncode,");
+                    sql.Append("mbr_dutycode,mbr_brgcode,mbr_badcode,mbr_sncode,mbr_makecode,mbr_indate,");
+                    sql.Append("mbr_inman) select '" + mbid + "','" + mbr_id + "','" + nrcode + "',");
+                    sql.Append("'" + mbrsolutioncode + "','" + mbrdutycode + "','" + nrgcode + "','" + bccode + "',");
+                    sql.Append("'" + sncode + "','" + macode + "',sysdate,'" + User.UserCode + "' from dual");
+                    dh.ExecuteSql(sql.GetString(), "insert");
                     if (mbccomponent != "" || mbccomponent != null)
                     {
                         if (!dh.CheckExist("makebadrscom", "mbc_sncode='" + sncode + "' and mbc_component='" + mbccomponent + "'"))

UAS-MES/FunctionCode/Make/Make_Repair.cs

@@ -72,7 +72,7 @@ namespace UAS_MES.Make
             //为DBFind配置Call和Form的名称
             cr_code.FormName = Name;
             cr_code.TableName = "craft";
-            cr_code.SelectField = "cr_name # 工艺名称 ,cr_code # 工艺编号,cr_prodcode # 物料编号";
+            cr_code.SelectField = "cr_name # 工艺名称,cr_code # 工艺编号,cr_prodcode # 物料编号";
             cr_code.SetValueField = new string[] { "cr_code" };
             cr_code.DBTitle = "回流工艺";
 

UAS-MES/FunctionCode/Make/Make_TestCollection.cs

@@ -207,24 +207,14 @@ namespace UAS_MES.Make
         {
             //如果ms_makecode的值修改过再去查询
             sql.Clear();
-            sql.Append("select pb_badgroup from make left join product on pr_code=ma_prodcode left join ");
-            sql.Append("productkind on pk_code=pr_kind left join productbadgroup on pk_code=PB_KINDCODE where ma_code='" + ma_code.Text + "' and pb_badgroup is not null");
+            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 desc");
             DataTable dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-            if (dt.Rows.Count == 0)
-            {
-                sql.Clear();
-                sql.Append("select bg_code||':'||bg_name bg_name,bg_code from badgroup");
-                dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-                bc_groupcode.DisplayMember = "bg_name";
-                bc_groupcode.ValueMember = "bg_code";
-                bc_groupcode.DataSource = dt;
-            }
-            else
-            {
-                bc_groupcode.DisplayMember = "pb_badgroup";
-                bc_groupcode.ValueMember = "pb_badgroup";
-                bc_groupcode.DataSource = dt;
-            }
+            bc_groupcode.DisplayMember = "bg_name";
+            bc_groupcode.ValueMember = "bg_code";
+            bc_groupcode.DataSource = dt;
         }
 
 
@@ -399,7 +389,7 @@ namespace UAS_MES.Make
                 dh.ExecuteSql("delete from makebad where mb_sncode='" + ms_sncode.Text + "' and mb_makecode='" + ma_code.Text + "'", "delete");
                 if (LogicHandler.SetTestNGDetail(ms_sncode.Text, ma_code.Text, User.UserName, User.UserSourceCode, "检查未通过", bgcode, bccode, bcremark, out ErrorMessage))
                 {
-                    OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为不良\n", Color.Green,ms_sncode);
+                    OperateResult.AppendText(">>" + ms_sncode.Text + "已采集为不良\n", Color.Green, ms_sncode);
                     //清除不良信息
                     bc_groupcode.DataSource = null;
                     bc_groupcode.Text = "";
@@ -426,7 +416,7 @@ namespace UAS_MES.Make
                     {
                         if (ChoosedRejectList.Items[i].ListView.Items[i].SubItems[2].Text == bc_code.Text)
                         {
-                            OperateResult.AppendText(">>已添加过不良代码" + bc_code.Text + "\n", Color.Red,bc_code);
+                            OperateResult.AppendText(">>已添加过不良代码" + bc_code.Text + "\n", Color.Red, bc_code);
                             return;
                         }
                     }

UAS-MES/UAS-MES.csproj

@@ -41,7 +41,7 @@
     <MinimumRequiredVersion>1.0.0.201</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>207</ApplicationRevision>
+    <ApplicationRevision>208</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>true</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>