|
|
@@ -94,6 +94,9 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
case GetInfoByMaterial:
|
|
|
remap = GetInfoByMaterial(json);
|
|
|
break;
|
|
|
+ case GoMo:
|
|
|
+ remap = GoMo(json);
|
|
|
+ break;
|
|
|
default:
|
|
|
err = -1;
|
|
|
break;
|
|
|
@@ -104,6 +107,61 @@ public class MESHelperServiceImpl implements MESHelperService {
|
|
|
SpObserver.putSp(username);
|
|
|
return remap;
|
|
|
}
|
|
|
+
|
|
|
+ private Map<Object,Object> GoMo(JSONObject map){
|
|
|
+ Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
+ String iSN=null;
|
|
|
+ String iResCode=null;
|
|
|
+ String iMo=null;
|
|
|
+ String oErrMessage=null;
|
|
|
+ if(map.get("iMo")==null){
|
|
|
+ oErrMessage = "工单号不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ if(map.get("iResCode")==null){
|
|
|
+ oErrMessage = "岗位资源不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ if(map.get("iSN")==null){
|
|
|
+ oErrMessage = "SN不能为空";
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+ iSN=map.get("iSN").toString();
|
|
|
+ iResCode=map.get("iResCode").toString();
|
|
|
+ iMo=map.get("iMo").toString();
|
|
|
+ List<String> list = new ArrayList<String>();
|
|
|
+ list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
|
|
|
+ String.valueOf(iMo),
|
|
|
+ String.valueOf(iResCode),
|
|
|
+ String.valueOf(iSN),
|
|
|
+ String.valueOf("")
|
|
|
+ }, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
|
|
|
+ oErrMessage=list.get(2);
|
|
|
+
|
|
|
+ SqlRowList rs = baseDao.queryForRowSet("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=( select max(ms_id) from makeserial where ms_sncode in ( select '" + iSN + "' from dual union select sn from makesnrelation where beforesn='" + iSN + "' and sn<>' ' union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' '))");
|
|
|
+ String ms_status = "";
|
|
|
+ String ms_stepcode = "";
|
|
|
+ String ms_nextstepcode = "";
|
|
|
+ if(rs.next()){
|
|
|
+ ms_status= rs.getString("ms_status");
|
|
|
+ ms_stepcode=rs.getString("ms_stepcode");
|
|
|
+ ms_nextstepcode=rs.getString("ms_nextstepcode");
|
|
|
+ }
|
|
|
+ String stepcode = GetStepCodeBySource(iResCode);
|
|
|
+ if ( oErrMessage == null || (ms_status == "3" && ms_stepcode == stepcode))
|
|
|
+ {
|
|
|
+ if (ms_status == "3")
|
|
|
+ {
|
|
|
+ oErrMessage = null;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ rmap.put("oErrMessage",oErrMessage);
|
|
|
+ return rmap;
|
|
|
+ }
|
|
|
+
|
|
|
private Map<Object,Object> GetInfoByMaterial(JSONObject map){
|
|
|
Map<Object, Object> rmap = new HashMap<Object, Object>();
|
|
|
String iPCBA=null;
|