|
@@ -811,7 +811,7 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
return rmap;
|
|
|
}
|
|
|
iSN=map.get("iSN").toString();
|
|
|
- SqlRowList rs=baseDao.queryForRowSet("select ma_remark1,ma_remark2,ma_remark3,ma_remark4,ma_remark5,ma_remark6,ma_remark7,ma_remark8,ma_remark9,ma_remark10,ma_remark11,ma_remark12,ma_remark13,ma_remark14,ma_remark15,ma_remark16 from make " +
|
|
|
+ SqlRowList rs=baseDao.queryForRowSet("select ma_remark1,ma_remark2,ma_remark3,ma_remark4,ma_remark5,ma_remark6,ma_remark7,ma_remark8,ma_remark9,ma_remark10,ma_remark11,ma_remark12,ma_remark13,ma_remark14,ma_remark15,ma_remark16,ma_remark17,ma_remark18 from make " +
|
|
|
"left join makeserial on ms_makecode=ma_code where ms_sncode='"+iSN+"'");
|
|
|
if(rs.next()){
|
|
|
rmap.put("oMaremark1",rs.getString("ma_remark1"));
|
|
@@ -830,6 +830,8 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
rmap.put("oMaremark14",rs.getString("ma_remark14"));
|
|
|
rmap.put("oMaremark15",rs.getString("ma_remark15"));
|
|
|
rmap.put("oMaremark16",rs.getString("ma_remark16"));
|
|
|
+ rmap.put("oMaremark17",rs.getString("ma_remark17"));
|
|
|
+ rmap.put("oMaremark18",rs.getString("ma_remark18"));
|
|
|
return rmap;
|
|
|
}else{
|
|
|
oErrMessage = "SN未查询到关联信息";
|