diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index ea7976f2..b4955ce7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -1910,7 +1910,7 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { dto.setMaId(listOneMaCode.get(0).getMaId()); // 判断是否属于该工程 MaCodeVo vo = backApplyInfoMapper.getMachineByMaIdOne(dto); - if(vo!=null && !Objects.equals(vo.getProId(), dto.getProId())){ + if(vo!=null && (!Objects.equals(vo.getProId(), dto.getProId()) || !Objects.equals(vo.getUnitId(), dto.getUnitId()))){ return AjaxResult.error("该设备编码非该单位工程下的设备,单位:"+vo.getUnitName()+",工程:"+vo.getProName()); }else if(vo == null){ return AjaxResult.error("该设备编码不存在领用记录,请重新选择");