调整核对处理位置

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

@@ -417,14 +417,14 @@ public class MESHelperServiceImpl implements MESHelperService {
 				return rmap;
 			}
 
-			String checkMsg = null;
+			/*String checkMsg = null;
 			String isStop = Objects.toString(baseDao.getFieldDataByCondition("configs","data","caller='MESSetting' and code='stopLine'"),"0");
 			if(isStop.equals("1")){
 				List<String> resultList = baseDao.callProcedureWithOut("MES_CHECK_STOPLINE",new Object[]{
 						String.valueOf(MachineNO)
 						},new Integer[]{1},new Integer[]{2});
 				checkMsg = resultList.get(0);
-			}
+			}*/
 
 			String seq = String.valueOf(baseDao.getFieldDataByCondition("dual","devicetestinfo_seq.NEXTVAL seq","1=1"));
 			Map<Object, Object> paramsMap = new HashMap<Object, Object>();
@@ -487,7 +487,8 @@ public class MESHelperServiceImpl implements MESHelperService {
 			}
 			rmap.put("code","0");
 			rmap.put("result","OK");
-			rmap.put("ServerMessage","OK,过站处理成功,SPI测试数据上传成功,线体管控核对:" + checkMsg);
+//			rmap.put("ServerMessage","OK,过站处理成功,SPI测试数据上传成功,线体管控核对:" + checkMsg);
+			rmap.put("ServerMessage","OK,过站处理成功,SPI测试数据上传成功");
 
 		} catch (Exception e) {
 			rmap.put("code", "-1");