添加获取上料接口参数

src/main/java/com/uas/eis/controller/MESHelperController.java

@@ -119,8 +119,6 @@ public class MESHelperController {
         return map;
     }
 
-
-
     //镭雕机接口
     @RequestMapping(value="/Radium")
     public Map<Object,Object> Radium(HttpServletRequest request,  @RequestBody String json){

src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -1046,14 +1046,24 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("oErrMessage",oErrMessage);
 			return rmap;
 		}
-		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<>' '))");
+		rs = baseDao.queryForRowSet("select ms_makecode,ms_firstsn,ms_prodcode,ms_bomversion,ms_craftcode,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 = "";
+		String ms_craftcode = "";
+		String ms_bomversion = "";
+		String ms_prodcode = "";
+		String ms_firstsn = "";
+		String ms_makecode = "";
 		if(rs.next()){
 			ms_status= rs.getString("ms_status");
 			ms_stepcode=rs.getString("ms_stepcode");
 			ms_nextstepcode=rs.getString("ms_nextstepcode");
+			ms_craftcode=rs.getString("ms_craftcode");
+			ms_bomversion=rs.getString("ms_bomversion");
+			ms_prodcode=rs.getString("ms_prodcode");
+			ms_firstsn=rs.getString("ms_firstsn");
+			ms_makecode=rs.getString("ms_makecode");
 		}
 		String stepcode = GetStepCodeBySource(iResCode);
 		if (ms_nextstepcode != "" && !ms_nextstepcode.equals(stepcode))
@@ -1061,8 +1071,22 @@ public class MESHelperServiceImpl implements MESHelperService {
 			oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
 			code=-1;
 		}
+
+		rs=baseDao.queryForRowSet("select max(sp_id)sp_id,max(sp_detno)sp_detno,min(sp_ifrepeat)sp_ifrepeat,max(sp_checkbarcode)sp_checkbarcode,min(sp_checksalecode)sp_checksalecode,\n" +
+				"sp_fsoncode,max(sp_barcoderule)sp_barcoderule,wm_concat(sp_soncode) sp_soncode,max(sp_ifuseregex)sp_ifuseregex,max(sp_ifforsn)\n" +
+				"sp_ifforsn,max(sp_length)sp_length,max(sp_type)sp_type,replace(wm_concat(sp_prefix),',','|')sp_prefix,max(sp_regex)\n" +
+				"sp_regex,max(pr_detail)pr_detail,max(substr(pr_spec,0,20))pr_spec from stepproduct left join product on pr_code=sp_fsoncode where\n" +
+				"sp_bomversion='"+ms_bomversion+"' and sp_craftcode='"+ms_craftcode+"' and sp_stepcode='"+stepcode+"'\n" +
+				"And sp_mothercode ='"+ms_prodcode+"' and sp_tracekind=1 and not exists(select 1 from craftmaterial where \n" +
+				"cm_sncode in (select '"+ms_firstsn+"' from dual union select sn from makesnrelation where firstsn='"+ms_firstsn+"') \n" +
+				"and cm_makecode='"+ms_makecode+"' and cm_fsoncode=\n" +
+				"sp_fsoncode and cm_status=0) group by sp_fsoncode order by SP_DETNO asc");
+
 		rmap.put("code",code);
 		rmap.put("oErrMessage",oErrMessage);
+		if(rs.next()){
+			rmap.put("data",rs.getResultList());
+		}
 		return rmap;
 	}
 	public String CheckRoutePassed(String iSN,String iResCode){