Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/AccountcalendarController.java

@@ -1,12 +1,18 @@
 package com.win.module.wms.controller.accountcalendar;
 
+import com.alibaba.druid.sql.ast.statement.SQLCreateDatabaseStatement;
 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.accountcalendar.vo.*;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.accountcalendar.AccountcalendarService;
@@ -39,6 +45,9 @@ public class AccountcalendarController {
     @Resource
     private AccountcalendarService accountcalendarService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建账期日历")
     @PreAuthorize("@ss.hasPermission('wms:accountcalendar:create')")
@@ -98,6 +107,11 @@ public class AccountcalendarController {
         List<AccountcalendarDO> list = accountcalendarService.getAccountcalendarList(exportReqVO);
         // 导出 Excel
         List<AccountcalendarExcelVO> datas = AccountcalendarConvert.INSTANCE.convertList02(list);
+        for(AccountcalendarExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "账期日历.xls", "数据", AccountcalendarExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/AreabasicController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.accountcalendar.vo.AccountcalendarExcelVO;
 import com.win.module.wms.controller.areabasic.vo.*;
 import com.win.module.wms.convert.areabasic.AreabasicConvert;
 import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO;
@@ -39,6 +42,9 @@ public class AreabasicController {
     @Resource
     private AreabasicService areabasicService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库区")
     @PreAuthorize("@ss.hasPermission('wms:areabasic:create')")
@@ -98,6 +104,11 @@ public class AreabasicController {
         List<AreabasicDO> list = areabasicService.getAreabasicList(exportReqVO);
         // 导出 Excel
         List<AreabasicExcelVO> datas = AreabasicConvert.INSTANCE.convertList02(list);
+        for(AreabasicExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库区.xls", "数据", AreabasicExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/BackflushRecordDetailbController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.backflushRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.areabasic.vo.AreabasicExcelVO;
 import com.win.module.wms.controller.backflushRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,8 @@ public class BackflushRecordDetailbController {
     @Resource
     private BackflushRecordDetailbService backflushRecordDetailbService;
 
+    @Resource
+    private AdminUserApi userApi;
     @PostMapping("/create")
     @Operation(summary = "创建制品收货记录子")
     @PreAuthorize("@ss.hasPermission('wms:backflush-record-detailb:create')")
@@ -96,6 +101,11 @@ public class BackflushRecordDetailbController {
         List<BackflushRecordDetailbDO> list = backflushRecordDetailbService.getBackflushRecordDetailbList(exportReqVO);
         // 导出 Excel
         List<BackflushRecordDetailbExcelVO> datas = BackflushRecordDetailbConvert.INSTANCE.convertList02(list);
+        for(BackflushRecordDetailbExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "制品收货记录子.xls", "数据", BackflushRecordDetailbExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/backflushRecord/vo/BackflushRecordDetailbExcelVO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.backflushRecord.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -69,6 +70,7 @@ public class BackflushRecordDetailbExcelVO {
     private String remark;
 
     @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
     private LocalDateTime createTime;
 
     @ExcelProperty("创建者Id")
@@ -84,4 +86,5 @@ public class BackflushRecordDetailbExcelVO {
     @ExcelProperty("任务明细ID")
     private String jobDetailId;
 
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/BalanceController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.balance;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbExcelVO;
 import com.win.module.wms.controller.balance.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +39,8 @@ public class BalanceController {
 
     @Resource
     private BalanceService balanceService;
+    @Resource
+    private AdminUserApi userApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建库存余额")
@@ -96,7 +101,11 @@ public class BalanceController {
         List<BalanceDO> list = balanceService.getBalanceList(exportReqVO);
         // 导出 Excel
         List<BalanceExcelVO> datas = BalanceConvert.INSTANCE.convertList02(list);
-        ExcelUtils.write(response, "库存余额.xls", "数据", BalanceExcelVO.class, datas);
+        for (BalanceExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+            ExcelUtils.write(response, "库存余额.xls", "数据", BalanceExcelVO.class, datas);
+        }
     }
-
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceExcelVO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.balance.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -117,4 +118,11 @@ public class BalanceExcelVO {
     @ExcelProperty("体积")
     private BigDecimal volume;
 
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者Id")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/BarcodeController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.backflushRecord.vo.BackflushRecordDetailbExcelVO;
 import com.win.module.wms.controller.barcode.vo.*;
 import com.win.module.wms.convert.barcode.BarcodeConvert;
 import com.win.module.wms.dal.dataobject.barcode.BarcodeDO;
@@ -39,6 +42,9 @@ public class BarcodeController {
     @Resource
     private BarcodeService barcodeService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建条码片段")
     @PreAuthorize("@ss.hasPermission('label:barcode:create')")
@@ -98,6 +104,11 @@ public class BarcodeController {
         List<BarcodeDO> list = barcodeService.getBarcodeList(exportReqVO);
         // 导出 Excel
         List<BarcodeExcelVO> datas = BarcodeConvert.INSTANCE.convertList02(list);
+        for(BarcodeExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "条码片段.xls", "数据", BarcodeExcelVO.class, datas);
     }
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/barcode/vo/BarcodeExcelVO.java

@@ -1,8 +1,11 @@
 package com.win.module.wms.controller.barcode.vo;
 
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * 条码片段 Excel VO
  *
@@ -50,4 +53,12 @@ public class BarcodeExcelVO {
     @ExcelProperty("是否加密")
     private String isEncypt;
 
+
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者Id")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/BomController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.barcode.vo.BarcodeExcelVO;
 import com.win.module.wms.controller.bom.vo.*;
 import com.win.module.wms.convert.bom.BomConvert;
 import com.win.module.wms.dal.dataobject.bom.BomDO;
@@ -39,6 +42,9 @@ public class BomController {
     @Resource
     private BomService bomService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建物料清单")
     @PreAuthorize("@ss.hasPermission('wms:bom:create')")
@@ -98,6 +104,11 @@ public class BomController {
         List<BomDO> list = bomService.getBomList(exportReqVO);
         // 导出 Excel
         List<BomExcelVO> datas = BomConvert.INSTANCE.convertList02(list);
+        for(BomExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "物料清单.xls", "数据", BomExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/BusinesstypeController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.bom.vo.BomExcelVO;
 import com.win.module.wms.controller.businesstype.vo.*;
 import com.win.module.wms.convert.businesstype.BusinesstypeConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@@ -39,6 +42,9 @@ public class BusinesstypeController {
     @Resource
     private BusinesstypeService businesstypeService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建业务类型")
     @PreAuthorize("@ss.hasPermission('wms:businesstype:create')")
@@ -98,6 +104,11 @@ public class BusinesstypeController {
         List<BusinesstypeDO> list = businesstypeService.getBusinesstypeList(exportReqVO);
         // 导出 Excel
         List<BusinesstypeExcelVO> datas = BusinesstypeConvert.INSTANCE.convertList02(list);
+        for(BusinesstypeExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "业务类型.xls", "数据", BusinesstypeExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/CarrierController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.businesstype.vo.BusinesstypeExcelVO;
 import com.win.module.wms.controller.carrier.vo.*;
 import com.win.module.wms.convert.carrier.CarrierConvert;
 import com.win.module.wms.dal.dataobject.carrier.CarrierDO;
@@ -39,6 +42,9 @@ public class CarrierController {
     @Resource
     private CarrierService carrierService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建承运商")
     @PreAuthorize("@ss.hasPermission('wms:carrier:create')")
@@ -98,6 +104,11 @@ public class CarrierController {
         List<CarrierDO> list = carrierService.getCarrierList(exportReqVO);
         // 导出 Excel
         List<CarrierExcelVO> datas = CarrierConvert.INSTANCE.convertList02(list);
+        for(CarrierExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "承运商.xls", "数据", CarrierExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/ConditionController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.carrier.vo.CarrierExcelVO;
 import com.win.module.wms.controller.condition.vo.*;
 import com.win.module.wms.convert.condition.ConditionConvert;
 import com.win.module.wms.dal.dataobject.condition.ConditionDO;
@@ -39,6 +42,9 @@ public class ConditionController {
     @Resource
     private ConditionService conditionService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建条件")
     @PreAuthorize("@ss.hasPermission('wms:condition:create')")
@@ -98,6 +104,11 @@ public class ConditionController {
         List<ConditionDO> list = conditionService.getConditionList(exportReqVO);
         // 导出 Excel
         List<ConditionExcelVO> datas = ConditionConvert.INSTANCE.convertList02(list);
+        for(ConditionExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "条件.xls", "数据", ConditionExcelVO.class, datas);
     }
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/condition/vo/ConditionExcelVO.java

@@ -1,7 +1,10 @@
 package com.win.module.wms.controller.condition.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDateTime;
 import java.util.*;
 
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -36,4 +39,12 @@ public class ConditionExcelVO {
     @ExcelProperty("条件分组")
     private String groupCode;
 
+
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者Id")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/ConfigurationController.java

@@ -4,6 +4,9 @@ import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.excel.core.util.ExcelUtils;
 import com.win.framework.operatelog.core.annotations.OperateLog;
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.condition.vo.ConditionExcelVO;
 import com.win.module.wms.controller.configuration.vo.*;
 import com.win.module.wms.convert.configuration.ConfigurationConvert;
 import com.win.module.wms.dal.dataobject.configuration.ConfigurationDO;
@@ -37,6 +40,9 @@ public class ConfigurationController {
     @Resource
     private ConfigurationService configurationService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建配置")
     @PreAuthorize("@ss.hasPermission('wms:configuration:create')")
@@ -96,6 +102,11 @@ public class ConfigurationController {
         List<ConfigurationDO> list = configurationService.getConfigurationList(exportReqVO);
         // 导出 Excel
         List<ConfigurationExcelVO> datas = ConfigurationConvert.INSTANCE.convertList02(list);
+        for(ConfigurationExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "配置.xls", "数据", ConfigurationExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configuration/vo/ConfigurationExcelVO.java

@@ -1,7 +1,10 @@
 package com.win.module.wms.controller.configuration.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDateTime;
 import java.util.*;
 
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -32,4 +35,12 @@ public class ConfigurationExcelVO {
     @ExcelProperty("配置分组")
     private String groupCode;
 
+
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者Id")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/ConfigurationsettingController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.configuration.vo.ConfigurationExcelVO;
 import com.win.module.wms.controller.configurationsetting.vo.*;
 import com.win.module.wms.convert.configurationsetting.ConfigurationsettingConvert;
 import com.win.module.wms.dal.dataobject.configurationsetting.ConfigurationsettingDO;
@@ -39,6 +42,9 @@ public class ConfigurationsettingController {
     @Resource
     private ConfigurationsettingService configurationsettingService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建配置设置")
     @PreAuthorize("@ss.hasPermission('wms:configurationsetting:create')")
@@ -98,6 +104,11 @@ public class ConfigurationsettingController {
         List<ConfigurationsettingDO> list = configurationsettingService.getConfigurationsettingList(exportReqVO);
         // 导出 Excel
         List<ConfigurationsettingExcelVO> datas = ConfigurationsettingConvert.INSTANCE.convertList02(list);
+        for(ConfigurationsettingExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "配置设置.xls", "数据", ConfigurationsettingExcelVO.class, datas);
     }
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/configurationsetting/vo/ConfigurationsettingExcelVO.java

@@ -1,7 +1,10 @@
 package com.win.module.wms.controller.configurationsetting.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDateTime;
 import java.util.*;
 
 import com.alibaba.excel.annotation.ExcelProperty;
@@ -43,4 +46,11 @@ public class ConfigurationsettingExcelVO {
     @ExcelProperty("必填")
     private String isRequired;
 
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者Id")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumeRecord/ConsumeRecordDetailbController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.consumeRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.configurationsetting.vo.ConfigurationsettingExcelVO;
 import com.win.module.wms.controller.consumeRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class ConsumeRecordDetailbController {
     @Resource
     private ConsumeRecordDetailbService consumeRecordDetailbService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建制品返修记录子")
     @PreAuthorize("@ss.hasPermission('wms:consume-record-detailb:create')")
@@ -96,6 +102,11 @@ public class ConsumeRecordDetailbController {
         List<ConsumeRecordDetailbDO> list = consumeRecordDetailbService.getConsumeRecordDetailbList(exportReqVO);
         // 导出 Excel
         List<ConsumeRecordDetailbExcelVO> datas = ConsumeRecordDetailbConvert.INSTANCE.convertList02(list);
+        for(ConsumeRecordDetailbExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "制品返修记录子.xls", "数据", ConsumeRecordDetailbExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/consumereRequest/ConsumereRequestDetailbController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.consumereRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.consumeRecord.vo.ConsumeRecordDetailbExcelVO;
 import com.win.module.wms.controller.consumereRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class ConsumereRequestDetailbController {
     @Resource
     private ConsumereRequestDetailbService consumereRequestDetailbService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建制品返修申请子")
     @PreAuthorize("@ss.hasPermission('wms:consumere-request-detailb:create')")
@@ -96,6 +102,11 @@ public class ConsumereRequestDetailbController {
         List<ConsumereRequestDetailbDO> list = consumereRequestDetailbService.getConsumereRequestDetailbList(exportReqVO);
         // 导出 Excel
         List<ConsumereRequestDetailbExcelVO> datas = ConsumereRequestDetailbConvert.INSTANCE.convertList02(list);
+        for(ConsumereRequestDetailbExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "制品返修申请子.xls", "数据", ConsumereRequestDetailbExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.container;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.container.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class ContainerDetailController {
     @Resource
     private ContainerDetailService containerDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建器具子")
     @PreAuthorize("@ss.hasPermission('wms:container-detail:create')")
@@ -96,6 +101,11 @@ public class ContainerDetailController {
         List<ContainerDetailDO> list = containerDetailService.getContainerDetailList(exportReqVO);
         // 导出 Excel
         List<ContainerDetailExcelVO> datas = ContainerDetailConvert.INSTANCE.convertList02(list);
+        for(ContainerDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "器具子.xls", "数据", ContainerDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/ContainerMainController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.container;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.consumereRequest.vo.ConsumereRequestDetailbExcelVO;
 import com.win.module.wms.controller.container.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class ContainerMainController {
     @Resource
     private ContainerMainService containerMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建器具主")
     @PreAuthorize("@ss.hasPermission('wms:container-main:create')")
@@ -96,6 +102,11 @@ public class ContainerMainController {
         List<ContainerMainDO> list = containerMainService.getContainerMainList(exportReqVO);
         // 导出 Excel
         List<ContainerMainExcelVO> datas = ContainerMainConvert.INSTANCE.convertList02(list);
+        for(ContainerMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "器具主.xls", "数据", ContainerMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailExcelVO.java

@@ -1,7 +1,10 @@
 package com.win.module.wms.controller.container.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDateTime;
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -42,4 +45,11 @@ public class ContainerDetailExcelVO {
     @ExcelProperty("数量")
     private BigDecimal qty;
 
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者Id")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainExcelVO.java

@@ -1,7 +1,10 @@
 package com.win.module.wms.controller.container.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDateTime;
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -38,4 +41,11 @@ public class ContainerMainExcelVO {
     @ExcelProperty("货主代码")
     private String ownerCode;
 
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者Id")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.countJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.countJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class CountJobDetailController {
     @Resource
     private CountJobDetailService countJobDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点任务子")
     @PreAuthorize("@ss.hasPermission('wms:count-job-detail:create')")
@@ -96,6 +101,11 @@ public class CountJobDetailController {
         List<CountJobDetailDO> list = countJobDetailService.getCountJobDetailList(exportReqVO);
         // 导出 Excel
         List<CountJobDetailExcelVO> datas = CountJobDetailConvert.INSTANCE.convertList02(list);
+        for(CountJobDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点任务子.xls", "数据", CountJobDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/CountJobMainController.java

@@ -1,6 +1,9 @@
 package com.win.module.wms.controller.countJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.countJob.vo.*;
+import com.win.module.wms.controller.countadjustRequest.vo.CountadjustRequestMainExcelVO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -37,6 +40,9 @@ public class CountJobMainController {
     @Resource
     private CountJobMainService countJobMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点任务主")
     @PreAuthorize("@ss.hasPermission('wms:count-job-main:create')")
@@ -96,6 +102,11 @@ public class CountJobMainController {
         List<CountJobMainDO> list = countJobMainService.getCountJobMainList(exportReqVO);
         // 导出 Excel
         List<CountJobMainExcelVO> datas = CountJobMainConvert.INSTANCE.convertList02(list);
+        for(CountJobMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点任务主.xls", "数据", CountJobMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.countPlan;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.countPlan.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class CountPlanDetailController {
     @Resource
     private CountPlanDetailService countPlanDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点计划子")
     @PreAuthorize("@ss.hasPermission('wms:count-plan-detail:create')")
@@ -96,6 +101,11 @@ public class CountPlanDetailController {
         List<CountPlanDetailDO> list = countPlanDetailService.getCountPlanDetailList(exportReqVO);
         // 导出 Excel
         List<CountPlanDetailExcelVO> datas = CountPlanDetailConvert.INSTANCE.convertList02(list);
+        for(CountPlanDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点计划子.xls", "数据", CountPlanDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/CountPlanMainController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.countPlan;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.countJob.vo.CountJobMainExcelVO;
 import com.win.module.wms.controller.countPlan.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class CountPlanMainController {
     @Resource
     private CountPlanMainService countPlanMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点计划主")
     @PreAuthorize("@ss.hasPermission('wms:count-plan-main:create')")
@@ -96,6 +102,11 @@ public class CountPlanMainController {
         List<CountPlanMainDO> list = countPlanMainService.getCountPlanMainList(exportReqVO);
         // 导出 Excel
         List<CountPlanMainExcelVO> datas = CountPlanMainConvert.INSTANCE.convertList02(list);
+        for(CountPlanMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点计划主.xls", "数据", CountPlanMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordDetailController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.countRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.countPlan.vo.CountPlanMainExcelVO;
 import com.win.module.wms.controller.countRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class CountRecordDetailController {
     @Resource
     private CountRecordDetailService countRecordDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点记录子")
     @PreAuthorize("@ss.hasPermission('wms:count-record-detail:create')")
@@ -96,6 +102,11 @@ public class CountRecordDetailController {
         List<CountRecordDetailDO> list = countRecordDetailService.getCountRecordDetailList(exportReqVO);
         // 导出 Excel
         List<CountRecordDetailExcelVO> datas = CountRecordDetailConvert.INSTANCE.convertList02(list);
+        for(CountRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点记录子.xls", "数据", CountRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/CountRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.countRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.countRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class CountRecordMainController {
     @Resource
     private CountRecordMainService countRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点记录主")
     @PreAuthorize("@ss.hasPermission('wms:count-record-main:create')")
@@ -96,6 +101,11 @@ public class CountRecordMainController {
         List<CountRecordMainDO> list = countRecordMainService.getCountRecordMainList(exportReqVO);
         // 导出 Excel
         List<CountRecordMainExcelVO> datas = CountRecordMainConvert.INSTANCE.convertList02(list);
+        for(CountRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点记录主.xls", "数据", CountRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordDetailExcelVO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.countRecord.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -97,10 +98,11 @@ public class CountRecordDetailExcelVO {
     private String remark;
 
     @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
     private LocalDateTime createTime;
 
     @ExcelProperty("创建者Id")
-    private String creatorId;
+    private String creator;
 
     @ExcelProperty("任务明细ID")
     private String jobDetailId;

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRecord/vo/CountRecordMainExcelVO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.countRecord.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -76,6 +77,7 @@ public class CountRecordMainExcelVO {
     private String remark;
 
     @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
     private LocalDateTime createTime;
 
     @ExcelProperty("创建者Id")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestDetailController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.countRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.countRecord.vo.CountRecordMainExcelVO;
 import com.win.module.wms.controller.countRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,10 @@ public class CountRequestDetailController {
     @Resource
     private CountRequestDetailService countRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点申请子")
     @PreAuthorize("@ss.hasPermission('wms:count-request-detail:create')")
@@ -96,6 +103,11 @@ public class CountRequestDetailController {
         List<CountRequestDetailDO> list = countRequestDetailService.getCountRequestDetailList(exportReqVO);
         // 导出 Excel
         List<CountRequestDetailExcelVO> datas = CountRequestDetailConvert.INSTANCE.convertList02(list);
+        for(CountRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点申请子.xls", "数据", CountRequestDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/CountRequestMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.countRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.countRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,10 @@ public class CountRequestMainController {
     @Resource
     private CountRequestMainService countRequestMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点申请主")
     @PreAuthorize("@ss.hasPermission('wms:count-request-main:create')")
@@ -96,6 +102,11 @@ public class CountRequestMainController {
         List<CountRequestMainDO> list = countRequestMainService.getCountRequestMainList(exportReqVO);
         // 导出 Excel
         List<CountRequestMainExcelVO> datas = CountRequestMainConvert.INSTANCE.convertList02(list);
+        for(CountRequestMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点申请主.xls", "数据", CountRequestMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.countadjustRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.countadjustRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class CountadjustRecordDetailController {
     @Resource
     private CountadjustRecordDetailService countadjustRecordDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点调整记录子")
     @PreAuthorize("@ss.hasPermission('wms:countadjust-record-detail:create')")
@@ -96,6 +101,11 @@ public class CountadjustRecordDetailController {
         List<CountadjustRecordDetailDO> list = countadjustRecordDetailService.getCountadjustRecordDetailList(exportReqVO);
         // 导出 Excel
         List<CountadjustRecordDetailExcelVO> datas = CountadjustRecordDetailConvert.INSTANCE.convertList02(list);
+        for(CountadjustRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点调整记录子.xls", "数据", CountadjustRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRecord/CountadjustRecordMainController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.countadjustRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.container.vo.ContainerMainExcelVO;
 import com.win.module.wms.controller.countadjustRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class CountadjustRecordMainController {
     @Resource
     private CountadjustRecordMainService countadjustRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点调整记录主")
     @PreAuthorize("@ss.hasPermission('wms:countadjust-record-main:create')")
@@ -96,6 +102,11 @@ public class CountadjustRecordMainController {
         List<CountadjustRecordMainDO> list = countadjustRecordMainService.getCountadjustRecordMainList(exportReqVO);
         // 导出 Excel
         List<CountadjustRecordMainExcelVO> datas = CountadjustRecordMainConvert.INSTANCE.convertList02(list);
+        for(CountadjustRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点调整记录主.xls", "数据", CountadjustRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.countadjustRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.countadjustRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class CountadjustRequestDetailController {
     @Resource
     private CountadjustRequestDetailService countadjustRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点调整申请子")
     @PreAuthorize("@ss.hasPermission('wms:countadjust-request-detail:create')")
@@ -96,6 +101,11 @@ public class CountadjustRequestDetailController {
         List<CountadjustRequestDetailDO> list = countadjustRequestDetailService.getCountadjustRequestDetailList(exportReqVO);
         // 导出 Excel
         List<CountadjustRequestDetailExcelVO> datas = CountadjustRequestDetailConvert.INSTANCE.convertList02(list);
+        for(CountadjustRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点调整申请子.xls", "数据", CountadjustRequestDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/CountadjustRequestMainController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.countadjustRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.countadjustRecord.vo.CountadjustRecordMainExcelVO;
 import com.win.module.wms.controller.countadjustRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class CountadjustRequestMainController {
     @Resource
     private CountadjustRequestMainService countadjustRequestMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建盘点调整申请主")
     @PreAuthorize("@ss.hasPermission('wms:countadjust-request-main:create')")
@@ -96,6 +102,11 @@ public class CountadjustRequestMainController {
         List<CountadjustRequestMainDO> list = countadjustRequestMainService.getCountadjustRequestMainList(exportReqVO);
         // 导出 Excel
         List<CountadjustRequestMainExcelVO> datas = CountadjustRequestMainConvert.INSTANCE.convertList02(list);
+        for(CountadjustRequestMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "盘点调整申请主.xls", "数据", CountadjustRequestMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/CurrencyexchangeController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.countRequest.vo.CountRequestMainExcelVO;
 import com.win.module.wms.controller.currencyexchange.vo.*;
 import com.win.module.wms.convert.currencyexchange.CurrencyexchangeConvert;
 import com.win.module.wms.dal.dataobject.currencyexchange.CurrencyexchangeDO;
@@ -39,6 +42,9 @@ public class CurrencyexchangeController {
     @Resource
     private CurrencyexchangeService currencyexchangeService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建货币转换")
     @PreAuthorize("@ss.hasPermission('wms:currencyexchange:create')")
@@ -98,6 +104,11 @@ public class CurrencyexchangeController {
         List<CurrencyexchangeDO> list = currencyexchangeService.getCurrencyexchangeList(exportReqVO);
         // 导出 Excel
         List<CurrencyexchangeExcelVO> datas = CurrencyexchangeConvert.INSTANCE.convertList02(list);
+        for(CurrencyexchangeExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "货币转换.xls", "数据", CurrencyexchangeExcelVO.class, datas);
     }
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/CustomerController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.currencyexchange.vo.CurrencyexchangeExcelVO;
 import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo;
 import com.win.module.wms.controller.customer.vo.*;
 import com.win.module.wms.convert.customer.CustomerConvert;
@@ -40,6 +43,9 @@ public class CustomerController {
     @Resource
     private CustomerService customerService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户")
     @PreAuthorize("@ss.hasPermission('wms:customer:create')")
@@ -99,6 +105,11 @@ public class CustomerController {
         List<CustomerDO> list = customerService.getCustomerList(exportReqVO);
         // 导出 Excel
         List<CustomerExcelVO> datas = CustomerConvert.INSTANCE.convertList02(list);
+        for(CustomerExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户.xls", "数据", CustomerExcelVO.class, datas);
     }
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/CustomerdockController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.customer.vo.CustomerExcelVO;
 import com.win.module.wms.controller.customer.vo.CustomerImportExcelVo;
 import com.win.module.wms.controller.customerdock.vo.*;
 import com.win.module.wms.convert.customerdock.CustomerdockConvert;
@@ -40,6 +43,9 @@ public class CustomerdockController {
     @Resource
     private CustomerdockService customerdockService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户月台")
     @PreAuthorize("@ss.hasPermission('wms:customerdock:create')")
@@ -99,6 +105,11 @@ public class CustomerdockController {
         List<CustomerdockDO> list = customerdockService.getCustomerdockList(exportReqVO);
         // 导出 Excel
         List<CustomerdockExcelVO> datas = CustomerdockConvert.INSTANCE.convertList02(list);
+        for(CustomerdockExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户月台.xls", "数据", CustomerdockExcelVO.class, datas);
     }
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/CustomeritemController.java

@@ -5,6 +5,9 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.customerdock.vo.CustomerdockExcelVO;
 import com.win.module.wms.controller.customeritem.vo.*;
 import com.win.module.wms.convert.customeritem.CustomeritemConvert;
 import com.win.module.wms.dal.dataobject.customeritem.CustomeritemDO;
@@ -39,6 +42,9 @@ public class CustomeritemController {
     @Resource
     private CustomeritemService customeritemService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户物品")
     @PreAuthorize("@ss.hasPermission('wms:customeritem:create')")
@@ -98,6 +104,11 @@ public class CustomeritemController {
         List<CustomeritemDO> list = customeritemService.getCustomeritemList(exportReqVO);
         // 导出 Excel
         List<CustomeritemExcelVO> datas = CustomeritemConvert.INSTANCE.convertList02(list);
+        for(CustomeritemExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户物品.xls", "数据", CustomeritemExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordDetailController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.customerreceiptRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.customeritem.vo.CustomeritemExcelVO;
 import com.win.module.wms.controller.customerreceiptRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class CustomerreceiptRecordDetailController {
     @Resource
     private CustomerreceiptRecordDetailService customerreceiptRecordDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户收货记录子")
     @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-detail:create')")
@@ -96,6 +102,11 @@ public class CustomerreceiptRecordDetailController {
         List<CustomerreceiptRecordDetailDO> list = customerreceiptRecordDetailService.getCustomerreceiptRecordDetailList(exportReqVO);
         // 导出 Excel
         List<CustomerreceiptRecordDetailExcelVO> datas = CustomerreceiptRecordDetailConvert.INSTANCE.convertList02(list);
+        for(CustomerreceiptRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户收货记录子.xls", "数据", CustomerreceiptRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/CustomerreceiptRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.customerreceiptRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreceiptRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,8 @@ public class CustomerreceiptRecordMainController {
     @Resource
     private CustomerreceiptRecordMainService customerreceiptRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
     @PostMapping("/create")
     @Operation(summary = "创建客户收货记录主")
     @PreAuthorize("@ss.hasPermission('wms:customerreceipt-record-main:create')")
@@ -96,6 +100,11 @@ public class CustomerreceiptRecordMainController {
         List<CustomerreceiptRecordMainDO> list = customerreceiptRecordMainService.getCustomerreceiptRecordMainList(exportReqVO);
         // 导出 Excel
         List<CustomerreceiptRecordMainExcelVO> datas = CustomerreceiptRecordMainConvert.INSTANCE.convertList02(list);
+        for(CustomerreceiptRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户收货记录主.xls", "数据", CustomerreceiptRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestDetailController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.customerreceiptRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.customerreceiptRecord.vo.CustomerreceiptRecordDetailExcelVO;
 import com.win.module.wms.controller.customerreceiptRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class CustomerreceiptRequestDetailController {
     @Resource
     private CustomerreceiptRequestDetailService customerreceiptRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户收货申请子")
     @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-detail:create')")
@@ -96,6 +102,11 @@ public class CustomerreceiptRequestDetailController {
         List<CustomerreceiptRequestDetailDO> list = customerreceiptRequestDetailService.getCustomerreceiptRequestDetailList(exportReqVO);
         // 导出 Excel
         List<CustomerreceiptRequestDetailExcelVO> datas = CustomerreceiptRequestDetailConvert.INSTANCE.convertList02(list);
+        for(CustomerreceiptRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户收货申请子.xls", "数据", CustomerreceiptRequestDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/CustomerreceiptRequestMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.customerreceiptRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreceiptRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class CustomerreceiptRequestMainController {
     @Resource
     private CustomerreceiptRequestMainService customerreceiptRequestMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户收货申请主")
     @PreAuthorize("@ss.hasPermission('wms:customerreceipt-request-main:create')")
@@ -96,6 +101,11 @@ public class CustomerreceiptRequestMainController {
         List<CustomerreceiptRequestMainDO> list = customerreceiptRequestMainService.getCustomerreceiptRequestMainList(exportReqVO);
         // 导出 Excel
         List<CustomerreceiptRequestMainExcelVO> datas = CustomerreceiptRequestMainConvert.INSTANCE.convertList02(list);
+        for(CustomerreceiptRequestMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户收货申请主.xls", "数据", CustomerreceiptRequestMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobDetailController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.customerreturnJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.customerreceiptRequest.vo.CustomerreceiptRequestMainExcelVO;
 import com.win.module.wms.controller.customerreturnJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class CustomerreturnJobDetailController {
     @Resource
     private CustomerreturnJobDetailService customerreturnJobDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户退货任务子")
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-detail:create')")
@@ -96,6 +102,11 @@ public class CustomerreturnJobDetailController {
         List<CustomerreturnJobDetailDO> list = customerreturnJobDetailService.getCustomerreturnJobDetailList(exportReqVO);
         // 导出 Excel
         List<CustomerreturnJobDetailExcelVO> datas = CustomerreturnJobDetailConvert.INSTANCE.convertList02(list);
+        for(CustomerreturnJobDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户退货任务子.xls", "数据", CustomerreturnJobDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/CustomerreturnJobMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.customerreturnJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreturnJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class CustomerreturnJobMainController {
     @Resource
     private CustomerreturnJobMainService customerreturnJobMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户退货任务主")
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-job-main:create')")
@@ -96,6 +101,11 @@ public class CustomerreturnJobMainController {
         List<CustomerreturnJobMainDO> list = customerreturnJobMainService.getCustomerreturnJobMainList(exportReqVO);
         // 导出 Excel
         List<CustomerreturnJobMainExcelVO> datas = CustomerreturnJobMainConvert.INSTANCE.convertList02(list);
+        for(CustomerreturnJobMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户退货任务主.xls", "数据", CustomerreturnJobMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordDetailController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.customerreturnRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.customerreturnJob.vo.CustomerreturnJobMainExcelVO;
 import com.win.module.wms.controller.customerreturnRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class CustomerreturnRecordDetailController {
     @Resource
     private CustomerreturnRecordDetailService customerreturnRecordDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户退货记录子")
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-detail:create')")
@@ -96,6 +102,11 @@ public class CustomerreturnRecordDetailController {
         List<CustomerreturnRecordDetailDO> list = customerreturnRecordDetailService.getCustomerreturnRecordDetailList(exportReqVO);
         // 导出 Excel
         List<CustomerreturnRecordDetailExcelVO> datas = CustomerreturnRecordDetailConvert.INSTANCE.convertList02(list);
+        for(CustomerreturnRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户退货记录子.xls", "数据", CustomerreturnRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/CustomerreturnRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.customerreturnRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreturnRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class CustomerreturnRecordMainController {
     @Resource
     private CustomerreturnRecordMainService customerreturnRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户退货记录主")
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-record-main:create')")
@@ -96,6 +101,11 @@ public class CustomerreturnRecordMainController {
         List<CustomerreturnRecordMainDO> list = customerreturnRecordMainService.getCustomerreturnRecordMainList(exportReqVO);
         // 导出 Excel
         List<CustomerreturnRecordMainExcelVO> datas = CustomerreturnRecordMainConvert.INSTANCE.convertList02(list);
+        for(CustomerreturnRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户退货记录主.xls", "数据", CustomerreturnRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainExcelVO.java

@@ -120,4 +120,9 @@ public class CustomerreturnRecordMainExcelVO {
     @ExcelProperty("从库区代码范围")
     private String fromAreaCodes;
 
+
+
+    @ExcelProperty("创建者ID")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestDetailController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.customerreturnRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.customerreturnRecord.vo.CustomerreturnRecordMainExcelVO;
 import com.win.module.wms.controller.customerreturnRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class CustomerreturnRequestDetailController {
     @Resource
     private CustomerreturnRequestDetailService customerreturnRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户退货申请子")
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-detail:create')")
@@ -96,6 +102,11 @@ public class CustomerreturnRequestDetailController {
         List<CustomerreturnRequestDetailDO> list = customerreturnRequestDetailService.getCustomerreturnRequestDetailList(exportReqVO);
         // 导出 Excel
         List<CustomerreturnRequestDetailExcelVO> datas = CustomerreturnRequestDetailConvert.INSTANCE.convertList02(list);
+        for(CustomerreturnRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户退货申请子.xls", "数据", CustomerreturnRequestDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/CustomerreturnRequestMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.customerreturnRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customerreturnRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class CustomerreturnRequestMainController {
     @Resource
     private CustomerreturnRequestMainService customerreturnRequestMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户退货申请主")
     @PreAuthorize("@ss.hasPermission('wms:customerreturn-request-main:create')")
@@ -96,6 +101,11 @@ public class CustomerreturnRequestMainController {
         List<CustomerreturnRequestMainDO> list = customerreturnRequestMainService.getCustomerreturnRequestMainList(exportReqVO);
         // 导出 Excel
         List<CustomerreturnRequestMainExcelVO> datas = CustomerreturnRequestMainConvert.INSTANCE.convertList02(list);
+        for(CustomerreturnRequestMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户退货申请主.xls", "数据", CustomerreturnRequestMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordDetailController.java

@@ -1,5 +1,8 @@
 package com.win.module.wms.controller.customersettleRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
+import com.win.module.wms.controller.customerreturnRequest.vo.CustomerreturnRequestMainExcelVO;
 import com.win.module.wms.controller.customersettleRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +40,9 @@ public class CustomersettleRecordDetailController {
     @Resource
     private CustomersettleRecordDetailService customersettleRecordDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户结算记录子")
     @PreAuthorize("@ss.hasPermission('wms:customersettle-record-detail:create')")
@@ -96,6 +102,11 @@ public class CustomersettleRecordDetailController {
         List<CustomersettleRecordDetailDO> list = customersettleRecordDetailService.getCustomersettleRecordDetailList(exportReqVO);
         // 导出 Excel
         List<CustomersettleRecordDetailExcelVO> datas = CustomersettleRecordDetailConvert.INSTANCE.convertList02(list);
+        for(CustomersettleRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户结算记录子.xls", "数据", CustomersettleRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/CustomersettleRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.customersettleRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customersettleRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,8 @@ public class CustomersettleRecordMainController {
 
     @Resource
     private CustomersettleRecordMainService customersettleRecordMainService;
+    @Resource
+    private AdminUserApi userApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建客户结算记录主")
@@ -96,6 +100,11 @@ public class CustomersettleRecordMainController {
         List<CustomersettleRecordMainDO> list = customersettleRecordMainService.getCustomersettleRecordMainList(exportReqVO);
         // 导出 Excel
         List<CustomersettleRecordMainExcelVO> datas = CustomersettleRecordMainConvert.INSTANCE.convertList02(list);
+        for(CustomersettleRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户结算记录主.xls", "数据", CustomersettleRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.customersettleRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customersettleRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class CustomersettleRequestDetailController {
     @Resource
     private CustomersettleRequestDetailService customersettleRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建客户结算申请子")
     @PreAuthorize("@ss.hasPermission('wms:customersettle-request-detail:create')")
@@ -96,6 +101,11 @@ public class CustomersettleRequestDetailController {
         List<CustomersettleRequestDetailDO> list = customersettleRequestDetailService.getCustomersettleRequestDetailList(exportReqVO);
         // 导出 Excel
         List<CustomersettleRequestDetailExcelVO> datas = CustomersettleRequestDetailConvert.INSTANCE.convertList02(list);
+        for(CustomersettleRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户结算申请子.xls", "数据", CustomersettleRequestDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/CustomersettleRequestMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.customersettleRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.customersettleRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,8 @@ public class CustomersettleRequestMainController {
 
     @Resource
     private CustomersettleRequestMainService customersettleRequestMainService;
+    @Resource
+    private AdminUserApi userApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建客户结算申请主")
@@ -96,6 +100,11 @@ public class CustomersettleRequestMainController {
         List<CustomersettleRequestMainDO> list = customersettleRequestMainService.getCustomersettleRequestMainList(exportReqVO);
         // 导出 Excel
         List<CustomersettleRequestMainExcelVO> datas = CustomersettleRequestMainConvert.INSTANCE.convertList02(list);
+        for(CustomersettleRequestMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "客户结算申请主.xls", "数据", CustomersettleRequestMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.deliverJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.deliverJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class DeliverJobDetailController {
     @Resource
     private DeliverJobDetailService deliverJobDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建发货任务子")
     @PreAuthorize("@ss.hasPermission('wms:deliver-job-detail:create')")
@@ -96,6 +101,11 @@ public class DeliverJobDetailController {
         List<DeliverJobDetailDO> list = deliverJobDetailService.getDeliverJobDetailList(exportReqVO);
         // 导出 Excel
         List<DeliverJobDetailExcelVO> datas = DeliverJobDetailConvert.INSTANCE.convertList02(list);
+        for(DeliverJobDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发货任务子.xls", "数据", DeliverJobDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/DeliverJobMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.deliverJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.deliverJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class DeliverJobMainController {
     @Resource
     private DeliverJobMainService deliverJobMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建发货任务主")
     @PreAuthorize("@ss.hasPermission('wms:deliver-job-main:create')")
@@ -96,6 +101,11 @@ public class DeliverJobMainController {
         List<DeliverJobMainDO> list = deliverJobMainService.getDeliverJobMainList(exportReqVO);
         // 导出 Excel
         List<DeliverJobMainExcelVO> datas = DeliverJobMainConvert.INSTANCE.convertList02(list);
+        for(DeliverJobMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发货任务主.xls", "数据", DeliverJobMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.deliverPlan;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.deliverPlan.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class DeliverPlanDetailController {
     @Resource
     private DeliverPlanDetailService deliverPlanDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建发货计划子")
     @PreAuthorize("@ss.hasPermission('wms:deliver-plan-detail:create')")
@@ -96,6 +101,12 @@ public class DeliverPlanDetailController {
         List<DeliverPlanDetailDO> list = deliverPlanDetailService.getDeliverPlanDetailList(exportReqVO);
         // 导出 Excel
         List<DeliverPlanDetailExcelVO> datas = DeliverPlanDetailConvert.INSTANCE.convertList02(list);
+
+        for(DeliverPlanDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发货计划子.xls", "数据", DeliverPlanDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/DeliverPlanMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.deliverPlan;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.deliverPlan.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,8 @@ public class DeliverPlanMainController {
 
     @Resource
     private DeliverPlanMainService deliverPlanMainService;
+    @Resource
+    private AdminUserApi userApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建发货计划主")
@@ -96,6 +100,11 @@ public class DeliverPlanMainController {
         List<DeliverPlanMainDO> list = deliverPlanMainService.getDeliverPlanMainList(exportReqVO);
         // 导出 Excel
         List<DeliverPlanMainExcelVO> datas = DeliverPlanMainConvert.INSTANCE.convertList02(list);
+        for(DeliverPlanMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发货计划主.xls", "数据", DeliverPlanMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.deliverRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.deliverRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,8 @@ public class DeliverRecordDetailController {
 
     @Resource
     private DeliverRecordDetailService deliverRecordDetailService;
+    @Resource
+    private AdminUserApi userApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建发货记录子")
@@ -96,6 +100,11 @@ public class DeliverRecordDetailController {
         List<DeliverRecordDetailDO> list = deliverRecordDetailService.getDeliverRecordDetailList(exportReqVO);
         // 导出 Excel
         List<DeliverRecordDetailExcelVO> datas = DeliverRecordDetailConvert.INSTANCE.convertList02(list);
+        for(DeliverRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发货记录子.xls", "数据", DeliverRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/DeliverRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.deliverRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.deliverRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class DeliverRecordMainController {
     @Resource
     private DeliverRecordMainService deliverRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建发货记录主")
     @PreAuthorize("@ss.hasPermission('wms:deliver-record-main:create')")
@@ -96,6 +101,11 @@ public class DeliverRecordMainController {
         List<DeliverRecordMainDO> list = deliverRecordMainService.getDeliverRecordMainList(exportReqVO);
         // 导出 Excel
         List<DeliverRecordMainExcelVO> datas = DeliverRecordMainConvert.INSTANCE.convertList02(list);
+        for(DeliverRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发货记录主.xls", "数据", DeliverRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.deliverRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.deliverRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class DeliverRequestDetailController {
     @Resource
     private DeliverRequestDetailService deliverRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建发货申请子")
     @PreAuthorize("@ss.hasPermission('wms:deliver-request-detail:create')")
@@ -96,6 +101,11 @@ public class DeliverRequestDetailController {
         List<DeliverRequestDetailDO> list = deliverRequestDetailService.getDeliverRequestDetailList(exportReqVO);
         // 导出 Excel
         List<DeliverRequestDetailExcelVO> datas = DeliverRequestDetailConvert.INSTANCE.convertList02(list);
+        for(DeliverRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发货申请子.xls", "数据", DeliverRequestDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/DeliverRequestMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.deliverRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.deliverRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class DeliverRequestMainController {
     @Resource
     private DeliverRequestMainService deliverRequestMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建发货申请主")
     @PreAuthorize("@ss.hasPermission('wms:deliver-request-main:create')")
@@ -96,6 +101,11 @@ public class DeliverRequestMainController {
         List<DeliverRequestMainDO> list = deliverRequestMainService.getDeliverRequestMainList(exportReqVO);
         // 导出 Excel
         List<DeliverRequestMainExcelVO> datas = DeliverRequestMainConvert.INSTANCE.convertList02(list);
+        for(DeliverRequestMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发货申请主.xls", "数据", DeliverRequestMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.demandforecasting;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.demandforecasting.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class DemandforecastingDetailController {
     @Resource
     private DemandforecastingDetailService demandforecastingDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建要货预测子")
     @PreAuthorize("@ss.hasPermission('wms:demandforecasting-detail:create')")
@@ -96,6 +101,11 @@ public class DemandforecastingDetailController {
         List<DemandforecastingDetailDO> list = demandforecastingDetailService.getDemandforecastingDetailList(exportReqVO);
         // 导出 Excel
         List<DemandforecastingDetailExcelVO> datas = DemandforecastingDetailConvert.INSTANCE.convertList02(list);
+        for(DemandforecastingDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "要货预测子.xls", "数据", DemandforecastingDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/demandforecasting/DemandforecastingMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.demandforecasting;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.demandforecasting.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,9 @@ public class DemandforecastingMainController {
     @Resource
     private DemandforecastingMainService demandforecastingMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建要货预测主")
     @PreAuthorize("@ss.hasPermission('wms:demandforecasting-main:create')")
@@ -95,6 +100,11 @@ public class DemandforecastingMainController {
         List<DemandforecastingMainDO> list = demandforecastingMainService.getDemandforecastingMainList(exportReqVO);
         // 导出 Excel
         List<DemandforecastingMainExcelVO> datas = DemandforecastingMainConvert.INSTANCE.convertList02(list);
+        for(DemandforecastingMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "要货预测主.xls", "数据", DemandforecastingMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRecord/DismantleRecordDetailbController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.dismantleRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.dismantleRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class DismantleRecordDetailbController {
     @Resource
     private DismantleRecordDetailbService dismantleRecordDetailbService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建制品拆解记录子")
     @PreAuthorize("@ss.hasPermission('wms:dismantle-record-detailb:create')")
@@ -96,6 +101,11 @@ public class DismantleRecordDetailbController {
         List<DismantleRecordDetailbDO> list = dismantleRecordDetailbService.getDismantleRecordDetailbList(exportReqVO);
         // 导出 Excel
         List<DismantleRecordDetailbExcelVO> datas = DismantleRecordDetailbConvert.INSTANCE.convertList02(list);
+        for(DismantleRecordDetailbExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "制品拆解记录子.xls", "数据", DismantleRecordDetailbExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dismantleRequest/DismantleRequestDetailbController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.dismantleRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.dismantleRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class DismantleRequestDetailbController {
     @Resource
     private DismantleRequestDetailbService dismantleRequestDetailbService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建制品拆解申请子")
     @PreAuthorize("@ss.hasPermission('wms:dismantle-request-detailb:create')")
@@ -96,6 +101,11 @@ public class DismantleRequestDetailbController {
         List<DismantleRequestDetailbDO> list = dismantleRequestDetailbService.getDismantleRequestDetailbList(exportReqVO);
         // 导出 Excel
         List<DismantleRequestDetailbExcelVO> datas = DismantleRequestDetailbConvert.INSTANCE.convertList02(list);
+        for(DismantleRequestDetailbExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "制品拆解申请子.xls", "数据", DismantleRequestDetailbExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/DockController.java

@@ -5,6 +5,8 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.dock.vo.*;
 import com.win.module.wms.convert.dock.DockConvert;
 import com.win.module.wms.dal.dataobject.dock.DockDO;
@@ -41,6 +43,9 @@ public class DockController {
     @Resource
     private DockService dockService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @Resource
     private DockMapper dockMapper;
 
@@ -103,6 +108,11 @@ public class DockController {
         List<DockDO> list = dockService.getDockList(exportReqVO);
         // 导出 Excel
         List<DockExcelVO> datas = DockConvert.INSTANCE.convertList02(list);
+        for(DockExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas);
     }
 
@@ -114,7 +124,7 @@ public class DockController {
         Map<Integer, String[]> mapDropDown = new HashMap<>();
         String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCK_TYPE);
         mapDropDown.put(5, type);
-        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(10, available);;
         // 输出
         ExcelUtils.write(response, "月台导入模板.xls", "月台列表", DockImportExcelVO.class, list,mapDropDown);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/DocumentsettingController.java

@@ -5,6 +5,8 @@ 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.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.documentsetting.vo.*;
 import com.win.module.wms.convert.documentsetting.DocumentsettingConvert;
 import com.win.module.wms.dal.dataobject.documentsetting.DocumentsettingDO;
@@ -39,6 +41,9 @@ public class DocumentsettingController {
     @Resource
     private DocumentsettingService documentsettingService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建单据设置")
     @PreAuthorize("@ss.hasPermission('wms:documentsetting:create')")
@@ -98,6 +103,11 @@ public class DocumentsettingController {
         List<DocumentsettingDO> list = documentsettingService.getDocumentsettingList(exportReqVO);
         // 导出 Excel
         List<DocumentsettingExcelVO> datas = DocumentsettingConvert.INSTANCE.convertList02(list);
+        for(DocumentsettingExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "单据设置.xls", "数据", DocumentsettingExcelVO.class, datas);
     }
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/ExpectinController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.expectin;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.expectin.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class ExpectinController {
     @Resource
     private ExpectinService expectinService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建预计入库存")
     @PreAuthorize("@ss.hasPermission('wms:expectin:create')")
@@ -96,6 +101,11 @@ public class ExpectinController {
         List<ExpectinDO> list = expectinService.getExpectinList(exportReqVO);
         // 导出 Excel
         List<ExpectinExcelVO> datas = ExpectinConvert.INSTANCE.convertList02(list);
+        for(ExpectinExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "预计入库存.xls", "数据", ExpectinExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinExcelVO.java

@@ -1,7 +1,10 @@
 package com.win.module.wms.controller.expectin.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDateTime;
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -50,4 +53,11 @@ public class ExpectinExcelVO {
     @ExcelProperty("货主代码")
     private String ownerCode;
 
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者ID")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/ExpectoutController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.expectout;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.expectout.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class ExpectoutController {
     @Resource
     private ExpectoutService expectoutService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建预计出库存")
     @PreAuthorize("@ss.hasPermission('wms:expectout:create')")
@@ -96,6 +101,11 @@ public class ExpectoutController {
         List<ExpectoutDO> list = expectoutService.getExpectoutList(exportReqVO);
         // 导出 Excel
         List<ExpectoutExcelVO> datas = ExpectoutConvert.INSTANCE.convertList02(list);
+        for(ExpectoutExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "预计出库存.xls", "数据", ExpectoutExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutExcelVO.java

@@ -1,7 +1,10 @@
 package com.win.module.wms.controller.expectout.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
+
+import java.time.LocalDateTime;
 import java.util.*;
 import java.math.BigDecimal;
 
@@ -52,5 +55,11 @@ public class ExpectoutExcelVO {
 
     @ExcelProperty("货主代码")
     private String ownerCode;
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者ID")
+    private String creator;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inspectJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inspectJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InspectJobDetailController {
     @Resource
     private InspectJobDetailService inspectJobDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建检验任务子")
     @PreAuthorize("@ss.hasPermission('wms:inspect-job-detail:create')")
@@ -96,6 +101,11 @@ public class InspectJobDetailController {
         List<InspectJobDetailDO> list = inspectJobDetailService.getInspectJobDetailList(exportReqVO);
         // 导出 Excel
         List<InspectJobDetailExcelVO> datas = InspectJobDetailConvert.INSTANCE.convertList02(list);
+        for(InspectJobDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "检验任务子.xls", "数据", InspectJobDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/InspectJobMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inspectJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inspectJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,9 @@ public class InspectJobMainController {
     @Resource
     private InspectJobMainService inspectJobMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建检验任务主")
     @PreAuthorize("@ss.hasPermission('wms:inspect-job-main:create')")
@@ -95,6 +100,11 @@ public class InspectJobMainController {
         List<InspectJobMainDO> list = inspectJobMainService.getInspectJobMainList(exportReqVO);
         // 导出 Excel
         List<InspectJobMainExcelVO> datas = InspectJobMainConvert.INSTANCE.convertList02(list);
+        for(InspectJobMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "检验任务主.xls", "数据", InspectJobMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inspectRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inspectRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InspectRecordDetailController {
     @Resource
     private InspectRecordDetailService inspectRecordDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建检验记录子")
     @PreAuthorize("@ss.hasPermission('wms:inspect-record-detail:create')")
@@ -96,6 +101,11 @@ public class InspectRecordDetailController {
         List<InspectRecordDetailDO> list = inspectRecordDetailService.getInspectRecordDetailList(exportReqVO);
         // 导出 Excel
         List<InspectRecordDetailExcelVO> datas = InspectRecordDetailConvert.INSTANCE.convertList02(list);
+        for(InspectRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "检验记录子.xls", "数据", InspectRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRecord/InspectRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inspectRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inspectRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,9 @@ public class InspectRecordMainController {
     @Resource
     private InspectRecordMainService inspectRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建检验记录主")
     @PreAuthorize("@ss.hasPermission('wms:inspect-record-main:create')")
@@ -95,6 +100,11 @@ public class InspectRecordMainController {
         List<InspectRecordMainDO> list = inspectRecordMainService.getInspectRecordMainList(exportReqVO);
         // 导出 Excel
         List<InspectRecordMainExcelVO> datas = InspectRecordMainConvert.INSTANCE.convertList02(list);
+        for(InspectRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "检验记录主.xls", "数据", InspectRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inspectRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inspectRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InspectRequestDetailController {
     @Resource
     private InspectRequestDetailService inspectRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建检验申请子")
     @PreAuthorize("@ss.hasPermission('wms:inspect-request-detail:create')")
@@ -96,6 +101,11 @@ public class InspectRequestDetailController {
         List<InspectRequestDetailDO> list = inspectRequestDetailService.getInspectRequestDetailList(exportReqVO);
         // 导出 Excel
         List<InspectRequestDetailExcelVO> datas = InspectRequestDetailConvert.INSTANCE.convertList02(list);
+        for(InspectRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "检验申请子.xls", "数据", InspectRequestDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/InspectRequestMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inspectRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inspectRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -35,6 +37,8 @@ public class InspectRequestMainController {
 
     @Resource
     private InspectRequestMainService inspectRequestMainService;
+    @Resource
+    private AdminUserApi userApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建检验申请主")
@@ -95,6 +99,11 @@ public class InspectRequestMainController {
         List<InspectRequestMainDO> list = inspectRequestMainService.getInspectRequestMainList(exportReqVO);
         // 导出 Excel
         List<InspectRequestMainExcelVO> datas = InspectRequestMainConvert.INSTANCE.convertList02(list);
+        for(InspectRequestMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "检验申请主.xls", "数据", InspectRequestMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailExcelVO.java

@@ -1,5 +1,6 @@
 package com.win.module.wms.controller.inspectRequest.vo;
 
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
 import java.util.*;
@@ -60,4 +61,11 @@ public class InspectRequestDetailExcelVO {
     @DictFormat("uom") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String uom;
 
+    @ExcelProperty("创建时间")
+    @ColumnWidth(value = 16)
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者ID")
+    private String creator;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventorychangeRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorychangeRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventorychangeRecordDetailController {
     @Resource
     private InventorychangeRecordDetailService inventorychangeRecordDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存修改记录子")
     @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-detail:create')")
@@ -96,6 +101,11 @@ public class InventorychangeRecordDetailController {
         List<InventorychangeRecordDetailDO> list = inventorychangeRecordDetailService.getInventorychangeRecordDetailList(exportReqVO);
         // 导出 Excel
         List<InventorychangeRecordDetailExcelVO> datas = InventorychangeRecordDetailConvert.INSTANCE.convertList02(list);
+        for(InventorychangeRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存修改记录子.xls", "数据", InventorychangeRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/InventorychangeRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventorychangeRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorychangeRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventorychangeRecordMainController {
     @Resource
     private InventorychangeRecordMainService inventorychangeRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存修改记录主")
     @PreAuthorize("@ss.hasPermission('wms:inventorychange-record-main:create')")
@@ -96,6 +101,11 @@ public class InventorychangeRecordMainController {
         List<InventorychangeRecordMainDO> list = inventorychangeRecordMainService.getInventorychangeRecordMainList(exportReqVO);
         // 导出 Excel
         List<InventorychangeRecordMainExcelVO> datas = InventorychangeRecordMainConvert.INSTANCE.convertList02(list);
+        for(InventorychangeRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存修改记录主.xls", "数据", InventorychangeRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventorychangeRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorychangeRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventorychangeRequestDetailController {
     @Resource
     private InventorychangeRequestDetailService inventorychangeRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存修改申请子")
     @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-detail:create')")
@@ -96,6 +101,11 @@ public class InventorychangeRequestDetailController {
         List<InventorychangeRequestDetailDO> list = inventorychangeRequestDetailService.getInventorychangeRequestDetailList(exportReqVO);
         // 导出 Excel
         List<InventorychangeRequestDetailExcelVO> datas = InventorychangeRequestDetailConvert.INSTANCE.convertList02(list);
+        for(InventorychangeRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存修改申请子.xls", "数据", InventorychangeRequestDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/InventorychangeRequestMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventorychangeRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorychangeRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventorychangeRequestMainController {
     @Resource
     private InventorychangeRequestMainService inventorychangeRequestMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存修改申请主")
     @PreAuthorize("@ss.hasPermission('wms:inventorychange-request-main:create')")
@@ -96,6 +101,11 @@ public class InventorychangeRequestMainController {
         List<InventorychangeRequestMainDO> list = inventorychangeRequestMainService.getInventorychangeRequestMainList(exportReqVO);
         // 导出 Excel
         List<InventorychangeRequestMainExcelVO> datas = InventorychangeRequestMainConvert.INSTANCE.convertList02(list);
+        for(InventorychangeRequestMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存修改申请主.xls", "数据", InventorychangeRequestMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventoryinitRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventoryinitRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventoryinitRecordDetailController {
     @Resource
     private InventoryinitRecordDetailService inventoryinitRecordDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存初始化记录子")
     @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-detail:create')")
@@ -96,6 +101,11 @@ public class InventoryinitRecordDetailController {
         List<InventoryinitRecordDetailDO> list = inventoryinitRecordDetailService.getInventoryinitRecordDetailList(exportReqVO);
         // 导出 Excel
         List<InventoryinitRecordDetailExcelVO> datas = InventoryinitRecordDetailConvert.INSTANCE.convertList02(list);
+        for(InventoryinitRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存初始化记录子.xls", "数据", InventoryinitRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRecord/InventoryinitRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventoryinitRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventoryinitRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventoryinitRecordMainController {
     @Resource
     private InventoryinitRecordMainService inventoryinitRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存初始化记录主")
     @PreAuthorize("@ss.hasPermission('wms:inventoryinit-record-main:create')")
@@ -96,6 +101,11 @@ public class InventoryinitRecordMainController {
         List<InventoryinitRecordMainDO> list = inventoryinitRecordMainService.getInventoryinitRecordMainList(exportReqVO);
         // 导出 Excel
         List<InventoryinitRecordMainExcelVO> datas = InventoryinitRecordMainConvert.INSTANCE.convertList02(list);
+        for(InventoryinitRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存初始化记录主.xls", "数据", InventoryinitRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventoryinitRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventoryinitRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventoryinitRequestDetailController {
     @Resource
     private InventoryinitRequestDetailService inventoryinitRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存初始化申请子")
     @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-detail:create')")
@@ -96,6 +101,11 @@ public class InventoryinitRequestDetailController {
         List<InventoryinitRequestDetailDO> list = inventoryinitRequestDetailService.getInventoryinitRequestDetailList(exportReqVO);
         // 导出 Excel
         List<InventoryinitRequestDetailExcelVO> datas = InventoryinitRequestDetailConvert.INSTANCE.convertList02(list);
+        for(InventoryinitRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存初始化申请子.xls", "数据", InventoryinitRequestDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventoryinitRequest/InventoryinitRequestMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventoryinitRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventoryinitRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventoryinitRequestMainController {
     @Resource
     private InventoryinitRequestMainService inventoryinitRequestMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存初始化申请主")
     @PreAuthorize("@ss.hasPermission('wms:inventoryinit-request-main:create')")
@@ -96,6 +101,11 @@ public class InventoryinitRequestMainController {
         List<InventoryinitRequestMainDO> list = inventoryinitRequestMainService.getInventoryinitRequestMainList(exportReqVO);
         // 导出 Excel
         List<InventoryinitRequestMainExcelVO> datas = InventoryinitRequestMainConvert.INSTANCE.convertList02(list);
+        for(InventoryinitRequestMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存初始化申请主.xls", "数据", InventoryinitRequestMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventorymoveJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorymoveJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,8 @@ public class InventorymoveJobDetailController {
 
     @Resource
     private InventorymoveJobDetailService inventorymoveJobDetailService;
+    @Resource
+    private AdminUserApi userApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建库存转移任务子")
@@ -96,6 +100,11 @@ public class InventorymoveJobDetailController {
         List<InventorymoveJobDetailDO> list = inventorymoveJobDetailService.getInventorymoveJobDetailList(exportReqVO);
         // 导出 Excel
         List<InventorymoveJobDetailExcelVO> datas = InventorymoveJobDetailConvert.INSTANCE.convertList02(list);
+        for(InventorymoveJobDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存转移任务子.xls", "数据", InventorymoveJobDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/InventorymoveJobMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventorymoveJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorymoveJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventorymoveJobMainController {
     @Resource
     private InventorymoveJobMainService inventorymoveJobMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存转移任务主")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-job-main:create')")
@@ -96,6 +101,11 @@ public class InventorymoveJobMainController {
         List<InventorymoveJobMainDO> list = inventorymoveJobMainService.getInventorymoveJobMainList(exportReqVO);
         // 导出 Excel
         List<InventorymoveJobMainExcelVO> datas = InventorymoveJobMainConvert.INSTANCE.convertList02(list);
+        for(InventorymoveJobMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存转移任务主.xls", "数据", InventorymoveJobMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventorymoveRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorymoveRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,11 @@ public class InventorymoveRecordDetailController {
     @Resource
     private InventorymoveRecordDetailService inventorymoveRecordDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
+
+
     @PostMapping("/create")
     @Operation(summary = "创建库存转移记录子")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-detail:create')")
@@ -96,6 +103,11 @@ public class InventorymoveRecordDetailController {
         List<InventorymoveRecordDetailDO> list = inventorymoveRecordDetailService.getInventorymoveRecordDetailList(exportReqVO);
         // 导出 Excel
         List<InventorymoveRecordDetailExcelVO> datas = InventorymoveRecordDetailConvert.INSTANCE.convertList02(list);
+        for(InventorymoveRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存转移记录子.xls", "数据", InventorymoveRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/InventorymoveRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventorymoveRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorymoveRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventorymoveRecordMainController {
     @Resource
     private InventorymoveRecordMainService inventorymoveRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存转移记录主")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-record-main:create')")
@@ -96,6 +101,11 @@ public class InventorymoveRecordMainController {
         List<InventorymoveRecordMainDO> list = inventorymoveRecordMainService.getInventorymoveRecordMainList(exportReqVO);
         // 导出 Excel
         List<InventorymoveRecordMainExcelVO> datas = InventorymoveRecordMainConvert.INSTANCE.convertList02(list);
+        for(InventorymoveRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存转移记录主.xls", "数据", InventorymoveRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventorymoveRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorymoveRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,8 @@ public class InventorymoveRequestDetailController {
 
     @Resource
     private InventorymoveRequestDetailService inventorymoveRequestDetailService;
+    @Resource
+    private AdminUserApi userApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建库存转移申请子")
@@ -96,6 +100,11 @@ public class InventorymoveRequestDetailController {
         List<InventorymoveRequestDetailDO> list = inventorymoveRequestDetailService.getInventorymoveRequestDetailList(exportReqVO);
         // 导出 Excel
         List<InventorymoveRequestDetailExcelVO> datas = InventorymoveRequestDetailConvert.INSTANCE.convertList02(list);
+        for(InventorymoveRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存转移申请子.xls", "数据", InventorymoveRequestDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/InventorymoveRequestMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.inventorymoveRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.inventorymoveRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class InventorymoveRequestMainController {
     @Resource
     private InventorymoveRequestMainService inventorymoveRequestMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建库存转移申请主")
     @PreAuthorize("@ss.hasPermission('wms:inventorymove-request-main:create')")
@@ -96,6 +101,11 @@ public class InventorymoveRequestMainController {
         List<InventorymoveRequestMainDO> list = inventorymoveRequestMainService.getInventorymoveRequestMainList(exportReqVO);
         // 导出 Excel
         List<InventorymoveRequestMainExcelVO> datas = InventorymoveRequestMainConvert.INSTANCE.convertList02(list);
+        for(InventorymoveRequestMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "库存转移申请主.xls", "数据", InventorymoveRequestMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.issueJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.issueJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,8 @@ public class IssueJobDetailController {
 
     @Resource
     private IssueJobDetailService issueJobDetailService;
+    @Resource
+    private AdminUserApi userApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建发料任务子")
@@ -96,6 +100,11 @@ public class IssueJobDetailController {
         List<IssueJobDetailDO> list = issueJobDetailService.getIssueJobDetailList(exportReqVO);
         // 导出 Excel
         List<IssueJobDetailExcelVO> datas = IssueJobDetailConvert.INSTANCE.convertList02(list);
+        for(IssueJobDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发料任务子.xls", "数据", IssueJobDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/IssueJobMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.issueJob;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.issueJob.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class IssueJobMainController {
     @Resource
     private IssueJobMainService issueJobMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建发料任务主")
     @PreAuthorize("@ss.hasPermission('wms:issue-job-main:create')")
@@ -96,6 +101,11 @@ public class IssueJobMainController {
         List<IssueJobMainDO> list = issueJobMainService.getIssueJobMainList(exportReqVO);
         // 导出 Excel
         List<IssueJobMainExcelVO> datas = IssueJobMainConvert.INSTANCE.convertList02(list);
+        for(IssueJobMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发料任务主.xls", "数据", IssueJobMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.issueRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.issueRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -36,6 +38,8 @@ public class IssueRecordDetailController {
 
     @Resource
     private IssueRecordDetailService issueRecordDetailService;
+    @Resource
+    private AdminUserApi userApi;
 
     @PostMapping("/create")
     @Operation(summary = "创建发料记录子")
@@ -96,6 +100,11 @@ public class IssueRecordDetailController {
         List<IssueRecordDetailDO> list = issueRecordDetailService.getIssueRecordDetailList(exportReqVO);
         // 导出 Excel
         List<IssueRecordDetailExcelVO> datas = IssueRecordDetailConvert.INSTANCE.convertList02(list);
+        for(IssueRecordDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发料记录子.xls", "数据", IssueRecordDetailExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRecord/IssueRecordMainController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.issueRecord;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.issueRecord.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class IssueRecordMainController {
     @Resource
     private IssueRecordMainService issueRecordMainService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建发料记录主")
     @PreAuthorize("@ss.hasPermission('wms:issue-record-main:create')")
@@ -96,6 +101,11 @@ public class IssueRecordMainController {
         List<IssueRecordMainDO> list = issueRecordMainService.getIssueRecordMainList(exportReqVO);
         // 导出 Excel
         List<IssueRecordMainExcelVO> datas = IssueRecordMainConvert.INSTANCE.convertList02(list);
+        for(IssueRecordMainExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发料记录主.xls", "数据", IssueRecordMainExcelVO.class, datas);
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/IssueRequestDetailController.java

@@ -1,5 +1,7 @@
 package com.win.module.wms.controller.issueRequest;
 
+import com.win.module.system.api.user.AdminUserApi;
+import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.issueRequest.vo.*;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
@@ -37,6 +39,9 @@ public class IssueRequestDetailController {
     @Resource
     private IssueRequestDetailService issueRequestDetailService;
 
+    @Resource
+    private AdminUserApi userApi;
+
     @PostMapping("/create")
     @Operation(summary = "创建发料申请子")
     @PreAuthorize("@ss.hasPermission('wms:issue-request-detail:create')")
@@ -96,6 +101,11 @@ public class IssueRequestDetailController {
         List<IssueRequestDetailDO> list = issueRequestDetailService.getIssueRequestDetailList(exportReqVO);
         // 导出 Excel
         List<IssueRequestDetailExcelVO> datas = IssueRequestDetailConvert.INSTANCE.convertList02(list);
+        for(IssueRequestDetailExcelVO vo : datas) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
         ExcelUtils.write(response, "发料申请子.xls", "数据", IssueRequestDetailExcelVO.class, datas);
     }