首选料号和备选料号相同只提示一个

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -140,7 +140,13 @@ namespace UAS_MES.Make
                             //获取对应 产品的机身标的打印模板
                             if (ListA.Rows.Count > 0)
                             {
-                                OperateResult.AppendText(">>请采集" + ListA.Rows[RemainIndex]["sp_fsoncode"].ToString() + "或" + ListA.Rows[RemainIndex]["sp_soncode"].ToString() + "的条码\n");
+                                OperateResult.AppendText(">>请采集" + ListA.Rows[RemainIndex]["sp_fsoncode"].ToString() + "或" + ListA.Rows[RemainIndex]["sp_soncode"].ToString() + "的物料数据\n");
+                                string fsoncode = ListA.Rows[RemainIndex]["sp_fsoncode"].ToString();
+                                string soncode = ListA.Rows[RemainIndex]["sp_soncode"].ToString();
+                                if (fsoncode == soncode)
+                                    OperateResult.AppendText("<<请采集" + fsoncode + "的物料数据\n", Color.Black);
+                                else
+                                    OperateResult.AppendText("<<请采集" + fsoncode + "或" + soncode + "的物料数据\n", Color.Black);
                                 code.Clear();
                             }
                             else

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -330,7 +330,12 @@ namespace UAS_MES.Make
                 try
                 {
                     CollectDataSonCode.Add(dt1.Rows[RemainIndex]["sp_soncode"].ToString());
-                    OperateResult.AppendText("<<请采集" + dt1.Rows[RemainIndex]["sp_fsoncode"].ToString() + "或" + dt1.Rows[RemainIndex]["sp_soncode"].ToString() + "的" + dt1.Rows[RemainIndex]["sp_type"].ToString() + "数据\n", Color.Black);
+                    string fsoncode = dt1.Rows[RemainIndex]["sp_fsoncode"].ToString();
+                    string soncode = dt1.Rows[RemainIndex]["sp_soncode"].ToString();
+                    if (fsoncode == soncode)
+                        OperateResult.AppendText("<<请采集" + fsoncode + "的物料数据\n", Color.Black);
+                    else
+                        OperateResult.AppendText("<<请采集" + fsoncode + "或" + soncode + "的物料数据\n", Color.Black);
                 }
                 catch (Exception)
                 {