测试文件上传

UAS_MES_JC/FunctionCode/Make/Make_TestCollectionModule.cs

@@ -263,7 +263,7 @@ namespace UAS_MES_NEW.Make
                             {
                                 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))

UAS_MES_JC/FunctionCode/Query/Query_ExeProgress.cs

@@ -66,6 +66,7 @@ namespace UAS_MES_NEW.Query
             if (e.KeyCode == Keys.Enter)
             {
                 dt = (DataTable)dh.ExecuteSql("select cm_sncode from craftmaterial where cm_barcode='" + sn_code.Text + "' and nvl(cm_status,0)=0", "select");
+                string sncode = sn_code.Text;
                 if (dt.Rows.Count > 0)
                 {
                     sn_code.Text = dt.Rows[0]["cm_sncode"].ToString();
@@ -331,7 +332,10 @@ namespace UAS_MES_NEW.Query
 
                     sql.Clear();
                     sql.Append("select cm_barcode,cm_fsoncode,cm_sncode,cm_indate,cm_inman," +
-                        "case when cm_status=0 then '上线' else '已拆解' end cm_status from craftmaterial where cm_sncode='" + sn_code.Text + "' and cm_makecode='" + ma_code.Text + "'");
+                        "case when cm_status=0 then '上线' else '已拆解' end cm_status from craftmaterial where cm_sncode='" + sncode + "'" +
+                        "union " +
+                        "select cm_barcode,cm_fsoncode,cm_sncode,cm_indate,cm_inman," +
+                        "case when cm_status=0 then '上线' else '已拆解' end cm_status from craftmaterial where cm_barcode='" + sncode + "'");
                     dt = (DataTable)dh.ExecuteSql(sql.GetString(), "select");
                     if (dt.Rows.Count > 0)
                     {