工厂建模导出

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

@@ -10,9 +10,12 @@ 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.*;
 import com.win.module.wms.controller.dock.vo.DockRespVO;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.convert.areabasic.AreabasicConvert;
 import com.win.module.wms.convert.dock.DockConvert;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.areabasic.AreabasicService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -109,15 +112,31 @@ public class AreabasicController {
     public void exportAreabasicExcel(@Valid AreabasicExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<AreabasicDO> list = areabasicService.getAreabasicList(exportReqVO);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<AreabasicExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "库区.xlsx", "数据", AreabasicExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出库区 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:areabasic:export')")
+    @OperateLog(type = EXPORT)
+    public void exportAreabasicExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<AreabasicDO> list = areabasicService.getAreabasicList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<AreabasicExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "库区.xlsx", "数据", AreabasicExcelVO.class, resultList, mapDropDown);
+    }
+    private List<AreabasicExcelVO> getExcelVo(List<AreabasicDO> list, Map<Integer, String[]> mapDropDown) {
         // 导出 Excel
-        List<AreabasicExcelVO> datas = AreabasicConvert.INSTANCE.convertList02(list);
+        List<AreabasicExcelVO> resultList = AreabasicConvert.INSTANCE.convertList02(list);
-        for(AreabasicExcelVO vo : datas) {
+        for(AreabasicExcelVO vo : resultList) {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "库区.xls", "数据", AreabasicExcelVO.class, datas);
+        return resultList;
     }
+
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得库区分页")
     @PreAuthorize("@ss.hasPermission('wms:areabasic:query')")

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

@@ -8,10 +8,13 @@ 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.controller.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.warehouse.vo.WarehouseRespVO;
 import com.win.module.wms.convert.dock.DockConvert;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.warehouse.WarehouseConvert;
 import com.win.module.wms.dal.dataobject.dock.DockDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.mysql.dock.DockMapper;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.dock.DockService;
@@ -124,19 +127,33 @@ public class DockController {
     public void exportDockExcel(@Valid DockExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         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());
-        }
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<DockExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "月台.xlsx", "数据", DockExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出月台 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:dock:export')")
+    @OperateLog(type = EXPORT)
+    public void exportDockExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<DockDO> list = dockService.getDockList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<DockExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "月台.xlsx", "数据", DockExcelVO.class, resultList, mapDropDown);
+    }
+    private List<DockExcelVO> getExcelVo(List<DockDO> list, Map<Integer, String[]> mapDropDown) {
         String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.DOCK_TYPE);
         mapDropDown.put(5, type);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(10, available);;
-        ExcelUtils.write(response, "月台.xls", "数据", DockExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<DockExcelVO> resultList = DockConvert.INSTANCE.convertList02(list);
+        for(DockExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
     }
 
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/LocationController.java

@@ -9,10 +9,13 @@ 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.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.location.vo.*;
 import com.win.module.wms.controller.locationgroup.vo.LocationgroupRespVO;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.location.LocationConvert;
 import com.win.module.wms.convert.locationgroup.LocationgroupConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import com.win.module.wms.dal.mysql.balance.BalanceMapper;
 import com.win.module.wms.dal.mysql.expectout.ExpectoutMapper;
@@ -140,14 +143,21 @@ public class LocationController {
     public void exportLocationExcel(@Valid LocationExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<LocationDO> list = locationService.getLocationList(exportReqVO);
-        // 导出 Excel
-        List<LocationExcelVO> datas = LocationConvert.INSTANCE.convertList02(list);
-        for(LocationExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
-        }
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<LocationExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "库位.xlsx", "数据", LocationExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出库位 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:location:export')")
+    @OperateLog(type = EXPORT)
+    public void exportLocationExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<LocationDO> list = locationService.getLocationList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<LocationExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "库位.xlsx", "数据", LocationExcelVO.class, resultList, mapDropDown);
+    }
+    private List<LocationExcelVO> getExcelVo(List<LocationDO> list, Map<Integer, String[]> mapDropDown) {
         String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
         mapDropDown.put(3, warehouseCode);
         String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE);
@@ -158,8 +168,16 @@ public class LocationController {
         mapDropDown.put(7, type);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(18, available);;
-        ExcelUtils.write(response, "库位.xls", "数据", LocationExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<LocationExcelVO> resultList =LocationConvert.INSTANCE.convertList02(list);
+        for(LocationExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
     }
+
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入库位模板")
     public void importTemplate(HttpServletResponse response) throws IOException {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/LocationgroupController.java

@@ -9,9 +9,12 @@ 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.areabasic.vo.AreabasicRespVO;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.locationgroup.vo.*;
 import com.win.module.wms.convert.areabasic.AreabasicConvert;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.locationgroup.LocationgroupConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.locationgroup.LocationgroupService;
@@ -121,22 +124,37 @@ public class LocationgroupController {
     public void exportLocationgroupExcel(@Valid LocationgroupExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<LocationgroupDO> list = locationgroupService.getLocationgroupList(exportReqVO);
-        // 导出 Excel
-        List<LocationgroupExcelVO> datas = LocationgroupConvert.INSTANCE.convertList02(list);
-        for(LocationgroupExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
-        }
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<LocationgroupExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "库位组.xlsx", "数据", LocationgroupExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出库位组 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:locationgroup:export')")
+    @OperateLog(type = EXPORT)
+    public void exportLocationgroupExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<LocationgroupDO> list = locationgroupService.getLocationgroupList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<LocationgroupExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "库位组.xlsx", "数据", LocationgroupExcelVO.class, resultList, mapDropDown);
+    }
+    private List<LocationgroupExcelVO> getExcelVo(List<LocationgroupDO> list, Map<Integer, String[]> mapDropDown) {
         String[] warehouseCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
         mapDropDown.put(3, warehouseCode);
         String[] areaCode = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.AREA_TYPE);
         mapDropDown.put(4, areaCode);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.PACK_UNIT);
         mapDropDown.put(5, available);;
-        ExcelUtils.write(response, "库位组.xls", "数据", LocationgroupExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<LocationgroupExcelVO> resultList = LocationgroupConvert.INSTANCE.convertList02(list);
+        for(LocationgroupExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
     }
+
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入库位组模板")
     public void importTemplate(HttpServletResponse response) throws IOException {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/ProcessController.java

@@ -8,10 +8,13 @@ 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.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.process.vo.*;
 import com.win.module.wms.controller.workstation.vo.WorkstationRespVO;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.process.ProcessConvert;
 import com.win.module.wms.convert.workstation.WorkstationConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.process.ProcessDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.process.ProcessService;
@@ -80,14 +83,6 @@ public class ProcessController {
         return success(ProcessConvert.INSTANCE.convert(process));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得工序列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:process:query')")
-    public CommonResult<List<ProcessRespVO>> getProcessList(@RequestParam("ids") Collection<Long> ids) {
-        List<ProcessDO> list = processService.getProcessList(ids);
-        return success(ProcessConvert.INSTANCE.convertList(list));
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得工序分页")
@@ -110,15 +105,31 @@ public class ProcessController {
     public void exportProcessExcel(@Valid ProcessExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<ProcessDO> list = processService.getProcessList(exportReqVO);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ProcessExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "工序.xlsx", "数据", ProcessExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出工序 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:process:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProcessExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<ProcessDO> list = processService.getProcessList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ProcessExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "工序.xlsx", "数据", ProcessExcelVO.class, resultList, mapDropDown);
+    }
+    private List<ProcessExcelVO> getExcelVo(List<ProcessDO> list, Map<Integer, String[]> mapDropDown) {
         // 导出 Excel
-        List<ProcessExcelVO> datas = ProcessConvert.INSTANCE.convertList02(list);
+        List<ProcessExcelVO> resultList = ProcessConvert.INSTANCE.convertList02(list);
-        for(ProcessExcelVO vo : datas) {
+        for(ProcessExcelVO vo : resultList) {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "工序.xls", "数据", ProcessExcelVO.class, datas);
+        return resultList;
     }
+
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入参数设置模板")
     public void importTemplate(HttpServletResponse response) throws IOException {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/ProductionlineController.java

@@ -8,10 +8,13 @@ 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.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.productionline.vo.*;
 import com.win.module.wms.controller.workshop.vo.WorkshopRespVO;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.productionline.ProductionlineConvert;
 import com.win.module.wms.convert.workshop.WorkshopConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.productionline.ProductionlineService;
@@ -79,14 +82,6 @@ public class ProductionlineController {
         return success(ProductionlineConvert.INSTANCE.convert(productionline));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得生产线列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:productionline:query')")
-    public CommonResult<List<ProductionlineRespVO>> getProductionlineList(@RequestParam("ids") Collection<Long> ids) {
-        List<ProductionlineDO> list = productionlineService.getProductionlineList(ids);
-        return success(ProductionlineConvert.INSTANCE.convertList(list));
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得生产线分页")
@@ -109,15 +104,31 @@ public class ProductionlineController {
     public void exportProductionlineExcel(@Valid ProductionlineExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<ProductionlineDO> list = productionlineService.getProductionlineList(exportReqVO);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ProductionlineExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "生产线.xlsx", "数据", ProductionlineExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出生产线 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:productionline:export')")
+    @OperateLog(type = EXPORT)
+    public void exportProductionlineExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<ProductionlineDO> list = productionlineService.getProductionlineList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ProductionlineExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "生产线.xlsx", "数据", ProductionlineExcelVO.class, resultList, mapDropDown);
+    }
+    private List<ProductionlineExcelVO> getExcelVo(List<ProductionlineDO> list, Map<Integer, String[]> mapDropDown) {
         // 导出 Excel
-        List<ProductionlineExcelVO> datas = ProductionlineConvert.INSTANCE.convertList02(list);
+        List<ProductionlineExcelVO> resultList = ProductionlineConvert.INSTANCE.convertList02(list);
-        for(ProductionlineExcelVO vo : datas) {
+        for(ProductionlineExcelVO vo : resultList) {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        ExcelUtils.write(response, "生产线.xls", "数据", ProductionlineExcelVO.class, datas);
+        return resultList;
     }
+
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入参数设置模板")
     public void importTemplate(HttpServletResponse response) throws IOException {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainExcelVO.java

@@ -31,7 +31,7 @@ public class PurchasereceiptRequestMainExcelVO {
     private String carrierCode;
 
     @ExcelProperty(value = "运输方式", converter = DictConvert.class)
-    @DictFormat(DictTypeConstants.TRANSFER_MODE) // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @DictFormat(DictTypeConstants.TRANSFER_MODE)
     private String transferMode;
 
     @ExcelProperty("从仓库代码")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/WarehouseController.java

@@ -10,12 +10,15 @@ 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.CustomerRespVO;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
 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.*;
 import com.win.module.wms.convert.customer.CustomerConvert;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.warehouse.WarehouseConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO;
 import com.win.module.wms.dal.mysql.warehouse.WarehouseMapper;
 import com.win.module.wms.enums.DictTypeConstants;
@@ -115,20 +118,35 @@ public class WarehouseController {
     public void exportWarehouseExcel(@Valid WarehouseExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<WarehouseDO> list = warehouseService.getWarehouseList(exportReqVO);
-        // 导出 Excel
-        List<WarehouseExcelVO> datas = WarehouseConvert.INSTANCE.convertList02(list);
-        for(WarehouseExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
-        }
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<WarehouseExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "仓库.xlsx", "数据", WarehouseExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出仓库 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:itembasic:export')")
+    @OperateLog(type = EXPORT)
+    public void exportWarehouseExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<WarehouseDO> list = warehouseService.getWarehouseList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<WarehouseExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "仓库.xlsx", "数据", WarehouseExcelVO.class, resultList, mapDropDown);
+    }
+    private List<WarehouseExcelVO> getExcelVo(List<WarehouseDO> list, Map<Integer, String[]> mapDropDown) {
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(4, available);
         String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WAREHOUSE_TYPE);
         mapDropDown.put(3, type);
-        ExcelUtils.write(response, "仓库.xls", "数据", WarehouseExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<WarehouseExcelVO> resultList = WarehouseConvert.INSTANCE.convertList02(list);
+        for(WarehouseExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
     }
+
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入仓库信息模板")
     public void importTemplate(HttpServletResponse response) throws IOException {

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/WorkshopController.java

@@ -8,12 +8,15 @@ 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.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.location.vo.LocationRespVO;
 import com.win.module.wms.controller.workshop.vo.WorkshopRespVO;
 import com.win.module.wms.controller.workshop.vo.*;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.location.LocationConvert;
 import com.win.module.wms.convert.workshop.WorkshopConvert;
 import com.win.module.wms.convert.workshop.WorkshopConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.workshop.WorkshopDO;
 import com.win.module.wms.dal.dataobject.workshop.WorkshopDO;
 import com.win.module.wms.enums.DictTypeConstants;
@@ -83,15 +86,6 @@ public class WorkshopController {
         return success(WorkshopConvert.INSTANCE.convert(workshop));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得车间列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:workshop:query')")
-    public CommonResult<List<WorkshopRespVO>> getWorkshopList(@RequestParam("ids") Collection<Long> ids) {
-        List<WorkshopDO> list = workshopService.getWorkshopList(ids);
-        return success(WorkshopConvert.INSTANCE.convertList(list));
-    }
-
     @GetMapping("/page")
     @Operation(summary = "获得车间分页")
     @PreAuthorize("@ss.hasPermission('wms:workshop:query')")
@@ -113,19 +107,33 @@ public class WorkshopController {
     public void exportWorkshopExcel(@Valid WorkshopExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<WorkshopDO> list = workshopService.getWorkshopList(exportReqVO);
-        // 导出 Excel
-        List<WorkshopExcelVO> datas = WorkshopConvert.INSTANCE.convertList02(list);
-        for(WorkshopExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
-        }
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<WorkshopExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "车间.xlsx", "数据", WorkshopExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出车间 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:workshop:export')")
+    @OperateLog(type = EXPORT)
+    public void exportWorkshopExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<WorkshopDO> list = workshopService.getWorkshopList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<WorkshopExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "车间.xlsx", "数据", WorkshopExcelVO.class, resultList, mapDropDown);
+    }
+    private List<WorkshopExcelVO> getExcelVo(List<WorkshopDO> list, Map<Integer, String[]> mapDropDown) {
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(4, available);
         String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORKSHOP_TYPE);
         mapDropDown.put(3, type);
-        ExcelUtils.write(response, "车间.xls", "数据", WorkshopExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<WorkshopExcelVO> resultList = WorkshopConvert.INSTANCE.convertList02(list);
+        for(WorkshopExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
     }
 
     @PostMapping("/senior")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/WorkstationController.java

@@ -8,11 +8,14 @@ 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.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.productionline.vo.ProductionlineRespVO;
 import com.win.module.wms.controller.workstation.vo.WorkstationRespVO;
 import com.win.module.wms.controller.workstation.vo.*;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.productionline.ProductionlineConvert;
 import com.win.module.wms.convert.workstation.WorkstationConvert;;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.workstation.WorkstationDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.workstation.WorkstationService;
@@ -79,14 +82,6 @@ public class WorkstationController {
         return success(WorkstationConvert.INSTANCE.convert(workstation));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得工位列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:workstation:query')")
-    public CommonResult<List<WorkstationRespVO>> getWorkstationList(@RequestParam("ids") Collection<Long> ids) {
-        List<WorkstationDO> list = workstationService.getWorkstationList(ids);
-        return success(WorkstationConvert.INSTANCE.convertList(list));
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得工位分页")
@@ -123,19 +118,33 @@ public class WorkstationController {
     public void exportWorkstationExcel(@Valid WorkstationExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<WorkstationDO> list = workstationService.getWorkstationList(exportReqVO);
-        // 导出 Excel
-        List<WorkstationExcelVO> datas = WorkstationConvert.INSTANCE.convertList02(list);
-        for(WorkstationExcelVO vo : datas) {
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
-        }
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<WorkstationExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "工位.xlsx", "数据", WorkstationExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出工位 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:workstation:export')")
+    @OperateLog(type = EXPORT)
+    public void exportWorkstationExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<WorkstationDO> list = workstationService.getWorkstationList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<WorkstationExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "工位.xlsx", "数据", WorkstationExcelVO.class, resultList, mapDropDown);
+    }
+    private List<WorkstationExcelVO> getExcelVo(List<WorkstationDO> list, Map<Integer, String[]> mapDropDown) {
         String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.WORK_STATION_TYPE);
         mapDropDown.put(3, type);
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(10, available);
-        ExcelUtils.write(response, "工位.xls", "数据", WorkstationExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<WorkstationExcelVO> resultList = WorkstationConvert.INSTANCE.convertList02(list);
+        for(WorkstationExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
     }
 
     @GetMapping("/get-import-template")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationExcelVO.java

@@ -4,6 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.win.framework.excel.core.annotations.DictFormat;
 import com.win.framework.excel.core.convert.DictConvert;
+import com.win.module.wms.enums.DictTypeConstants;
 import lombok.Data;
 
 import java.time.LocalDateTime;
@@ -27,7 +28,7 @@ public class WorkstationExcelVO {
     private String description;
 
     @ExcelProperty(value = "类型", converter = DictConvert.class)
-    @DictFormat("work_station_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @DictFormat(DictTypeConstants.WORK_STATION_TYPE)
     private String type;
 
     @ExcelProperty("车间代码")
@@ -43,8 +44,8 @@ public class WorkstationExcelVO {
     private String fgLocationCode;
 
     @ExcelProperty(value = "是否可用", converter = DictConvert.class)
-    @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    @DictFormat(DictTypeConstants.TRUE_FALSE)
-    private Integer available;
+    private String available;
 
     @ExcelProperty("生效时间")
     @ColumnWidth(value = 16)

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java

@@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.areabasic.vo.AreabasicExportReqVO;
 import com.win.module.wms.controller.areabasic.vo.AreabasicPageReqVO;
 import com.win.module.wms.dal.dataobject.areabasic.AreabasicDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -58,5 +59,8 @@ public interface AreabasicMapper extends BaseMapperX<AreabasicDO> {
                 .eqIfPresent(AreabasicDO::getCreator, reqVO.getCreator())
                 .orderByDesc(AreabasicDO::getId));
     }
+    default List<AreabasicDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/dock/DockMapper.java

@@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.dock.vo.DockExportReqVO;
 import com.win.module.wms.controller.dock.vo.DockPageReqVO;
 import com.win.module.wms.dal.dataobject.dock.DockDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -65,4 +66,7 @@ public interface DockMapper extends BaseMapperX<DockDO> {
     }
 
     default DockDO selectByItemCode(String code){return selectOne(DockDO ::getCode,code);};
+    default List<DockDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/location/LocationMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.location.vo.LocationExportReqVO;
 import com.win.module.wms.controller.location.vo.LocationPageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.location.LocationDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -79,4 +80,7 @@ public interface LocationMapper extends BaseMapperX<LocationDO> {
     }
 
     default LocationDO selectByCode(String code){return selectOne(LocationDO::getCode,code);};
+    default List<LocationDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/locationgroup/LocationgroupMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.locationgroup.vo.LocationgroupExportReqVO;
 import com.win.module.wms.controller.locationgroup.vo.LocationgroupPageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.locationgroup.LocationgroupDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -55,4 +56,8 @@ public interface LocationgroupMapper extends BaseMapperX<LocationgroupDO> {
     }
 
     default LocationgroupDO selectByCode(String code){return selectOne(LocationgroupDO::getCode,code);};
+    default List<LocationgroupDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java

@@ -8,6 +8,7 @@ import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.process.vo.ProcessExportReqVO;
 import com.win.module.wms.controller.process.vo.ProcessPageReqVO;
 import com.win.module.wms.dal.dataobject.accountcalendar.AccountcalendarDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.process.ProcessDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -59,4 +60,7 @@ public interface ProcessMapper extends BaseMapperX<ProcessDO> {
     }
 
     default ProcessDO selectByCode(String code){return selectOne(ProcessDO::getCode,code);};
+    default List<ProcessDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.productionline.vo.ProductionlineExportReqVO;
 import com.win.module.wms.controller.productionline.vo.ProductionlinePageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.productionline.ProductionlineDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -60,4 +61,8 @@ public interface ProductionlineMapper extends BaseMapperX<ProductionlineDO> {
     }
 
     default ProductionlineDO selectByCode(String code){return selectOne(ProductionlineDO::getCode,code);};
+    default List<ProductionlineDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/warehouse/WarehouseMapper.java

@@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.warehouse.vo.WarehouseExportReqVO;
 import com.win.module.wms.controller.warehouse.vo.WarehousePageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO;
 import com.win.module.wms.dal.dataobject.warehouse.WarehouseDO;
 import com.win.module.wms.dal.dataobject.workshop.WorkshopDO;
@@ -58,5 +59,8 @@ public interface WarehouseMapper extends BaseMapperX<WarehouseDO> {
                 .eqIfPresent(WarehouseDO::getCreator, reqVO.getCreator())
                 .orderByDesc(WarehouseDO::getId));
     }
+    default List<WarehouseDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workshop/WorkshopMapper.java

@@ -9,6 +9,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.workshop.vo.WorkshopExportReqVO;
 import com.win.module.wms.controller.workshop.vo.WorkshopPageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.workshop.WorkshopDO;
 import com.win.module.wms.dal.dataobject.workshop.WorkshopDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -57,5 +58,8 @@ public interface WorkshopMapper extends BaseMapperX<WorkshopDO> {
                 .eqIfPresent(WorkshopDO::getCreator, reqVO.getCreator())
                 .orderByDesc(WorkshopDO::getId));
     }
+    default List<WorkshopDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/workstation/WorkstationMapper.java

@@ -67,5 +67,8 @@ public interface WorkstationMapper extends BaseMapperX<WorkstationDO> {
                 .eqIfPresent(WorkstationDO::getCreator, reqVO.getCreator())
                 .orderByDesc(WorkstationDO::getId));
     }
+    default List<WorkstationDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicService.java

@@ -49,10 +49,10 @@ public interface AreabasicService {
     /**
      * 获得库区列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 库区列表
      */
-    List<AreabasicDO> getAreabasicList(Collection<Long> ids);
+    List<AreabasicDO> getAreabasicList(CustomConditions conditions);
 
     /**
      * 获得库区分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/areabasic/AreabasicServiceImpl.java

@@ -68,8 +68,8 @@ public class AreabasicServiceImpl implements AreabasicService {
     }
 
     @Override
-    public List<AreabasicDO> getAreabasicList(Collection<Long> ids) {
+    public List<AreabasicDO> getAreabasicList(CustomConditions conditions) {
-        return areabasicMapper.selectBatchIds(ids);
+        return areabasicMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockService.java

@@ -49,10 +49,10 @@ public interface DockService {
     /**
      * 获得月台列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 月台列表
      */
-    List<DockDO> getDockList(Collection<Long> ids);
+    List<DockDO> getDockList(CustomConditions conditions);
 
     /**
      * 获得月台分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/dock/DockServiceImpl.java

@@ -70,8 +70,8 @@ public class DockServiceImpl implements DockService {
     }
 
     @Override
-    public List<DockDO> getDockList(Collection<Long> ids) {
+    public List<DockDO> getDockList(CustomConditions conditions) {
-        return dockMapper.selectBatchIds(ids);
+        return dockMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationService.java

@@ -49,10 +49,10 @@ public interface LocationService {
     /**
      * 获得库位列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 库位列表
      */
-    List<LocationDO> getLocationList(Collection<Long> ids);
+    List<LocationDO> getLocationList(CustomConditions conditions);
 
     /**
      * 获得库位分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/location/LocationServiceImpl.java

@@ -86,8 +86,8 @@ public class LocationServiceImpl implements LocationService {
     }
 
     @Override
-    public List<LocationDO> getLocationList(Collection<Long> ids) {
+    public List<LocationDO> getLocationList(CustomConditions conditions) {
-        return locationMapper.selectBatchIds(ids);
+        return locationMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupService.java

@@ -49,10 +49,10 @@ public interface LocationgroupService {
     /**
      * 获得库位组列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 库位组列表
      */
-    List<LocationgroupDO> getLocationgroupList(Collection<Long> ids);
+    List<LocationgroupDO> getLocationgroupList(CustomConditions conditions);
 
     /**
      * 获得库位组分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/locationgroup/LocationgroupServiceImpl.java

@@ -71,8 +71,8 @@ public class LocationgroupServiceImpl implements LocationgroupService {
     }
 
     @Override
-    public List<LocationgroupDO> getLocationgroupList(Collection<Long> ids) {
+    public List<LocationgroupDO> getLocationgroupList(CustomConditions conditions) {
-        return locationgroupMapper.selectBatchIds(ids);
+        return locationgroupMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessService.java

@@ -50,10 +50,10 @@ public interface ProcessService {
     /**
      * 获得工序列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 工序列表
      */
-    List<ProcessDO> getProcessList(Collection<Long> ids);
+    List<ProcessDO> getProcessList(CustomConditions conditions);
 
     /**
      * 获得工序分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/process/ProcessServiceImpl.java

@@ -70,8 +70,8 @@ public class ProcessServiceImpl implements ProcessService {
     }
 
     @Override
-    public List<ProcessDO> getProcessList(Collection<Long> ids) {
+    public List<ProcessDO> getProcessList(CustomConditions conditions) {
-        return processMapper.selectBatchIds(ids);
+        return processMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineService.java

@@ -49,10 +49,10 @@ public interface ProductionlineService {
     /**
      * 获得生产线列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 生产线列表
      */
-    List<ProductionlineDO> getProductionlineList(Collection<Long> ids);
+    List<ProductionlineDO> getProductionlineList(CustomConditions conditions);
 
     /**
      * 获得生产线分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionline/ProductionlineServiceImpl.java

@@ -73,8 +73,8 @@ public class ProductionlineServiceImpl implements ProductionlineService {
     }
 
     @Override
-    public List<ProductionlineDO> getProductionlineList(Collection<Long> ids) {
+    public List<ProductionlineDO> getProductionlineList(CustomConditions conditions) {
-        return productionlineMapper.selectBatchIds(ids);
+        return productionlineMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseService.java

@@ -60,7 +60,7 @@ public interface WarehouseService {
      * @param ids 编号
      * @return 仓库列表
      */
-    List<WarehouseDO> getWarehouseList(Collection<Long> ids);
+    List<WarehouseDO> getWarehouseList(CustomConditions conditions);
 
     /**
      * 获得仓库分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/warehouse/WarehouseServiceImpl.java

@@ -76,8 +76,8 @@ public class WarehouseServiceImpl implements WarehouseService {
     }
 
     @Override
-    public List<WarehouseDO> getWarehouseList(Collection<Long> ids) {
+    public List<WarehouseDO> getWarehouseList(CustomConditions conditions) {
-        return warehouseMapper.selectBatchIds(ids);
+        return warehouseMapper.selectSeniorList(conditions);
     }
 
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopService.java

@@ -57,10 +57,10 @@ public interface WorkshopService {
     /**
      * 获得车间列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 车间列表
      */
-    List<WorkshopDO> getWorkshopList(Collection<Long> ids);
+    List<WorkshopDO> getWorkshopList(CustomConditions conditions);
 
     /**
      * 获得车间分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workshop/WorkshopServiceImpl.java

@@ -69,8 +69,8 @@ public class WorkshopServiceImpl implements WorkshopService {
     }
 
     @Override
-    public List<WorkshopDO> getWorkshopList(Collection<Long> ids) {
+    public List<WorkshopDO> getWorkshopList(CustomConditions conditions) {
-        return workshopMapper.selectBatchIds(ids);
+        return workshopMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationService.java

@@ -58,10 +58,10 @@ public interface WorkstationService {
     /**
      * 获得工位列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 工位列表
      */
-    List<WorkstationDO> getWorkstationList(Collection<Long> ids);
+    List<WorkstationDO> getWorkstationList(CustomConditions conditions);
 
     /**
      * 获得工位分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/workstation/WorkstationServiceImpl.java

@@ -72,8 +72,8 @@ public class WorkstationServiceImpl implements WorkstationService {
     }
 
     @Override
-    public List<WorkstationDO> getWorkstationList(Collection<Long> ids) {
+    public List<WorkstationDO> getWorkstationList(CustomConditions conditions) {
-        return workstationMapper.selectBatchIds(ids);
+        return workstationMapper.selectSeniorList(conditions);
     }
 
     @Override