测试数据上传BUG调整

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -599,12 +599,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 		}
 		String iSN=map.get("iSN").toString();
-		String iTestResult= null;
-		String iResCode= null;
-		String iTestDetail= null;
+		String iTestResult= "";
+		String iResCode= "";
+		String iClassName="";
+		String iTestDetail= "";
 		if(map.get("iTestResult")!=null){
 			iTestResult=map.get("iTestResult").toString();
 		}
+		if(map.get("iClassName")!=null){
+			iClassName=map.get("iClassName").toString();
+		}
 		if(map.get("iResCode")!=null){
 			iResCode=map.get("iResCode").toString();
 		}
@@ -616,12 +620,21 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Map<Object, Object> map2=GetRcardMOInfo(map3);
 		String omakeCode = "";
 		StringBuffer sql=new StringBuffer();
-
-		sql.append("Insert into STEPTESTDETAIL (STD_ID,STD_CLASS,STD_SN,STD_MAKECODE,STD_ACTUALVALUE,STD_TESTRESULT,STD_INDATE,STD_RESCODE)");
-		sql.append("values(STEPTESTDETAIL_SEQ.nextval,'ITEM','" + iSN + "','" + map2.get("oMoCode") + "','" + iTestDetail + "','" + iTestResult + "',sysdate,'" + iResCode + "');");
-		baseDao.execute(sql.toString());
+		String[] name=iClassName.split("\\|");
+		String[] value=iTestDetail.split("\\|");
+		if(name.length!=value.length){
+			rmap.put("oErrMessage","测试项目名称和值的项次不一致");
+			return rmap;
+		}
+		for (int i=0;i<name.length;i++){
+			sql.setLength(0);
+			sql.append("Insert into STEPTESTDETAIL (STD_ID,STD_CLASS,STD_SN,STD_MAKECODE,STD_ACTUALVALUE,STD_TESTRESULT,STD_INDATE,STD_RESCODE)");
+			sql.append("values(STEPTESTDETAIL_SEQ.nextval,'"+name[i]+"','" + iSN + "','" + map2.get("oMoCode") + "','" + value[i] + "','" + iTestResult + "',sysdate,'" + iResCode + "')");
+			baseDao.execute(sql.toString());
+		}
 		return rmap;
 	}
+
 	private Map<Object,Object> SetPcbaData(Object data){
 		Map<Object, Object> map = BaseUtil.parseFormStoreToMap(data.toString());
 		//实际业务数据
@@ -704,7 +717,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				else
 				{
 					baseDao.updateByCondition("makebad", "mb_status=-1", "mb_sncode='" + iSN + "' and mb_makecode='" + iMakeCode + "' and mb_stepcode='" + CurrentStep + "' and mb_status=0");
-					String[] BadCode = iErrCode.split(",");
+					String[] BadCode = iErrCode.split("\\|");
 					StringBuffer sql=new StringBuffer();
 					for (int i = 0; i < BadCode.length; i++)
 					{