|
|
@@ -727,7 +727,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oErrMessage","测试项目名称和值的项次不一致");
|
|
|
return rmap;
|
|
|
}
|
|
|
- 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);
|
|
|
+ SqlRowList rs = baseDao.queryForRowSet(" select nvl(ma_opentime,0)ma_opentime,nvl(ma_emmc,0)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");
|
|
|
@@ -735,7 +735,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
int ma_ppidlength = rs.getInt("ma_ppidlength");
|
|
|
String ma_ppidprefix = rs.getString("ma_ppidprefix");
|
|
|
Double ma_opentime = rs.getDouble("ma_opentime");
|
|
|
- String ma_emmc = rs.getString("ma_emmc");
|
|
|
+ Double ma_emmc = rs.getDouble("ma_emmc");
|
|
|
for (int i = 0; i < name.length; i++) {
|
|
|
if (!" ".equals(ma_softversion)&&name[i].equals("版本号")&&!value[i].equals(ma_softversion))
|
|
|
{
|
|
|
@@ -747,7 +747,7 @@ 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))
|
|
|
+ if (ma_emmc!=0&&name[i].equals("EMMC")&&Double.parseDouble(value[i])>=(ma_emmc))
|
|
|
{
|
|
|
rmap.put("oErrMessage","EMMC获取数据:"+value[i]+"与工单维护"+ma_emmc+"不一致");
|
|
|
return rmap;
|
callm