|
@@ -100,6 +100,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
case GetMakeInfoBySN:
|
|
|
remap = GetMakeInfoBySN(json);
|
|
|
break;
|
|
|
+ case GetMakeInfoByProd:
|
|
|
+ remap = GetMakeInfoByProd(json);
|
|
|
+ break;
|
|
|
default:
|
|
|
err = -1;
|
|
|
break;
|
|
@@ -831,6 +834,36 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ private Map<Object,Object> GetMakeInfoByProd(JSONObject map)
|
|
|
+ {
|
|
|
+ Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
+ String iSN=null;
|
|
|
+ String oErrMessage=null;
|
|
|
+ if(map.get("iPrcode")==null){
|
|
|
+ oErrMessage = "产品编号不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ iSN=map.get("iPrcode").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+"'");
|
|
|
+ if(rs.next()){
|
|
|
+ rmap.put("oProdmark1",rs.getString("pr_remark1"));
|
|
|
+ rmap.put("oProdmark2",rs.getString("pr_remark2"));
|
|
|
+ rmap.put("oProdmark3",rs.getString("pr_remark3"));
|
|
|
+ rmap.put("oProdmark4",rs.getString("pr_remark4"));
|
|
|
+ rmap.put("oProdmark5",rs.getString("pr_remark5"));
|
|
|
+ rmap.put("oProdmark6",rs.getString("pr_remark6"));
|
|
|
+ rmap.put("oProdmark7",rs.getString("pr_remark7"));
|
|
|
+ rmap.put("oProdmark8",rs.getString("pr_remark8"));
|
|
|
+ return rmap;
|
|
|
+ }else{
|
|
|
+ oErrMessage = "产品未查询到关联信息";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
public Map<Object,Object> SetStepFinish(String iMakeCode, String iSourceCode, String iSN, String iMPKind, String iResult, String iUserCode, String iErrCode)
|
|
|
{
|
|
|
String oErrMessage = null;
|