调整停线限制

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

@@ -415,12 +415,16 @@ public class MESHelperServiceImpl implements MESHelperService {
 
 			String isStop = Objects.toString(baseDao.getFieldDataByCondition("configs","data","caller='MESSetting' and code='stopLine'"),"0");
 			if(isStop.equals("1")){
-				String StatusRemark = Objects.toString(baseDao.getFieldDataByCondition("linestatus","lis_remark","lis_code='"+LineNO+"' and lis_start = 0 and lis_type is not null"),"");
-				if (!StatusRemark.isEmpty()){
-					rmap.put("code","-1");
-					rmap.put("result","NG");
-					rmap.put("ServerMessage","NG,已开启线体启停核对,当前异常:" + StatusRemark);
-					return rmap;
+				String lisStart = Objects.toString(baseDao.getFieldDataByCondition("linestatus","lis_start","lis_code='"+LineNO+"' and lis_type is not null"),"");
+				String lisStop = Objects.toString(baseDao.getFieldDataByCondition("linestatus","lis_stop","lis_code='"+LineNO+"' and lis_type is not null"),"");
+				if(lisStart.equals("0") || lisStop.equals("0")){
+					String StatusRemark = Objects.toString(baseDao.getFieldDataByCondition("linestatus","lis_remark","lis_code='"+LineNO+"' and lis_start = 0 and lis_type is not null"),"");
+					if (!StatusRemark.isEmpty()){
+						rmap.put("code","-1");
+						rmap.put("result","NG");
+						rmap.put("ServerMessage","NG,已开启线体启停核对,当前异常:" + StatusRemark);
+						return rmap;
+					}
 				}
 
 				if(!baseDao.checkIf("deviceline","dl_linecode='"+LineNO+"' and dl_status='已启动'")){