callm 3 тижнів тому
батько
коміт
89cd69c21f

+ 1 - 1
UAS_MES_XMW/FunctionCode/Make/Make_TestCollection.cs

@@ -386,7 +386,7 @@ namespace UAS_MES_NEW.Make
                     else
                     else
                     {
                     {
                         //良品信息采集
                         //良品信息采集
-                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, out ErrorMessage))
+                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, remark.Text, out ErrorMessage))
                         {
                         {
                             if (IfTest.Checked)
                             if (IfTest.Checked)
                             {
                             {

+ 2 - 2
UAS_MES_XMW/FunctionCode/Make/Make_TestCollection_Param.cs

@@ -412,7 +412,7 @@ namespace UAS_MES_NEW.Make
                             }
                             }
                         }
                         }
                         //良品信息采集
                         //良品信息采集
-                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, out ErrorMessage))
+                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, bc_remark.Text, out ErrorMessage))
                         {
                         {
                             if (IfTest.Checked)
                             if (IfTest.Checked)
                             {
                             {
@@ -442,7 +442,7 @@ namespace UAS_MES_NEW.Make
                 {
                 {
                     if (reworkstatus != "3")
                     if (reworkstatus != "3")
                     {
                     {
-                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, out ErrorMessage))
+                        if (LogicHandler.SetStepResult1(ma_code.Text, User.UserSourceCode, ms_sncode.Text, "良品采集", "检测合格", User.UserCode, bc_remark.Text, out ErrorMessage))
                         {
                         {
                             //提示正确返回时传递的信息
                             //提示正确返回时传递的信息
                             if (ErrorMessage.Contains("AFTERSUCCESS"))
                             if (ErrorMessage.Contains("AFTERSUCCESS"))