spi线体管控

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

@@ -369,14 +369,20 @@ public class MESHelperServiceImpl implements MESHelperService {
 		Map<Object, Object> rmap = new HashMap<Object, Object>();
 		try {
 			JSONObject object = JSONObject.fromObject(data);
-			Object isStop = baseDao.getFieldDataByCondition("configs","decode(data,'0','0','1','-1') isStopObj","caller='MESSetting' and code='stopLine'");
-
 			if (!object.containsKey("SPIRecord") || object.get("SPIRecord") == null) {
 				rmap.put("code", "-1");
 				rmap.put("result","NG");
 				rmap.put("message", "NG,参数缺少必要节点: SPIRecord");
 				return rmap;
 			}
+
+			String checkMsg = null;
+			String isStop = Objects.toString(baseDao.getFieldDataByCondition("configs","data","caller='MESSetting' and code='stopLine'"),"0");
+			if(isStop.equals("1")){
+				List<String> result = baseDao.callProcedureWithOut("MES_CHECK_STOPLINE",null,new Integer[]{},new Integer[]{1});
+				checkMsg = result.get(0);
+			}
+
 			JSONObject record = JSONObject.fromObject(object.get("SPIRecord"));
 			String Username   = record.optString("Username", "");
 			String Shiftname  = record.optString("Shiftname", "");
@@ -479,7 +485,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			}
 			rmap.put("code","0");
 			rmap.put("result","OK");
-			rmap.put("ServerMessage","OK,过站处理成功,SPI测试数据上传成功");
+			rmap.put("ServerMessage","OK,过站处理成功,SPI测试数据上传成功,线体管控核对:" + checkMsg);
 
 		} catch (Exception e) {
 			rmap.put("code", "-1");