[海格森EIS]settestdetail接口增加软件版本，内存储存数据与工单的校验

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

@@ -712,6 +712,10 @@ public class MESHelperServiceImpl implements MESHelperService {
 		map3.put("iSN",iSN);
 		Map<Object, Object> map2=GetRcardMOInfo(map3);
 		String omakeCode = "";
+		if(map2.get("oMoCode")!=null){
+			omakeCode=map2.get("oMoCode").toString();
+		}
+
 		StringBuffer sql=new StringBuffer();
 		String[] name=iClassName.split("\\|");
 		String[] result=iTestResult.split("\\|");
@@ -720,6 +724,30 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("oErrMessage","测试项目名称和值的项次不一致");
 			return rmap;
 		}
+		SqlRowList rs = baseDao.queryForRowSet(" select nvl(ma_softversion,' ')ma_softversion,nvl(ma_qdz,' ')ma_qdz,nvl(ma_zldcode,' ')ma_zldcode from make where ma_code = ?",omakeCode);
+        if (rs.next()) {
+			String ma_softversion = rs.getString("ma_softversion");
+			String ma_qdz = rs.getString("ma_qdz");
+			String ma_zldcode = rs.getString("ma_zldcode");
+			for (int i = 0; i < name.length; i++) {
+                if (!" ".equals(ma_softversion)&&name[i].equals("版本号")&&!value[i].equals(ma_softversion))
+				{
+					rmap.put("oErrMessage","版本号获取数据:"+value[i]+"与工单维护"+ma_softversion+"不一致");
+					return rmap;
+				}
+				if (!" ".equals(ma_qdz)&&name[i].equals("内存")&&!value[i].equals(ma_qdz))
+				{
+					rmap.put("oErrMessage","内存获取数据:"+value[i]+"与工单维护"+ma_qdz+"不一致");
+					return rmap;
+				}
+				if (!" ".equals(ma_zldcode)&&name[i].equals("储存")&&!value[i].equals(ma_zldcode))
+				{
+					rmap.put("oErrMessage","储存获取数据:"+value[i]+"与工单维护"+ma_zldcode+"不一致");
+					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)");