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

UAS-MES/FunctionCode/Make/Make_LabelCheck.cs

@@ -134,6 +134,9 @@ namespace UAS_MES.Make
                                 //调用  SETSTEPRESULT ，获取返回的工单号，
                                 if (LogicHandler.SetStepResult(omakeCode, User.UserSourceCode, SN, "标签核对", "OK", User.UserCode, out oErrorMessage))
                                 {
+                                    //提示正确返回时传递的信息
+                                    if (oErrorMessage.Contains("AFTERSUCCESS"))
+                                        OperateResult.AppendText(">>" + oErrorMessage + "\n");
                                     //根据工单号查询makecraftdetail 表中的 mcd_okqty 计数，剩余数为ma_qty - nvl（mcd_inqty,0），刷新页面中工单信息的显示
                                     sql.Clear();
                                     sql.Append("select ma_code,nvl(mcd_okqty,0) mcd_okqty,ma_prodcode,pr_detail ||','|| pr_spec pr_detailspec,");

UAS-MES/FunctionCode/Make/Make_PackageCollection.cs

@@ -246,6 +246,9 @@ namespace UAS_MES.Make
                                 {
                                     if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code.Text, "包装采集", "装箱成功", User.UserCode, out ErrorMessage))
                                     {
+                                        //提示正确返回时传递的信息
+                                        if (ErrorMessage.Contains("AFTERSUCCESS"))
+                                            OperateResult.AppendText(">>" + ErrorMessage + "\n");
                                         LoadCheckQTY();
                                         LastSncode = sn_code.Text;
                                         OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);

UAS-MES/FunctionCode/Make/Make_PackageCollectionWeigh.cs

@@ -319,6 +319,9 @@ namespace UAS_MES.Make
                                 {
                                     if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code.Text, "包装采集", "装箱成功", User.UserCode, out ErrorMessage))
                                     {
+                                        //提示正确返回时传递的信息
+                                        if (ErrorMessage.Contains("AFTERSUCCESS"))
+                                            OperateResult.AppendText(">>" + ErrorMessage + "\n");
                                         LoadCheckQTY();
                                         OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);
                                         //满箱更新状态为1

UAS-MES/FunctionCode/Make/Make_SeqProgramTransform.cs

@@ -228,6 +228,8 @@ namespace UAS_MES.Make
                                 {
                                     //写入日志
                                     LogicHandler.SetStepResult(ms_macode.Text, User.UserSourceCode, code.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
+                                    if(errorMessage.Contains("AFTERSUCCESS"))
+                                        OperateResult.AppendText(">>"+ errorMessage + "\n");
                                     //记录日志
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakecode, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", code.Text, "");
                                     OperateResult.AppendText(">>转换成功\n", Color.Green,code);

UAS-MES/FunctionCode/Make/Make_SeqTransform.cs

@@ -202,6 +202,8 @@ namespace UAS_MES.Make
                                 {
                                     //写入日志
                                     LogicHandler.SetStepResult(ma_code.Text, User.UserSourceCode, sncode.Text, "序列转换", "序列转换成功", User.UserCode, out errorMessage);
+                                    if (errorMessage.Contains("AFTERSUCCESS"))
+                                        OperateResult.AppendText(">>" + errorMessage + "\n");
                                     //记录日志
                                     LogicHandler.DoCommandLog(Tag.ToString(), User.UserCode, oMakeCode, User.UserLineCode, User.UserSourceCode, "序列转换", "转换成功", sncode.Text, "");
                                     OperateResult.AppendText(">>转换成功\n", Color.Green,sncode);

UAS-MES/FunctionCode/Make/Make_SpecialCartonPack.cs

@@ -271,6 +271,8 @@ namespace UAS_MES.Make
                                 {
                                     if (LogicHandler.SetStepResult(ms_makecode.Text, User.UserSourceCode, sn_code.Text, "包装采集", "装箱成功", User.UserCode, out ErrorMessage))
                                     {
+                                        if (ErrorMessage.Contains("AFTERSUCCESS"))
+                                            OperateResult.AppendText(">>" + ErrorMessage + "\n");
                                         LoadCheckQTY();
                                         OperateResult.AppendText(">>序列号" + sn_code.Text + "采集成功！\n", Color.Green);
                                         LastSncode = sn_code.Text;