添加逻辑限制PPID，EMMC，开机时长

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

@@ -727,11 +727,15 @@ 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);
+		SqlRowList rs = baseDao.queryForRowSet(" select nvl(ma_opentime,0)ma_opentime,nvl(ma_emmc,' ')ma_emmc,nvl(ma_ppidlength,0)ma_ppidlength,nvl(ma_ppidprefix,' ')ma_ppidprefix,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");
+			int ma_ppidlength = rs.getInt("ma_ppidlength");
+			String ma_ppidprefix = rs.getString("ma_ppidprefix");
+			String ma_opentime = rs.getString("ma_opentime");
+			String ma_emmc = rs.getString("ma_emmc");
 			for (int i = 0; i < name.length; i++) {
                 if (!" ".equals(ma_softversion)&&name[i].equals("版本号")&&!value[i].equals(ma_softversion))
 				{
@@ -743,11 +747,31 @@ public class MESHelperServiceImpl implements MESHelperService {
 					rmap.put("oErrMessage","内存获取数据:"+value[i]+"与工单维护"+ma_qdz+"不一致");
 					return rmap;
 				}
+				if (!" ".equals(ma_emmc)&&name[i].equals("EMMC")&&!value[i].equals(ma_emmc))
+				{
+					rmap.put("oErrMessage","EMMC获取数据:"+value[i]+"与工单维护"+ma_emmc+"不一致");
+					return rmap;
+				}
+				if (!"0".equals(ma_opentime)&&name[i].equals("开机时长")&&!value[i].equals(ma_opentime))
+				{
+					rmap.put("oErrMessage","开机时长获取数据:"+value[i]+"与工单维护"+ma_opentime+"不一致");
+					return rmap;
+				}
 				if (!" ".equals(ma_zldcode)&&name[i].equals("储存")&&!value[i].equals(ma_zldcode))
 				{
 					rmap.put("oErrMessage","储存获取数据:"+value[i]+"与工单维护"+ma_zldcode+"不一致");
 					return rmap;
 				}
+				if (!" ".equals(ma_ppidprefix)&&name[i].equals("PPID")&&!value[i].startsWith(ma_ppidprefix))
+				{
+					rmap.put("oErrMessage","PPID:"+value[i]+"与工单维护前缀"+ma_ppidprefix+"不一致");
+					return rmap;
+				}
+				if (ma_ppidlength!=0&&name[i].equals("PPID")&&!value[i].length()!=ma_ppidlength)
+				{
+					rmap.put("oErrMessage","PPID:"+value[i]+"与工单维护前缀"+ma_ppidprefix+"不一致");
+					return rmap;
+				}
 			}
 		}
 		baseDao.execute("update STEPTESTDETAIL set std_value1 = '-1' where STD_SN = '"+iSN+"' and STD_MAKECODE = '"+map2.get("oMoCode")+"'");