添加MAC和BT不允许重复

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

@@ -816,6 +816,18 @@ public class MESHelperServiceImpl implements MESHelperService {
 			rmap = SetTestDetail(map);
 			if (rmap.get("oErrMessage")==null)
 			{
+				Object macobj=baseDao.getFieldDataByCondition("makeserial","ms_sncode","MS_MACWIFI='"+mac_wifi+"' and ms_sncode<>'"+iSN+"' ");
+				Object btobj=baseDao.getFieldDataByCondition("makeserial","ms_sncode","MS_MACBT='"+mac_bt+"' and ms_sncode<>'"+iSN+"' ");
+               	if(macobj!=null){
+					oErrMessage = mac_wifi+"已被SN["+macobj+"]使用";
+					rmap.put("oErrMessage",oErrMessage);
+					return rmap;
+				}
+				if(btobj!=null){
+					oErrMessage = mac_bt+"已被SN["+btobj+"]使用";
+					rmap.put("oErrMessage",oErrMessage);
+					return rmap;
+				}
                 baseDao.updateByCondition("makeserial","MS_MACWIFI = '"+mac_wifi+"',MS_MACBT = '"+mac_bt+"'","ms_sncode = '"+iSN+"' and ms_makecode = '"+oMoCode+"'");
 				return SetStepFinish(oMoCode, iResCode, iSN, "", iResult, iOperator, iErrCode);
 			}