修改上料提示

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

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

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -326,27 +326,18 @@ namespace UAS_MES.Make
             RemainList = new string[dt1.Rows.Count];
             for (int i = 0; i < dt1.Rows.Count; i++)
             {
-                string fsoncode = dt1.Rows[i]["sp_fsoncode"].ToString();
                 string soncode = dt1.Rows[i]["sp_soncode"].ToString();
                 string prdetail = dt1.Rows[i]["pr_detail"].ToString();
-                if (fsoncode == soncode)
-                    RemainList[i] = fsoncode + "(" + prdetail + ")";
-                else
-                    RemainList[i] = fsoncode + "或" + soncode + "(" + prdetail + ")";
-
+                RemainList[i] = soncode + "(" + prdetail + ")";
             }
             if (dt1.Rows.Count > 0)
             {
                 try
                 {
                     CollectDataSonCode.Add(dt1.Rows[RemainIndex]["sp_soncode"].ToString());
-                    string fsoncode = dt1.Rows[RemainIndex]["sp_fsoncode"].ToString();
                     string soncode = dt1.Rows[RemainIndex]["sp_soncode"].ToString();
                     string prdetail = dt1.Rows[RemainIndex]["pr_detail"].ToString();
-                    if (fsoncode == soncode)
-                        OperateResult.AppendText("<<请采集" + fsoncode + "(" + prdetail + ")的物料数据\n", Color.Black);
-                    else
-                        OperateResult.AppendText("<<请采集" + fsoncode + "或" + soncode + "(" + prdetail + ")的物料数据\n", Color.Black);
+                    OperateResult.AppendText("<<请采集" + soncode + "(" + prdetail + ")的物料数据\n", Color.Black);
                 }
                 catch (Exception)
                 {