开启线体启动限制和治具测试仪默认状态

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

@@ -237,7 +237,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 			SqlRowList rs=baseDao.queryForRowSet("SELECT st_id,st_line,st_usestatus,st_kind,nvl(st_cleannums, 0) st_cleannums FROM stencil WHERE st_code = ?",MeshCode);
 			if(rs.next()){
 				String cleannums = rs.getString("st_cleannums");
-				String usestatus = rs.getString("st_usestatus");
+				String usestatus = Objects.toString(rs.getString("st_usestatus"), "在库");
 				String stKind = rs.getString("st_kind");
 				SqlRowList rs1=baseDao.queryForRowSet("SELECT stenciluse_seq.NEXTVAL seq FROM dual");
 				if(rs1.next()){
@@ -417,14 +417,23 @@ public class MESHelperServiceImpl implements MESHelperService {
 				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> resultList = baseDao.callProcedureWithOut("MES_CHECK_STOPLINE",new Object[]{
-						String.valueOf(MachineNO)
-						},new Integer[]{1},new Integer[]{2});
-				checkMsg = resultList.get(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='已启动'")){
+					rmap.put("code","-1");
+					rmap.put("result","NG");
+					rmap.put("ServerMessage","NG,已开启线体启停核对,机台处于暂停状态,请启动");
+					return rmap;
+				}
+			}
 
 			String seq = String.valueOf(baseDao.getFieldDataByCondition("dual","devicetestinfo_seq.NEXTVAL seq","1=1"));
 			Map<Object, Object> paramsMap = new HashMap<Object, Object>();