|
|
@@ -1220,6 +1220,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String iTestDetail= "";
|
|
|
String iMaxValue= "";
|
|
|
String iMinValue= "";
|
|
|
+ String iTestTimes= "";
|
|
|
if(map.get("iTestResult")!=null){
|
|
|
iTestResult=map.get("iTestResult").toString();
|
|
|
}
|
|
|
@@ -1232,6 +1233,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
if(map.get("iTestDetail")!=null){
|
|
|
iTestDetail=map.get("iTestDetail").toString();
|
|
|
}
|
|
|
+ if(map.get("iTestTimes")!=null){
|
|
|
+ iTestTimes=map.get("iTestTimes").toString();
|
|
|
+ }
|
|
|
if(map.get("iMaxValue")!=null){
|
|
|
iMaxValue=map.get("iMaxValue").toString();
|
|
|
}
|
|
|
@@ -1246,15 +1250,29 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String[] name=iClassName.split("\\|");
|
|
|
String[] result=iTestResult.split("\\|");
|
|
|
String[] value=iTestDetail.split("\\|");
|
|
|
+ String[] times=iTestTimes.split("\\|");
|
|
|
if(name.length!=value.length||name.length!=result.length){
|
|
|
rmap.put("oErrMessage","测试项目名称和值的项次不一致");
|
|
|
return rmap;
|
|
|
}
|
|
|
- for (int i=0;i<name.length;i++){
|
|
|
- sql.setLength(0);
|
|
|
- sql.append("Insert into "+Master+".STEPTESTDETAIL (STD_ID,STD_CLASS,STD_SN,STD_MAKECODE,STD_ACTUALVALUE,STD_TESTRESULT,STD_INDATE,STD_RESCODE,STD_MAXVALUE, STD_MINVALUE)");
|
|
|
- sql.append("values("+Master+".STEPTESTDETAIL_SEQ.nextval,?,'" + iSN + "','" + map2.get("oMoCode") + "',?,?,sysdate,'" + iResCode + "','"+iMaxValue+"','"+iMinValue+"')");
|
|
|
- baseDao.execute(sql.toString(),name[i],value[i],result[i] );
|
|
|
+ if(iTestTimes!=""){
|
|
|
+ if(times.length!=name.length){
|
|
|
+ rmap.put("oErrMessage","测试项目名称和值的项次不一致");
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ for (int i=0;i<name.length;i++){
|
|
|
+ sql.setLength(0);
|
|
|
+ sql.append("Insert into "+Master+".STEPTESTDETAIL (STD_ID,std_testtime,STD_CLASS,STD_SN,STD_MAKECODE,STD_ACTUALVALUE,STD_TESTRESULT,STD_INDATE,STD_RESCODE,STD_MAXVALUE, STD_MINVALUE)");
|
|
|
+ sql.append("values("+Master+".STEPTESTDETAIL_SEQ.nextval,?,?,'" + iSN + "','" + map2.get("oMoCode") + "',?,?,sysdate,'" + iResCode + "','"+iMaxValue+"','"+iMinValue+"')");
|
|
|
+ baseDao.execute(sql.toString(),times[i],name[i],value[i],result[i] );
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+ for (int i=0;i<name.length;i++){
|
|
|
+ sql.setLength(0);
|
|
|
+ sql.append("Insert into "+Master+".STEPTESTDETAIL (STD_ID,STD_CLASS,STD_SN,STD_MAKECODE,STD_ACTUALVALUE,STD_TESTRESULT,STD_INDATE,STD_RESCODE,STD_MAXVALUE, STD_MINVALUE)");
|
|
|
+ sql.append("values("+Master+".STEPTESTDETAIL_SEQ.nextval,?,'" + iSN + "','" + map2.get("oMoCode") + "',?,?,sysdate,'" + iResCode + "','"+iMaxValue+"','"+iMinValue+"')");
|
|
|
+ baseDao.execute(sql.toString(),name[i],value[i],result[i] );
|
|
|
+ }
|
|
|
}
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
return rmap;
|