优化过站接口

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

@@ -143,7 +143,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			JSONObject object = JSONObject.fromObject(data);
 
 			if (!object.containsKey("SPIRecord") || object.get("SPIRecord") == null) {
-				rmap.put("code", -1);
+				rmap.put("code", "-1");
 				rmap.put("result","NG");
 				rmap.put("message", "缺少必要节点: SPIRecord");
 				return rmap;
@@ -194,11 +194,20 @@ public class MESHelperServiceImpl implements MESHelperService {
 				baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap,"devicetestinfo"));
 			}
 
-			rmap.put("code","0");
-			rmap.put("result","OK");
-			rmap.put("ServerMessage","MES:检查数据上传成功！");
+			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:检查数据上传成功！");
+			}
 		} catch (Exception e) {
-			System.out.printf(e.getMessage());
+			rmap.put("code", "-1");
+			rmap.put("result","NG");
+			rmap.put("message", e.getMessage());
 		}
 		return rmap;
 	}
@@ -210,7 +219,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			JSONObject object = JSONObject.fromObject(data);
 
 			if (!object.containsKey("AOIRecord") || object.get("AOIRecord") == null) {
-				rmap.put("code", -1);
+				rmap.put("code", "-1");
 				rmap.put("result", "NG");
 				rmap.put("message", "缺少必要节点: AOIRecord");
 				return rmap;
@@ -262,11 +271,26 @@ public class MESHelperServiceImpl implements MESHelperService {
 				baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap, "devicetestinfo"));
 			}
 
-			rmap.put("code", "0");
-			rmap.put("result", "OK");
-			rmap.put("ServerMessage", "MES:AOI数据上传成功！");
+			String[] items = Defect.split(",");
+			String errCode = "";
+			for (String item : items) {
+				SqlRowList rs1 = baseDao.queryForRowSet("SELECT bc_code FROM BADCODE where bc_name = '"+ item +"'");
+				if(rs1.next()){
+					errCode = errCode + "," +rs1.getString("bc_code");
+				}
+			}
+			Map<Object, Object> stepMap = SetStepFinish(Moname, Username, Lotsn, "", Result, Username, errCode);
+			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数据上传成功！");
+			}
 		} catch (Exception e) {
-			rmap.put("code", -1);
+			rmap.put("code", "-1");
 			rmap.put("result", "NG");
 			rmap.put("message", "AOI接口异常: " + e.getMessage());
 		}