添加插入字段

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

@@ -705,9 +705,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String iResCode= "";
 		String iClassName="";
 		String iTestDetail= "";
+		String iSubClass3= "";
+		String iSubClass2= "";
+		String iSubClass1= "";
+		String iUserCode= "";
 		if(map.get("iTestResult")!=null){
 			iTestResult=map.get("iTestResult").toString();
 		}
+		if(map.get("iUserCode")!=null){
+			iUserCode=map.get("iUserCode").toString();
+		}
 		if(map.get("iClassName")!=null){
 			iClassName=map.get("iClassName").toString();
 		}
@@ -717,6 +724,18 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iTestDetail")!=null){
 			iTestDetail=map.get("iTestDetail").toString();
 		}
+		//测试项目
+		if(map.get("iSubClass3")!=null){
+			iSubClass3=map.get("iSubClass3").toString();
+		}
+		//检验目标
+		if(map.get("iSubClass2")!=null){
+			iSubClass2=map.get("iSubClass2").toString();
+		}
+		//备注
+		if(map.get("iSubClass1")!=null){
+			iSubClass1=map.get("iSubClass1").toString();
+		}
 		JSONObject map3=new JSONObject();
 		map3.put("iSN",iSN);
 		Map<Object, Object> map2=GetRcardMOInfo(map3);
@@ -725,14 +744,21 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String[] name=iClassName.split("\\|");
 		String[] result=iTestResult.split("\\|");
 		String[] value=iTestDetail.split("\\|");
+		String[] subClass3=iSubClass3.split("\\|");
+		String[] subClass2=iSubClass2.split("\\|");
+		String[] subClass1=iSubClass1.split("\\|");
 		if(name.length!=value.length||name.length!=result.length){
 			rmap.put("oErrMessage","测试项目名称和值的项次不一致");
 			return rmap;
 		}
 		for (int i=0;i<name.length;i++){
+			//三个子类字段为可选项,项次不足时补空
+			String vSubClass3=i<subClass3.length?subClass3[i]:"";
+			String vSubClass2=i<subClass2.length?subClass2[i]:"";
+			String vSubClass1=i<subClass1.length?subClass1[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] + "','" + result[i] + "',sysdate,'" + iResCode + "')");
+			sql.append("Insert into STEPTESTDETAIL (STD_ID,STD_CLASS,STD_SN,STD_MAKECODE,STD_ACTUALVALUE,STD_TESTRESULT,STD_INDATE,STD_RESCODE,STD_SUBCLASS3,STD_SUBCLASS2,STD_SUBCLASS1,std_inman)");
+			sql.append("values(STEPTESTDETAIL_SEQ.nextval,'"+name[i]+"','" + iSN + "','" + map2.get("oMoCode") + "','" + value[i] + "','" + result[i] + "',sysdate,'" + iResCode + "','" + vSubClass3 + "','" + vSubClass2 + "','" + vSubClass1 + "','"+iUserCode+"')");
 			baseDao.execute(sql.toString());
 		}
 		rmap.put("oErrMessage",oErrMessage);