拆解处理逻辑补充，新增不良代码防止重复

UAS-MES/FunctionCode/Make/Make_Decompose.cs

@@ -252,16 +252,22 @@ namespace UAS_MES.Make
                             sql.Append("sp_craftcode='" + ms_craftcode.Text + "'and sp_mothercode ='" + ms_prodcode.Text + "' and sp_soncode = '" + LabelDataGridView.Rows[i].Cells["cm_soncode"].Value + "' ");
                             sql.Append("and((sp_type = '物料' and( sp_tracekind <> 2 or sp_tracekind is null))or sp_type <> '物料') order by SP_DETNO asc");
                             dtbar = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
-
-                            String ErrorMessage;
-                            string sp_soncode = dtbar.Rows[0]["sp_soncode"].ToString();
-                            string sp_prefix = dtbar.Rows[0]["sp_prefix"].ToString();
-                            string length = dtbar.Rows[0]["sp_length"].ToString();
-                            string sp_barcoderule = dtbar.Rows[0]["sp_barcoderule"].ToString();
-                            if (!LogicHandler.CheckSNBeforeLoad("",LabelDataGridView.Rows[i].Cells["New_BarCode"].Value.ToString(), sp_soncode, sp_barcoderule, sp_prefix, length, out ErrorMessage))
+                            if (dtbar.Rows.Count > 0)
                             {
-                                OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
-                                LoadData(sncode_1, sender, new KeyEventArgs(Keys.Enter));
+                                String ErrorMessage;
+                                string sp_soncode = dtbar.Rows[0]["sp_soncode"].ToString();
+                                string sp_prefix = dtbar.Rows[0]["sp_prefix"].ToString();
+                                string length = dtbar.Rows[0]["sp_length"].ToString();
+                                string sp_barcoderule = dtbar.Rows[0]["sp_barcoderule"].ToString();
+                                if (!LogicHandler.CheckSNBeforeLoad("", LabelDataGridView.Rows[i].Cells["New_BarCode"].Value.ToString(), sp_soncode, sp_barcoderule, sp_prefix, length, out ErrorMessage))
+                                {
+                                    OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                                    LoadData(sncode_1, sender, new KeyEventArgs(Keys.Enter));
+                                    return;
+                                }
+                            }
+                            else {
+                                OperateResult.AppendText(">>序列号"+ms_sncode.Text+"途程未维护工序BOM\n", Color.Red);
                                 return;
                             }
 

UAS-MES/FunctionCode/Make/Make_NewBadCode.cs

@@ -190,9 +190,9 @@ namespace UAS_MES.Make
             sql.Clear();
             sql.Append("insert when (not exists(select 1 from makebad where mb_sncode='" + sncode + "' and mb_badcode=:bc_code)) then ");
             sql.Append("into makebad(mb_id,mb_makecode,mb_mscode,mb_sncode,mb_inman,");
-            sql.Append("mb_indate,mb_stepcode,mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_soncode,mb_status)");
-            sql.Append("select :id,ma_code,ms_code,ms_sncode,'" + User.UserCode + "',sysdate,'" + User.CurrentStepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
-            sql.Append("sp_soncode,'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
+            sql.Append("mb_indate,mb_stepcode,mb_sourcecode,mb_badcode,mb_bgcode,mb_badtable,mb_status)");
+            sql.Append("select DISTINCT :id,ma_code,ms_code,ms_sncode,'" + User.UserCode + "',sysdate,'" + User.CurrentStepCode + "',ms_sourcecode,:bc_code,:bg_code,'',");
+            sql.Append("'0' from make left join makeSerial on ms_makecode=ma_code left join stepProduct on ");
             sql.Append("sp_mothercode=ma_prodcode and sp_stepcode=ms_nextstepcode and ms_craftcode = sp_craftcode  where ms_sncode='" + sncode + "' and ms_makecode = '"+macode+"'");
             dh.BatchInsert(sql.GetString(), new string[] { "bc_code", "id", "bc_code", "bg_code" }, bccode, id, bccode, bgcode);
             MessageBox.Show("保存成功");