Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -225,7 +225,14 @@ namespace UAS_MES.Make
                         }
                         code.Clear();
                         if (RemainIndex <= ListA.Rows.Count - 1)
-                            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");
+                            else
+                                OperateResult.AppendText(">>请采集物料编号为" + fsoncode + "或" + soncode + "的物料数据\n");
+                        }
                         if (RemainIndex == ListA.Rows.Count)
                         {
                             sql.Clear();

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -324,7 +324,14 @@ namespace UAS_MES.Make
             //用于记录提醒的数据长度
             RemainList = new string[dt1.Rows.Count];
             for (int i = 0; i < dt1.Rows.Count; i++)
-                RemainList[i] = dt1.Rows[i]["sp_fsoncode"].ToString() + "或" + dt1.Rows[i]["sp_soncode"].ToString();
+            {
+                string fsoncode = dt1.Rows[i]["sp_fsoncode"].ToString();
+                string soncode = dt1.Rows[i]["sp_soncode"].ToString();
+                if (fsoncode == soncode)
+                    RemainList[i] = fsoncode + "或" + soncode;
+                else
+                    RemainList[i] = fsoncode;
+            }
             if (dt1.Rows.Count > 0)
             {
                 try