[行之成EIS]过站接口判定不良品逻辑处理

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

@@ -1981,7 +1981,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				return rmap;
 		}
 		//不良采集为良品是更新
-		if (StepCode!=null &&StepCode.toString().equals(CurrentStep) && iResult == "OK")
+		if (StepCode!=null &&StepCode.toString().equals(CurrentStep) && iResult.equals("OK"))
 		{
 			Object[] ob = baseDao.getFieldsDataByCondition("makeserial", "ms_status,ms_craftcode,ms_prodcode", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");
 			if (ob!=null)
@@ -1989,7 +1989,7 @@ public class MESHelperServiceImpl implements MESHelperService {
 				String ms_status =ob[0].toString();
 				String ms_craftcode= ob[1].toString();
 				String ms_prodcode = ob[2].toString();
-				if (ms_status == "3")
+				if (ms_status.equals("3"))
 				{
 					String nextstepcode =baseDao.getFieldDataByCondition("craft left join craftdetail on cr_id=cd_crid ", "cd_nextstepcode", "cr_code='" + ms_craftcode + "' and cr_prodcode='" + ms_prodcode + "' and cd_stepcode='" + CurrentStep + "'").toString();
 					baseDao.updateByCondition("makeserial", "ms_status=1,ms_nextstepcode='" + nextstepcode + "'", "ms_sncode='" + iSN + "' and ms_makecode='" + iMakeCode + "'");