|
|
@@ -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,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);
|
|
|
+ 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,nvl(ma_wifi,1)ma_wifi,nvl(ma_aging,1)ma_aging from make where ma_code = ?",omakeCode);
|
|
|
if (rs.next()) {
|
|
|
String ma_softversion = rs.getString("ma_softversion");
|
|
|
String ma_qdz = rs.getString("ma_qdz");
|
|
|
@@ -736,6 +736,8 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
String ma_ppidprefix = rs.getString("ma_ppidprefix");
|
|
|
Double ma_opentime = rs.getDouble("ma_opentime");
|
|
|
Double ma_emmc = rs.getDouble("ma_emmc");
|
|
|
+ int ma_wifi = rs.getInt("ma_wifi");
|
|
|
+ int ma_aging = rs.getInt("ma_aging");
|
|
|
for (int i = 0; i < name.length; i++) {
|
|
|
if (!" ".equals(ma_softversion)&&name[i].equals("版本号")&&!value[i].equals(ma_softversion))
|
|
|
{
|
|
|
@@ -772,6 +774,16 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oErrMessage","PPID:"+value[i]+"与工单维护长度"+ma_ppidprefix+"不一致");
|
|
|
return rmap;
|
|
|
}
|
|
|
+ if (ma_wifi!=0&&name[i].equals("WiFi压测")&&!"1".equals(value[i]))
|
|
|
+ {
|
|
|
+ rmap.put("oErrMessage","WiFi压测获取数据:"+value[i]+"，开启管控时数值必须为1");
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ if (ma_aging!=0&&name[i].equals("老化压测")&&!"1".equals(value[i]))
|
|
|
+ {
|
|
|
+ rmap.put("oErrMessage","老化压测获取数据:"+value[i]+"，开启管控时数值必须为1");
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
baseDao.execute("update STEPTESTDETAIL set std_value1 = '-1' where STD_SN = '"+iSN+"' and STD_MAKECODE = '"+map2.get("oMoCode")+"'");
|
callm