BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：导出入库单列表BUG修复；

pull/1121/head
liujiang 2025-10-03 21:32:32 +08:00
parent 129087588a
commit 787fec6803
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xkt/src/main/java/com/ruoyi/xkt/mapper/StoreProductStorageDetailMapper.java
View File

@ -3,9 +3,8 @@ package com.ruoyi.xkt.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.xkt.domain.StoreProductStorageDetail;
import com.ruoyi.xkt.dto.storeProdStorage.StoreStorageDetailDownloadDTO;
import org.apache.ibatis.annotations.Param;
import com.ruoyi.xkt.dto.storeProdStorage.StoreStorageExportDTO;
import java.util.Date;
import java.util.List;
/**
@ -19,18 +18,17 @@ public interface StoreProductStorageDetailMapper extends BaseMapper<StoreProduct
/**
* 导出选定的入库记录
*
* @param storeProdStorageIdList 入库单ID列表
* @param exportDTO 导出入参
* @return 入库记录
*/
List<StoreStorageDetailDownloadDTO> selectExportList(@Param("storeProdStorageIdList") List<Long> storeProdStorageIdList);
List<StoreStorageDetailDownloadDTO> selectExportList(StoreStorageExportDTO exportDTO);
/**
* 导出指定时间段内的入库记录
*
* @param voucherDateStart 开始时间
* @param voucherDateEnd 结束时间
* @param exportDTO 导出入参
* @return 入库记录
*/
List<StoreStorageDetailDownloadDTO> selectExportListVoucherDateBetween(@Param("voucherDateStart") Date voucherDateStart, @Param("voucherDateEnd") Date voucherDateEnd);
List<StoreStorageDetailDownloadDTO> selectExportListVoucherDateBetween(StoreStorageExportDTO exportDTO);
}

4
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDetailServiceImpl.java
View File

@ -44,7 +44,7 @@ public class StoreProductStorageDetailServiceImpl implements IStoreProductStorag
throw new ServiceException("当前用户非档口管理者或子账号，无权限操作!", HttpStatus.ERROR);
}
if (CollectionUtils.isNotEmpty(exportDTO.getStoreProdStorageIdList())) {
return this.storageDetailMapper.selectExportList(exportDTO.getStoreProdStorageIdList());
return this.storageDetailMapper.selectExportList(exportDTO);
} else {
// 没有传时间，则设置当前时间往前推半年
if (ObjectUtils.isEmpty(exportDTO.getVoucherDateStart()) && ObjectUtils.isEmpty(exportDTO.getVoucherDateEnd())) {
@ -64,7 +64,7 @@ public class StoreProductStorageDetailServiceImpl implements IStoreProductStorag
throw new ServiceException("导出时间间隔不能超过6个月!", HttpStatus.ERROR);
}
}
return this.storageDetailMapper.selectExportListVoucherDateBetween(exportDTO.getVoucherDateStart(), exportDTO.getVoucherDateEnd());
return this.storageDetailMapper.selectExportListVoucherDateBetween(exportDTO);
}
}
}