diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java index c68b9a189..abafc1f87 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/TaskQuestController.java @@ -223,6 +223,17 @@ public class TaskQuestController extends BladeController { } + @GetMapping("/export-panDataWithPackage") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "导出已盘数据明细维度", notes = "传入questDetailDTO") + public void exportPanDataWithPackage(QuestDetailDTO questDetailDTO, HttpServletResponse response){ + String questNum = questDetailDTO.getQuestNum(); + List list = taskQuestService.exportPanDataWithPackage(questDetailDTO); + ExcelUtil.export(response, "盘点任务【"+questNum+"】数据" + DateUtil.time(), "盘点明细数据表", list, QuestContrastPackageExcelVO.class); + + } + + /** * 导出数据 */ diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java index 94613c953..456499d3d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/QuestDetailDTO.java @@ -53,7 +53,4 @@ public class QuestDetailDTO extends QuestDetailEntity { private String endTime;// 结束时间 - - - } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java index 524065ca7..6edcc1f82 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.java @@ -201,4 +201,6 @@ public interface TaskQuestMapper extends BaseMapper { Integer findStockNum(@Param("questDetailId") Long questDetailId, @Param("tableName") String tableName); List exportAllDataWithPackage(@Param("param") QuestDetailDTO questDetailDTO); + + List exportPanDataWithPackage(@Param("param") QuestDetailDTO questDetailDTO); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml index f51798213..d344c263a 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/TaskQuestMapper.xml @@ -747,4 +747,45 @@ where is_deleted = 0 + + diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java index 7fb18f3a6..c963f81d4 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java @@ -309,4 +309,5 @@ public interface ITaskQuestService extends BaseService { List exportAllDataWithPackage(QuestDetailDTO questDetailDTO); + List exportPanDataWithPackage(QuestDetailDTO questDetailDTO); } diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 8e145f135..09b917b9d 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -3497,6 +3497,11 @@ public class TaskQuestServiceImpl extends BaseServiceImpl exportPanDataWithPackage(QuestDetailDTO questDetailDTO) { + return baseMapper.exportPanDataWithPackage(questDetailDTO); + } + private String getQuestNum(String warehouseCode) { SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); // return "PDRW_" + warehouseCode + "_" + simpleDateFormat.format(new Date()) + String.format("%03d", new Random().nextInt(900) + 100);