|
@@ -824,15 +824,10 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}
|
|
}
|
|
|
iSN=map.get("iSN").toString();
|
|
iSN=map.get("iSN").toString();
|
|
|
- SqlRowList rs=baseDao.queryForRowSet("select ma_remark1,ma_remark2,ma_remark3,ma_remark4,ma_remark5,ma_remark6 from make " +
|
|
|
|
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select ma_softversion from make " +
|
|
|
"left join makeserial on ms_makecode=ma_code where ms_sncode='"+iSN+"'");
|
|
"left join makeserial on ms_makecode=ma_code where ms_sncode='"+iSN+"'");
|
|
|
if(rs.next()){
|
|
if(rs.next()){
|
|
|
- rmap.put("oMaremark1",rs.getString("ma_remark1"));
|
|
|
|
|
- rmap.put("oMaremark2",rs.getString("ma_remark2"));
|
|
|
|
|
- rmap.put("oMaremark3",rs.getString("ma_remark3"));
|
|
|
|
|
- rmap.put("oMaremark4",rs.getString("ma_remark4"));
|
|
|
|
|
- rmap.put("oMaremark5",rs.getString("ma_remark5"));
|
|
|
|
|
- rmap.put("oMaremark6",rs.getString("ma_remark6"));
|
|
|
|
|
|
|
+ rmap.put("oSoftVersion",rs.getString("ma_softversion"));
|
|
|
return rmap;
|
|
return rmap;
|
|
|
}else{
|
|
}else{
|
|
|
oErrMessage = "SN未查询到关联信息";
|
|
oErrMessage = "SN未查询到关联信息";
|
