优化spi、aoi、回流过站接口

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

@@ -145,7 +145,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			if (!object.containsKey("SPIRecord") || object.get("SPIRecord") == null) {
 				rmap.put("code", "-1");
 				rmap.put("result","NG");
-				rmap.put("message", "缺少必要节点: SPIRecord");
+				rmap.put("message", "NG,参数缺少必要节点: SPIRecord");
 				return rmap;
 			}
 
@@ -194,20 +194,37 @@ public class MESHelperServiceImpl implements MESHelperService {
 				baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap,"devicetestinfo"));
 			}
 
+			String oErrMessage=null;
+			List<String> list = new ArrayList<String>();
+			list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
+					String.valueOf(Moname),
+					String.valueOf(Username),
+					String.valueOf(Lotsn),
+					String.valueOf("")
+			}, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
+			oErrMessage=list.get(2);
+			if(oErrMessage != null){
+				rmap.put("code", "-1");
+				rmap.put("result","NG");
+				rmap.put("message", "NG,过站核对失败,"+oErrMessage );
+				return rmap;
+			}
+
 			Map<Object, Object> stepMap = SetStepFinish(Moname, Username, Lotsn, "", "OK", Username, "");
 			if(stepMap.get("oErrMessage") != null){
 				rmap.put("code", "-1");
 				rmap.put("result","NG");
-				rmap.put("message", stepMap.get("oErrMessage") );
-			}else {
-				rmap.put("code","0");
-				rmap.put("result","OK");
-				rmap.put("ServerMessage","MES:检查数据上传成功！");
+				rmap.put("message", "NG,处理过站失败," + stepMap.get("oErrMessage") );
+				return rmap;
 			}
+			rmap.put("code","0");
+			rmap.put("result","OK");
+			rmap.put("ServerMessage","OK,过站处理成功,SPI测试数据上传成功");
+
 		} catch (Exception e) {
 			rmap.put("code", "-1");
 			rmap.put("result","NG");
-			rmap.put("message", e.getMessage());
+			rmap.put("message", "NG,SPI接口异常: "+e.getMessage());
 		}
 		return rmap;
 	}
@@ -221,7 +238,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			if (!object.containsKey("AOIRecord") || object.get("AOIRecord") == null) {
 				rmap.put("code", "-1");
 				rmap.put("result", "NG");
-				rmap.put("message", "缺少必要节点: AOIRecord");
+				rmap.put("message", "NG,参数缺少必要节点: AOIRecord");
 				return rmap;
 			}
 
@@ -271,6 +288,22 @@ public class MESHelperServiceImpl implements MESHelperService {
 				baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap, "devicetestinfo"));
 			}
 
+			String oErrMessage=null;
+			List<String> list = new ArrayList<String>();
+			list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
+					String.valueOf(Moname),
+					String.valueOf(Username),
+					String.valueOf(Lotsn),
+					String.valueOf("")
+			}, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
+			oErrMessage=list.get(2);
+			if(oErrMessage != null){
+				rmap.put("code", "-1");
+				rmap.put("result","NG");
+				rmap.put("message", "NG,过站核对失败,"+oErrMessage );
+				return rmap;
+			}
+
 			String[] items = Defect.split(",");
 			String errCode = "";
 			for (String item : items) {
@@ -283,16 +316,17 @@ public class MESHelperServiceImpl implements MESHelperService {
 			if(stepMap.get("oErrMessage") != null){
 				rmap.put("code", "-1");
 				rmap.put("result","NG");
-				rmap.put("message", stepMap.get("oErrMessage") );
-			}else {
-				rmap.put("code","0");
-				rmap.put("result","OK");
-				rmap.put("ServerMessage", "MES:AOI数据上传成功！");
+				rmap.put("message", "NG,处理过站失败," + stepMap.get("oErrMessage") );
+				return rmap;
 			}
+
+			rmap.put("code","0");
+			rmap.put("result","OK");
+			rmap.put("ServerMessage", "OK,过站处理成功,AOI测试数据上传成功");
 		} catch (Exception e) {
 			rmap.put("code", "-1");
 			rmap.put("result", "NG");
-			rmap.put("message", "AOI接口异常: " + e.getMessage());
+			rmap.put("message", "NG,AOI接口异常:" + e.getMessage());
 		}
 		return rmap;
 	}
@@ -306,31 +340,32 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String TERMINAL_NAME	= object.optString("TERMINAL_NAME", "");
 		String EMP_NO   	  	= object.optString("EMP_NO", "");
 		try{
-			SqlRowList rs = baseDao.queryForRowSet("SELECT ms_makecode FROM makeserial where ms_sncode ='"+SN+"'");
-			if (rs.next()) {
-				String wo = rs.getString("ms_makecode");
-				List<String> list = new ArrayList<String>();
-				list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
-						String.valueOf(wo),
-						String.valueOf(TERMINAL_NAME),
-						String.valueOf(SN),
-						String.valueOf(EMP_NO)
-				}, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
-				String oErrMessage=list.get(2);
-				if(oErrMessage == null){
-					rmap.put("SN", SN);
-					rmap.put("Status", true);
-					rmap.put("Message", "Success");
-				}else{
-					rmap.put("SN", SN);
-					rmap.put("Status", false);
-					rmap.put("Message", "NG," + oErrMessage);
-				}
-			}else{
+			List<String> list = new ArrayList<String>();
+			list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
+					String.valueOf(""),
+					String.valueOf(TERMINAL_NAME),
+					String.valueOf(SN),
+					String.valueOf(EMP_NO)
+			}, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
+			String oErrMessage=list.get(2);
+			String wo=list.get(2);
+			if(oErrMessage != null){
+				rmap.put("SN", SN);
+				rmap.put("Status", false);
+				rmap.put("Message", "NG," + oErrMessage);
+				return rmap;
+			}
+
+			Map<Object, Object> stepMap = SetStepFinish(wo, EMP_NO, SN, "", "OK", EMP_NO, "");
+			if(stepMap.get("oErrMessage") != null){
 				rmap.put("SN", SN);
 				rmap.put("Status", false);
-				rmap.put("Message", "NG,产品序列号未绑定MES工单");
+				rmap.put("Message", "NG,处理过站失败," + stepMap.get("oErrMessage") );
+				return rmap;
 			}
+			rmap.put("SN", SN);
+			rmap.put("Status", true);
+			rmap.put("Message", "OK,过站处理成功");
 		}catch (Exception ex){
 			rmap.put("SN", SN);
 			rmap.put("Status", false);
@@ -452,7 +487,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap.put("Message", "Success");
 		}catch (Exception ex){
 			rmap.put("Status", false);
-			rmap.put("Message", "Fail");
+			rmap.put("Message", "Fail," + ex.getMessage());
 		}
 		return rmap;
 	}