From 6bbf43731a2c4fb48c335c1e8586a8e65283c475 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 28 Dec 2023 10:16:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=BB=B4=E4=BF=AE=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ContainerRepairRecordMainController.java | 12 +++- .../vo/ContainerRepairRecordMainExcelVO.java | 72 +++---------------- .../ContainerRepairRecordMainService.java | 2 +- .../ContainerRepairRecordMainServiceImpl.java | 38 +++++++++- 4 files changed, 56 insertions(+), 68 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRepair/ContainerRepairRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRepair/ContainerRepairRecordMainController.java index b45a7d66..a2ec63f9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRepair/ContainerRepairRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRepair/ContainerRepairRecordMainController.java @@ -2,11 +2,13 @@ package com.win.module.wms.controller.containerRepair; import com.win.framework.common.pojo.CommonResult; import com.win.framework.common.pojo.PageResult; +import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.framework.excel.core.util.ExcelUtils; import com.win.framework.operatelog.core.annotations.OperateLog; import com.win.module.wms.controller.containerRepair.vo.*; import com.win.module.wms.convert.containerRepair.ContainerRepairRecordMainConvert; import com.win.module.wms.dal.dataobject.containerRepair.ContainerRepairRecordMainDO; +import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.containerRepair.ContainerRepairRecordMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -93,10 +95,14 @@ public class ContainerRepairRecordMainController { @OperateLog(type = EXPORT) public void exportContainerRepairRecordMainExcel(@Valid ContainerRepairRecordMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { - List list = containerRepairRecordMainService.getContainerRepairRecordMainList(exportReqVO); + Map mapDropDown = new HashMap<>(); + String[] componentContainerStatusFrom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CONTAINER_STATUS); + mapDropDown.put(3, componentContainerStatusFrom); + String[] componentContainerStatusTo = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CONTAINER_STATUS); + mapDropDown.put(4, componentContainerStatusTo); + List list = containerRepairRecordMainService.getContainerRepairRecordMainList(exportReqVO); // 导出 Excel - List datas = ContainerRepairRecordMainConvert.INSTANCE.convertList02(list); - ExcelUtils.write(response, "器具维修记录主.xls", "数据", ContainerRepairRecordMainExcelVO.class, datas); + ExcelUtils.write(response, "器具维修记录主.xls", "数据", ContainerRepairRecordMainExcelVO.class, list,mapDropDown); } @GetMapping("/get-import-template") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRepair/vo/ContainerRepairRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRepair/vo/ContainerRepairRecordMainExcelVO.java index 7b38d6c9..da766596 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRepair/vo/ContainerRepairRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerRepair/vo/ContainerRepairRecordMainExcelVO.java @@ -1,6 +1,9 @@ package com.win.module.wms.controller.containerRepair.vo; import com.alibaba.excel.annotation.ExcelProperty; +import com.win.framework.excel.core.annotations.DictFormat; +import com.win.framework.excel.core.convert.DictConvert; +import com.win.module.wms.enums.DictTypeConstants; import lombok.Data; import java.time.LocalDateTime; @@ -13,79 +16,24 @@ import java.time.LocalDateTime; @Data public class ContainerRepairRecordMainExcelVO { - @ExcelProperty("id") - private Long id; - @ExcelProperty("单据号") private String number; @ExcelProperty("器具号") private String containerNumber; - @ExcelProperty("从仓库代码") + @ExcelProperty("仓库代码") private String fromWarehouseCode; - @ExcelProperty("到仓库代码") - private String toWarehouseCode; - - @ExcelProperty("出库事务类型") - private String outTransactionType; - - @ExcelProperty("入库事务类型") - private String inTransactionType; - - @ExcelProperty("执行时间") - private LocalDateTime executeTime; - - @ExcelProperty("生效日期") - private LocalDateTime activeDate; - - @ExcelProperty("是否可用") - private String available; - - @ExcelProperty("申请时间") - private LocalDateTime requestTime; - - @ExcelProperty("截止时间") - private LocalDateTime dueTime; - - @ExcelProperty("部门") - private String departmentCode; - - @ExcelProperty("用户组") - private String userGroupCode; + @ExcelProperty(value = "从状态",converter = DictConvert.class) + @DictFormat(DictTypeConstants.CONTAINER_STATUS) + private String fromContainerStatus; - @ExcelProperty("接口类型") - private String interfaceType; - - @ExcelProperty("业务类型") - private String businessType; - - @ExcelProperty("备注") - private String remark; + @ExcelProperty(value = "到状态",converter = DictConvert.class) + @DictFormat(DictTypeConstants.CONTAINER_STATUS) + private String toContainerStatus; @ExcelProperty("创建时间") private LocalDateTime createTime; - @ExcelProperty("扩展属性") - private String extraProperties; - - @ExcelProperty("地点ID") - private String siteId; - - @ExcelProperty("代码") - private String code; - - @ExcelProperty("从库位类型范围") - private String fromLocationTypes; - - @ExcelProperty("到库位类型范围") - private String toLocationTypes; - - @ExcelProperty("从库区代码范围") - private String fromAreaCodes; - - @ExcelProperty("到库区代码范围") - private String toAreaCodes; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRepair/ContainerRepairRecordMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRepair/ContainerRepairRecordMainService.java index 9613e266..be9ba4db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRepair/ContainerRepairRecordMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRepair/ContainerRepairRecordMainService.java @@ -67,7 +67,7 @@ public interface ContainerRepairRecordMainService { * @param exportReqVO 查询条件 * @return 器具维修记录主列表 */ - List getContainerRepairRecordMainList(ContainerRepairRecordMainExportReqVO exportReqVO); + List getContainerRepairRecordMainList(ContainerRepairRecordMainExportReqVO exportReqVO); /** * 导入器具维修记录主主信息 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRepair/ContainerRepairRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRepair/ContainerRepairRecordMainServiceImpl.java index 5c21d1cb..15ac1a93 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRepair/ContainerRepairRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerRepair/ContainerRepairRecordMainServiceImpl.java @@ -3,9 +3,16 @@ package com.win.module.wms.service.containerRepair; import cn.hutool.core.collection.CollUtil; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.containerRepair.vo.*; +import com.win.module.wms.controller.containerUnbind.vo.ContainerUnbindRecordDetailExportReqVO; +import com.win.module.wms.controller.containerUnbind.vo.ContainerUnbindRecordMainExcelVO; import com.win.module.wms.convert.containerRepair.ContainerRepairRecordMainConvert; +import com.win.module.wms.dal.dataobject.containerRepair.ContainerRepairRecordDetailDO; import com.win.module.wms.dal.dataobject.containerRepair.ContainerRepairRecordMainDO; +import com.win.module.wms.dal.dataobject.containerUnbind.ContainerUnbindRecordDetailDO; +import com.win.module.wms.dal.dataobject.containerUnbind.ContainerUnbindRecordMainDO; +import com.win.module.wms.dal.mysql.containerRepair.ContainerRepairRecordDetailMapper; import com.win.module.wms.dal.mysql.containerRepair.ContainerRepairRecordMainMapper; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.validation.annotation.Validated; @@ -13,6 +20,8 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import static com.win.framework.common.exception.util.ServiceExceptionUtil.exception; import static com.win.module.wms.enums.ErrorCodeConstants.CONTAINER_REPAIR_RECORD_MAIN_IMPORT_LIST_IS_EMPTY; @@ -29,6 +38,9 @@ public class ContainerRepairRecordMainServiceImpl implements ContainerRepairReco @Resource private ContainerRepairRecordMainMapper containerRepairRecordMainMapper; + @Resource + private ContainerRepairRecordDetailMapper containerRepairRecordDetailMapper; + @Override public Long createContainerRepairRecordMain(ContainerRepairRecordMainCreateReqVO createReqVO) { @@ -78,8 +90,30 @@ public class ContainerRepairRecordMainServiceImpl implements ContainerRepairReco } @Override - public List getContainerRepairRecordMainList(ContainerRepairRecordMainExportReqVO exportReqVO) { - return containerRepairRecordMainMapper.selectList(exportReqVO); + public List getContainerRepairRecordMainList(ContainerRepairRecordMainExportReqVO exportReqVO) { + List excelVOList = new ArrayList<>(); + List mainDOList = containerRepairRecordMainMapper.selectList(exportReqVO); + if(mainDOList != null && mainDOList.size() > 0){ + ContainerRepairRecordDetailExportReqVO reqVO = new ContainerRepairRecordDetailExportReqVO(); + BeanUtils.copyProperties(exportReqVO,reqVO); + List detailDOList = containerRepairRecordDetailMapper.selectList(reqVO); + Map> groupMasterIdMap = detailDOList.stream().collect(Collectors.groupingBy(ContainerRepairRecordDetailDO::getMasterId)); + for(ContainerRepairRecordMainDO mainDO:mainDOList){ + Long id = mainDO.getId(); + List detailChildList = groupMasterIdMap.get(id); + if(detailChildList != null && detailChildList.size() > 0){ + for(ContainerRepairRecordDetailDO detailDO:detailChildList){ + ContainerRepairRecordMainExcelVO containerRepairRecordMainExcelVO = new ContainerRepairRecordMainExcelVO(); + BeanUtils.copyProperties(mainDO,containerRepairRecordMainExcelVO); + BeanUtils.copyProperties(detailDO,containerRepairRecordMainExcelVO); + containerRepairRecordMainExcelVO.setFromContainerStatus(detailDO.getFromContainerStatus()); + containerRepairRecordMainExcelVO.setToContainerStatus(detailDO.getToContainerStatus()); + excelVOList.add(containerRepairRecordMainExcelVO); + } + } + } + } + return excelVOList; } @Override