接口校验修改

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

@@ -1131,14 +1131,14 @@ public class MESHelperServiceImpl implements MESHelperService {
 		String ms_stepcode = "";
 		String ms_nextstepcode = "";
 		if(rs.next()){
-			ms_status= rs.getString("ms_status");
-			ms_stepcode=rs.getString("ms_stepcode");
-			ms_nextstepcode=rs.getString("ms_nextstepcode");
+			ms_status= rs.getGeneralString("ms_status");
+			ms_stepcode=rs.getGeneralString("ms_stepcode");
+			ms_nextstepcode=rs.getGeneralString("ms_nextstepcode");
 		}
 		String stepcode = GetStepCodeBySource(iResCode);
-		if ( oErrMessage == null || (ms_status == "3" && ms_stepcode == stepcode))
+		if ( oErrMessage == null || (ms_status .equals("3")&& ms_stepcode.equals(stepcode) ))
 		{
-			if (ms_status == "3")
+			if (ms_status.equals("3"))
 			{
 				oErrMessage =  null;
 			}
@@ -1226,24 +1226,28 @@ public class MESHelperServiceImpl implements MESHelperService {
 				String.valueOf("")
 		}, new Integer[]{1, 2, 3, 4}, new Integer[]{5, 6, 7});
 		oErrMessage=list.get(2);
-		if(oErrMessage!=null){
-			rmap.put("oErrMessage",oErrMessage);
-			return rmap;
-		}
+
 		SqlRowList rs = baseDao.queryForRowSet("select ms_status,ms_stepcode,ms_nextstepcode from makeserial where ms_id=(  select max(ms_id) from makeserial where ms_sncode  in ( select '" + iSN + "' from dual union select sn from makesnrelation where beforesn='" + iSN + "' and sn<>' '  union select beforesn from makesnrelation where sn='" + iSN + "' and beforesn<>' '))");
 		String ms_status = "";
 		String ms_stepcode = "";
 		String ms_nextstepcode = "";
 		if(rs.next()){
-			ms_status= rs.getString("ms_status");
-			ms_stepcode=rs.getString("ms_stepcode");
-			ms_nextstepcode=rs.getString("ms_nextstepcode");
+			ms_status= rs.getGeneralString("ms_status");
+			ms_stepcode=rs.getGeneralString("ms_stepcode");
+			ms_nextstepcode=rs.getGeneralString("ms_nextstepcode");
 		}
 		String stepcode = GetStepCodeBySource(iResCode);
-		if (ms_nextstepcode != "" && !ms_nextstepcode.equals(stepcode)&& !ms_stepcode.equals(stepcode))
+		if (!ms_nextstepcode.equals("")&& !ms_nextstepcode.equals(stepcode)&& !ms_stepcode.equals(stepcode))
 		{
 			oErrMessage = "当前序列号下一工序" + ms_nextstepcode;
 		}
+		if ( oErrMessage == null || (ms_status .equals("3")&& ms_stepcode.equals(stepcode) ))
+		{
+			if (ms_status.equals("3"))
+			{
+				oErrMessage =  null;
+			}
+		}
 		rmap.put("oErrMessage",oErrMessage);
 		return rmap;
 	}