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

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -390,7 +390,7 @@ namespace UAS_MES.Make
                 CollectDataSonCode.Clear();
                 //采集成功，设置序列号栏目为空
                 RemainIndex = 0;
-                OperateResult.AppendText(">>上料采集完成！\n", Color.Green);
+                OperateResult.AppendText(">>序列号" + sn_code.Text + "上料采集完成！\n", Color.Green);
                 if (LogicHandler.SetStepResult(ma_code, User.UserSourceCode, sn_code.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                 {
                     sn_code.Text = "";