验证过站数据

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

@@ -193,7 +193,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				paramsMap.put("dti_side",Side);
 				baseDao.execute(SqlUtil.getInsertSqlByMap(paramsMap,"devicetestinfo"));
 			}
-
+			Moname = "YTDZAY26050047";
 			String oErrMessage=null;
 			List<String> list = new ArrayList<String>();
 			list = baseDao.callProcedureWithOut("CS_CHECKSTEPSNANDMACODE", new Object[]{
@@ -209,8 +209,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 				rmap.put("message", "NG,过站核对失败,"+oErrMessage );
 				return rmap;
 			}
-
-			Map<Object, Object> stepMap = SetStepFinish(Moname, Username, Lotsn, "", "OK", Username, "");
+			String wo = list.get(0);
+			Map<Object, Object> stepMap = SetStepFinish(wo, Username, Lotsn, "", "OK", Username, "");
 			if(stepMap.get("oErrMessage") != null){
 				rmap.put("code", "-1");
 				rmap.put("result","NG");
@@ -313,7 +313,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 				}
 			}
 			String newRes = Result == "PASS" ? "OK":"NG";
-			Map<Object, Object> stepMap = SetStepFinish(Moname, Username, Lotsn, "", newRes, Username, errCode);
+			String wo = list.get(0);
+			Map<Object, Object> stepMap = SetStepFinish(wo, Username, Lotsn, "", newRes, Username, errCode);
 			if(stepMap.get("oErrMessage") != null){
 				rmap.put("code", "-1");
 				rmap.put("result","NG");
@@ -349,7 +350,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 					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);
+			String wo=list.get(0);
 			if(oErrMessage != null){
 				rmap.put("SN", SN);
 				rmap.put("Status", false);