diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java index cde8a4ff..803e99b3 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java @@ -85,4 +85,6 @@ public interface DictTypeConstants { String JOB_STAGE_STATUS = "job_stage_status";//任务阶段状态 String COUNT_STAGE = "count_stage"; //阶段 String BIND_TYPE = "bind_type"; // 器具绑定类型 + String CONTAINER_TYPE = "container_type"; // 器具类型 + String CONTAINER_STATUS = "container_status"; // 器具状态 } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerinit/ContainerInitRecordMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerinit/ContainerInitRecordMainController.java index 6ca9df21..1f4af94a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerinit/ContainerInitRecordMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerinit/ContainerInitRecordMainController.java @@ -2,11 +2,13 @@ package com.win.module.wms.controller.containerinit; 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.containerinit.vo.*; import com.win.module.wms.convert.containerinit.ContainerInitRecordMainConvert; import com.win.module.wms.dal.dataobject.containerinit.ContainerInitRecordMainDO; +import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.service.containerinit.ContainerInitRecordMainService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -93,9 +95,14 @@ public class ContainerInitRecordMainController { @OperateLog(type = EXPORT) public void exportContainerInitRecordMainExcel(@Valid ContainerInitRecordMainExportReqVO exportReqVO, HttpServletResponse response) throws IOException { + Map mapDropDown = new HashMap<>(); + String[] componentContainerType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CONTAINER_TYPE); + mapDropDown.put(3, componentContainerType); + String[] componentContainerStatus = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CONTAINER_STATUS); + mapDropDown.put(5, componentContainerStatus); List list = containerInitRecordMainService.getContainerInitRecordMainList(exportReqVO); // 导出 Excel - ExcelUtils.write(response, "器具初始化记录.xls", "数据", ContainerInitRecordMainExcelVO.class, list); + ExcelUtils.write(response, "器具初始化记录.xls", "数据", ContainerInitRecordMainExcelVO.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/containerinit/vo/ContainerInitRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerinit/vo/ContainerInitRecordMainExcelVO.java index e895759f..6a353fa3 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerinit/vo/ContainerInitRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/containerinit/vo/ContainerInitRecordMainExcelVO.java @@ -1,6 +1,9 @@ package com.win.module.wms.controller.containerinit.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.math.BigDecimal; @@ -24,14 +27,16 @@ public class ContainerInitRecordMainExcelVO { @ExcelProperty("器具号") private String containerNumber; - @ExcelProperty("类型") + @ExcelProperty(value = "类型", converter = DictConvert.class) + @DictFormat(DictTypeConstants.CONTAINER_TYPE) private String type; @ExcelProperty("总容量") private BigDecimal capacity; - @ExcelProperty("状态") - private String status; + @ExcelProperty(value = "状态", converter = DictConvert.class) + @DictFormat(DictTypeConstants.CONTAINER_STATUS) + private String containerStatus; @ExcelProperty("货主代码") private String ownerCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerinit/ContainerInitRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerinit/ContainerInitRecordMainServiceImpl.java index 570cc9f6..e45f31db 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerinit/ContainerInitRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/containerinit/ContainerInitRecordMainServiceImpl.java @@ -102,6 +102,7 @@ public class ContainerInitRecordMainServiceImpl implements ContainerInitRecordMa ContainerInitRecordMainExcelVO containerInitRecordMainExcelVO = new ContainerInitRecordMainExcelVO(); BeanUtils.copyProperties(mainDO,containerInitRecordMainExcelVO); BeanUtils.copyProperties(detailDO,containerInitRecordMainExcelVO); + containerInitRecordMainExcelVO.setContainerStatus(detailDO.getStatus()); excelVOList.add(containerInitRecordMainExcelVO); } }