Browse Source

模块测试打不良功能修改

callm 3 months ago
parent
commit
ff45ea0853
1 changed files with 3 additions and 3 deletions
  1. 3 3
      UAS_MES_JC/FunctionCode/Make/Make_TestCollectionModule.cs

+ 3 - 3
UAS_MES_JC/FunctionCode/Make/Make_TestCollectionModule.cs

@@ -246,9 +246,9 @@ namespace UAS_MES_NEW.Make
                             }
                             if (LogicHandler.CheckStepSNAndMacode(oMakeCode, User.UserSourceCode, ms_sncode.Text, User.UserCode, out oMakeCode, out oMSID, out ErrorMessage))
                             {
-                                if (needdata)
+                                if (needdata&&GoodProduct.Checked)
                                 {
-                                    dh.ExecuteSql("insert into STEPTESTDETAIL (std_id,std_sn,std_makecode,std_indate,STD_RESCODE,std_stepcode,STD_TESTRESULT,std_class)select STEPTESTDETAIL_seq.nextval,'" + arr[i] + "','" + oMakeCode + "',sysdate,'" + User.UserSourceCode + "','" + User.CurrentStepCode + "','','http://172.16.51.3:8099/ftp" + ftppath + sn + FilePath.Text.Substring(FilePath.Text.LastIndexOf(".")) + "' from dual", "insert");
+                                    dh.ExecuteSql("insert into STEPTESTDETAIL (std_id,std_sn,std_makecode,std_indate,STD_RESCODE,std_stepcode,STD_TESTRESULT,std_class)select STEPTESTDETAIL_seq.nextval,'" + arr[i] + "','" + oMakeCode + "',sysdate,'" + User.UserSourceCode + "','" + User.CurrentStepCode + "','','http://10.1.81.208:8099/ftp" + ftppath + sn + FilePath.Text.Substring(FilePath.Text.LastIndexOf(".")) + "' from dual", "insert");
                                 }
                                 //是否提示过工单切换框,检测前后执行
                                 if (!LogicHandler.CheckDiffMakeCodeAfterStepCheck(ms_sncode.Text, oMakeCode, NoteForChange.Checked, NoteAlready, ma_code, out ErrorMessage))
@@ -313,7 +313,7 @@ namespace UAS_MES_NEW.Make
                         }
                         else OperateResult.AppendText(">>" + ErrorMessage + "\n", Color.Red, ms_sncode);
                     }
-                    if (needdata)
+                    if (needdata&& GoodProduct.Checked)
                     {
                         ftp.UpLoadFile(FilePath.Text, sn + FilePath.Text.Substring(FilePath.Text.LastIndexOf(".")), ftppath);
                         if (File.Exists(BackUpFolder.Text + "\\" + sn + FilePath.Text.Substring(FilePath.Text.LastIndexOf("."))))