|
|
@@ -839,14 +839,14 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
String iSN=null;
|
|
|
String oErrMessage=null;
|
|
|
- if(map.get("iPrcode")==null){
|
|
|
+ if(map.get("iSN")==null){
|
|
|
oErrMessage = "产品编号不能为空";
|
|
|
rmap.put("oErrMessage",oErrMessage);
|
|
|
return rmap;
|
|
|
}
|
|
|
- iSN=map.get("iPrcode").toString();
|
|
|
+ iSN=map.get("iSN").toString();
|
|
|
SqlRowList rs=baseDao.queryForRowSet("select pr_remark1,pr_remark2,pr_remark3,pr_remark4,pr_remark5" +
|
|
|
- ",pr_remark6,pr_remark7,pr_remark8 from product where pr_code='"+iSN+"'");
|
|
|
+ ",pr_remark6,pr_remark7,pr_remark8 from Makeserial left join product on pr_code=ms_prodcode where ms_sncode='"+iSN+"' order by ms_id desc");
|
|
|
if(rs.next()){
|
|
|
rmap.put("oProdmark1",rs.getString("pr_remark1"));
|
|
|
rmap.put("oProdmark2",rs.getString("pr_remark2"));
|
