|
@ -9,10 +9,12 @@ import com.win.framework.excel.core.util.ExcelUtils; |
|
|
import com.win.framework.operatelog.core.annotations.OperateLog; |
|
|
import com.win.framework.operatelog.core.annotations.OperateLog; |
|
|
import com.win.module.system.api.user.AdminUserApi; |
|
|
import com.win.module.system.api.user.AdminUserApi; |
|
|
import com.win.module.system.api.user.dto.AdminUserRespDTO; |
|
|
import com.win.module.system.api.user.dto.AdminUserRespDTO; |
|
|
|
|
|
import com.win.module.wms.controller.customer.vo.CustomerRespVO; |
|
|
import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; |
|
|
import com.win.module.wms.controller.warehouse.vo.WarehouseImportExcelVo; |
|
|
|
|
|
|
|
|
import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO; |
|
|
import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO; |
|
|
import com.win.module.wms.controller.warehouse.vo.*; |
|
|
import com.win.module.wms.controller.warehouse.vo.*; |
|
|
|
|
|
import com.win.module.wms.convert.customer.CustomerConvert; |
|
|
import com.win.module.wms.convert.warehouse.WarehouseConvert; |
|
|
import com.win.module.wms.convert.warehouse.WarehouseConvert; |
|
|
import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; |
|
|
import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO; |
|
|
import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper; |
|
|
import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper; |
|
@ -97,7 +99,13 @@ public class WarehouseController { |
|
|
@PreAuthorize("@ss.hasPermission('wms:warehouse:query')") |
|
|
@PreAuthorize("@ss.hasPermission('wms:warehouse:query')") |
|
|
public CommonResult<PageResult<WarehouseRespVO>> getWarehousePage(@Valid WarehousePageReqVO pageVO) { |
|
|
public CommonResult<PageResult<WarehouseRespVO>> getWarehousePage(@Valid WarehousePageReqVO pageVO) { |
|
|
PageResult<WarehouseDO> pageResult = warehouseService.getWarehousePage(pageVO); |
|
|
PageResult<WarehouseDO> pageResult = warehouseService.getWarehousePage(pageVO); |
|
|
return success(WarehouseConvert.INSTANCE.convertPage(pageResult)); |
|
|
PageResult<WarehouseRespVO> result = WarehouseConvert.INSTANCE.convertPage(pageResult); |
|
|
|
|
|
for(WarehouseRespVO vo : result.getList()) { |
|
|
|
|
|
AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator())); |
|
|
|
|
|
//后端创建个字段作为前端展示的虚拟字段
|
|
|
|
|
|
vo.setCreator(user.getNickname()); |
|
|
|
|
|
} |
|
|
|
|
|
return success(result); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@GetMapping("/export-excel") |
|
|
@GetMapping("/export-excel") |
|
|