新增接口

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

@@ -70,6 +70,12 @@ public class MESHelperController {
         return map;
     }
 
+    @RequestMapping(value="/SetPcbaData")
+    public Map<Object,Object> SetPcbaData(HttpServletRequest request,  @RequestBody String json){
+        Map<String, Object> modelMap = new HashMap<String, Object>();
+        Map<Object,Object> map = mesHelperService.SetPcbaData(json);
+        return map;
+    }
 
     //追溯信息接口
     @RequestMapping(value="/TraceabilityDataInterface")

src/main/java/com/uas/eis/service/MESHelperService.java

@@ -25,6 +25,9 @@ public interface MESHelperService {
 	Map<Object, Object> SPI(String data);
 
 	String CheckSteel(String data);
+
+	Map<Object, Object> SetPcbaData(String data);
+
 	Map<Object, Object> CheckRoutePassed(String data);
 
 	Map<Object, Object> CheckUserAndResourcePassed(String data);

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

@@ -1698,6 +1698,81 @@ public class MESHelperServiceImpl implements MESHelperService {
 		return rmap;
 	}
 
+	@Override
+	public Map<Object,Object> SetPcbaData(String data){
+		//实际业务数据
+		Map<Object, Object> rmap = new HashMap<>();
+		Map<String, Object> map=null;
+		try{
+			map =BaseUtil.convertJsonToMap(data);
+		}catch (Exception e){
+			rmap.put("code",-1);
+			rmap.put("message",e.getMessage());
+			System.out.printf(e.getMessage()) ;
+			return rmap;
+		}
+		String oErrMessage = null;
+		Integer code=0;
+		if(map.get("iSN")==null){
+			code=-1;
+			oErrMessage = "SN不能为空";
+			rmap.put("code",code);
+			rmap.put("oErrMessage",oErrMessage);
+			return rmap;
+		}
+		String iResCode = null;
+		String iOperator = null;
+		String iResult = null;
+		String iErrCode = null;
+		String iSN=map.get("iSN").toString();
+		if(map.get("iResCode")!=null){
+			iResCode=map.get("iResCode").toString();
+		}
+		if(map.get("iOperater")!=null){
+			iOperator=map.get("iOperater").toString();
+		}
+		if(map.get("iResult")!=null){
+			iResult=map.get("iResult").toString();
+		}
+		if(map.get("iErrCode")!=null){
+			iErrCode=map.get("iErrCode").toString();
+		}
+		String iGetTsn=baseDao.getFieldDataByCondition("source left join step on SC_STEPCODE=st_code", "nvl(st_getsn,'0')", "sc_code='" + iResCode + "'").toString();
+		if (!iGetTsn.equals("0"))
+		{
+			SqlRowList dt =baseDao.queryForRowSet("select ms_firstsn,ms_sncode from CRAFTMATERIAL left join make on cm_makecode=ma_code " +
+					"left join makeserial on ms_firstsn=cm_firstsn and cm_makecode=ms_makecode  where cm_barcode='" + iSN + "' and nvl(cm_status,0)<>-1 order by cm_id desc");
+			if (dt.next())
+			{
+				iSN = dt.getString("ms_sncode");
+			}
+			else
+			{
+				oErrMessage = "主板SN未查询到关联信息";
+			}
+		}
+		SqlRowList rs=baseDao.queryForRowSet("select ms_sncode from  makeserial where ms_imei1='"+iSN+"' or ms_imei2='"+iSN+"' or ms_imei3='"+iSN+"'");
+		if(rs.next()){
+			iSN=rs.getString("ms_sncode");
+		}else{
+			rs=baseDao.queryForRowSet("select mil_sncode from  makeimeilist where mil_imei1='"+iSN+"' or mil_imei2='"+iSN+"' or mil_imei3='"+iSN+"'");
+			if(rs.next()){
+				iSN=rs.getString("mil_sncode");
+			}
+		}
+
+		JSONObject map3=new JSONObject();
+		map3.put("iSN",iSN);
+		Map<Object, Object> map2=GetRcardMOInfo(map3);
+		String oMoCode=null;
+		if(map2.get("oMoCode")!=null){
+			oMoCode=map2.get("oMoCode").toString();
+		}
+		if (map2.get("oErrMessage")==null)
+			return SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode);
+		return rmap;
+	}
+
 	private Map<Object,Object> SetPcbaData(JSONObject map){
 		//实际业务数据
 		Map<Object, Object> rmap = new HashMap<>();