@@ -86,7 +86,7 @@ public class PartServiceImpl extends ServiceImpl<IPartMapper, Part> implements I
if(part == null){
throw new BusinessException(ResultCode.PART_NOT_EXITS);
}
- if(part.getPartStock() - count <= 0){
+ if(part.getPartStock() - count < 0){
throw new BusinessException(ResultCode.PART_STOCK_ERROR.code(),part.getPartName()+"_"+ResultCode.PART_STOCK_ERROR.message());
LambdaUpdateWrapper<Part> wrapper = new LambdaUpdateWrapper<>();
@@ -189,7 +189,7 @@ public class RepairPersonnelService {
throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
List<PriceList> priceListList = priceListService.getByRepairId(repair.getRepairId());
- List<PriceList> collect = priceListList.stream().filter(entity -> entity.getRecoveryStatus() == 0).collect(Collectors.toList());
+ List<PriceList> collect = priceListList.stream().filter(entity ->entity.getType()== 0 && entity.getRecoveryStatus() == 0).collect(Collectors.toList());
if(collect.size() >0){
repairLogService.saveBySysUser(userId,repair.getRepairId(),8,"维修完成");
}else {