Procházet zdrojové kódy

优化逻辑,AOI核对了之后更新成0

callm před 6 dny
rodič
revize
a2c19a05a8

+ 2 - 2
src/main/java/com/uas/eis/serviceImpl/MESHelperServiceImpl.java

@@ -1118,13 +1118,13 @@ public class MESHelperServiceImpl implements MESHelperService {
 			return rmap;
 			return rmap;
 		}
 		}
 		String ms_id=rs.getString("ms_id");
 		String ms_id=rs.getString("ms_id");
-		if("-1".equals(rs.getString("ms_isaoi"))){
+		if("0".equals(rs.getString("ms_isaoi"))){
 			rmap.put("oErrMessage","SN:"+iSN+"的AOI测试结果已更新,不允许重复更新");
 			rmap.put("oErrMessage","SN:"+iSN+"的AOI测试结果已更新,不允许重复更新");
 			return rmap;
 			return rmap;
 		}
 		}
 		//原子更新:更新条件里带上未更新标记,即使并发调用也只有一次会生效
 		//原子更新:更新条件里带上未更新标记,即使并发调用也只有一次会生效
 		int updated=baseDao.executeUpdate("update "+Master+".makeserial set ms_isaoi=0 " +
 		int updated=baseDao.executeUpdate("update "+Master+".makeserial set ms_isaoi=0 " +
-				"where ms_id='"+ms_id+"' and nvl(ms_isaoi,0)<>-1");
+				"where ms_id='"+ms_id+"'");
 		if(updated==0){
 		if(updated==0){
 			rmap.put("oErrMessage","SN:"+iSN+"的AOI测试结果已更新,不允许重复更新");
 			rmap.put("oErrMessage","SN:"+iSN+"的AOI测试结果已更新,不允许重复更新");
 			return rmap;
 			return rmap;