update

UAS-MES/FunctionCode/Make/Make_ColorBoxLoadPrint.cs

@@ -144,8 +144,10 @@ namespace UAS_MES.Make
                                 else
                                 {
                                     OperateResult.AppendText(">>当前序列号" + ms_sncode.Text + "没有需要采集的内容,请采集其他序列号\n", Color.Red);
-                                    if (!LogicHandler.SetTestResult(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "彩盒上料打印", "彩盒上料成功", User.UserCode, out ErrorMessage))
+                                    if (!LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                                         OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                                    else
+                                        OperateResult.AppendText(">>序列号" + ms_sncode.Text + "上料采集完成！\n", Color.Green);
                                     return;
                                 }
                             }
@@ -208,7 +210,7 @@ namespace UAS_MES.Make
                         if (RemainIndex == ListA.Rows.Count)
                         {
                             sql.Clear();
-                            sql.Append("insert into Craftmaterial (cm_id ,cm_makecode,cm_maid,cm_maprodcode, cm_soncode, cm_mscode, cm_sncode, cm_stepcode, cm_stepname,cm_fsoncode");
+                            sql.Append("insert into Craftmaterial (cm_id ,cm_makecode,cm_maid,cm_maprodcode, cm_soncode, cm_mscode, cm_sncode, cm_stepcode, cm_stepname,cm_fsoncode,");
                             sql.Append("cm_craftcode,cm_craftname,cm_barcode,cm_inqty,cm_indate,cm_inman,cm_linecode,cm_wccode,cm_sourcecode,cm_spid,cm_status,cm_materialtype,cm_firstsn)");
                             sql.Append("select Craftmaterial_seq.nextval, ma_code, ma_id, ma_prodcode,:soncode,ms_code,ms_sncode,mcd_stepcode,");
                             sql.Append("mcd_stepname,sp_fsoncode,ma_craftcode,ma_craftname,:barcode,1,sysdate,'" + User.UserCode + "',ma_linecode,ma_wccode,");

UAS-MES/FunctionCode/Make/Make_FeedingCollection.cs

@@ -324,6 +324,8 @@ namespace UAS_MES.Make
                             OperateResult.AppendText(">>序列号" + sn_code.Text + "没有需要采集的内容,请采集其他序列号\n", Color.Red);
                             if (!LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sn_code.Text, "上料采集", "上料成功", User.UserCode, out ErrorMessage))
                                 OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red);
+                            else
+                                OperateResult.AppendText(">>序列号" + sn_code.Text + "上料采集完成！\n", Color.Green);
                             code.Text = "";
                             sn_code.Text = "";
                         }
@@ -353,7 +355,7 @@ namespace UAS_MES.Make
             else
             {
                 sql.Clear();
-                sql.Append("insert into Craftmaterial (cm_id ,cm_makecode,cm_maid,cm_maprodcode, cm_soncode, cm_mscode, cm_sncode, cm_stepcode, cm_stepname,cm_fsoncode");
+                sql.Append("insert into Craftmaterial (cm_id ,cm_makecode,cm_maid,cm_maprodcode, cm_soncode, cm_mscode, cm_sncode, cm_stepcode, cm_stepname,cm_fsoncode,");
                 sql.Append("cm_craftcode,cm_craftname,cm_barcode,cm_inqty,cm_indate,cm_inman,cm_linecode,cm_wccode,cm_sourcecode,cm_spid,cm_status,cm_materialtype,cm_firstsn)");
                 sql.Append("select Craftmaterial_seq.nextval, ma_code, ma_id, ma_prodcode,:soncode,ms_code,ms_sncode,mcd_stepcode,");
                 sql.Append("mcd_stepname,sp_fsoncode,ma_craftcode,ma_craftname,:barcode,1,sysdate,'" + User.UserCode + "',ma_linecode,ma_wccode,");