修改上料不允许接口过站

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

@@ -771,11 +771,26 @@ public class MESHelperServiceImpl implements MESHelperService {
 		if(map.get("iErrCode")!=null){
 			iErrCode=map.get("iErrCode").toString();
 		}
-		Object obj=baseDao.getFieldDataByCondition("source left join step on sc_stepcode=st_code","nvl(st_ifinput,0)","sc_code='"+iResCode+"'");
-		if(obj.toString().equals("-1")){
-			oErrMessage = "上料工序必须在客户端进行过站";
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
+		SqlRowList rs=baseDao.queryForRowSet("select nvl(st_ifinput,0)st_ifinput,nvl(st_ifoqc,0)st_ifoqc,nvl(st_ifweigh,0)st_ifweigh from source left join step on sc_stepcode=st_code where sc_code='"+iResCode+"'");
+		if(rs.next()){
+			String st_ifinput=rs.getString("st_ifinput");
+			String st_ifoqc=rs.getString("st_ifinput");
+			String st_ifweigh=rs.getString("st_ifweigh");
+			if(st_ifinput.equals("-1")){
+				oErrMessage = "上料工序必须在客户端进行过站";
+				rmap.put("oErrMessage",oErrMessage);
+				return rmap;
+			}
+			if(st_ifoqc.equals("-1")){
+				oErrMessage = "OQC必须在客户端进行过站";
+				rmap.put("oErrMessage",oErrMessage);
+				return rmap;
+			}
+			if(st_ifweigh.equals("-1")){
+				oErrMessage = "称重工序必须在客户端进行过站";
+				rmap.put("oErrMessage",oErrMessage);
+				return rmap;
+			}
 		}
 		JSONObject map3=new JSONObject();
 		map3.put("iSN",iSN);