|
|
@@ -734,7 +734,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
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");
|
|
|
+ Double ma_opentime = rs.getDouble("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))
|
|
|
@@ -752,7 +752,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oErrMessage","EMMC获取数据:"+value[i]+"与工单维护"+ma_emmc+"不一致");
|
|
|
return rmap;
|
|
|
}
|
|
|
- if (!"0".equals(ma_opentime)&&name[i].equals("开机时长")&&!value[i].equals(ma_opentime))
|
|
|
+ if (ma_opentime!=0&&name[i].equals("开机时长")&&Double.parseDouble(value[i])>=(ma_opentime))
|
|
|
{
|
|
|
rmap.put("oErrMessage","开机时长获取数据:"+value[i]+"与工单维护"+ma_opentime+"不一致");
|
|
|
return rmap;
|
|
|
@@ -769,7 +769,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
if (ma_ppidlength!=0&&name[i].equals("PPID")&&value[i].length()!=ma_ppidlength)
|
|
|
{
|
|
|
- rmap.put("oErrMessage","PPID:"+value[i]+"与工单维护前缀"+ma_ppidprefix+"不一致");
|
|
|
+ rmap.put("oErrMessage","PPID:"+value[i]+"与工单维护长度"+ma_ppidprefix+"不一致");
|
|
|
return rmap;
|
|
|
}
|
|
|
}
|
callm