Merge remote-tracking branch 'origin/master'

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

@@ -11,10 +11,13 @@ import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.carrier.vo.CarrierExcelVO;
 import com.win.module.wms.controller.carrier.vo.CarrierRespVO;
 import com.win.module.wms.controller.carrier.vo.*;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.owner.vo.OwnerRespVO;
 import com.win.module.wms.convert.carrier.CarrierConvert;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.owner.OwnerConvert;
 import com.win.module.wms.dal.dataobject.carrier.CarrierDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.carrier.CarrierService;
 import io.swagger.v3.oas.annotations.Operation;
@@ -82,14 +85,6 @@ public class CarrierController {
         return success(CarrierConvert.INSTANCE.convert(carrier));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得承运商列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:carrier:query')")
-    public CommonResult<List<CarrierRespVO>> getCarrierList(@RequestParam("ids") Collection<Long> ids) {
-        List<CarrierDO> list = carrierService.getCarrierList(ids);
-        return success(CarrierConvert.INSTANCE.convertList(list));
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得承运商分页")
@@ -133,6 +128,26 @@ public class CarrierController {
         }
         ExcelUtils.write(response, "承运商.xls", "数据", CarrierExcelVO.class, datas);
     }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出承运商 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:carrier:export')")
+    @OperateLog(type = EXPORT)
+    public void exportCarrierExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<CarrierDO> list = carrierService.getCarrierList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<CarrierExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "承运商.xlsx", "数据", CarrierExcelVO.class, resultList, mapDropDown);
+    }
+    private List<CarrierExcelVO> getExcelVo(List<CarrierDO> list, Map<Integer, String[]> mapDropDown) {
+        // 导出 Excel
+        List<CarrierExcelVO> resultList = CarrierConvert.INSTANCE.convertList02(list);
+        for(CarrierExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
+    }
 
     @GetMapping("/get-import-template")
     @Operation(summary = "获得导入承运商模板")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/OwnerController.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.owner.vo.*;
 import com.win.module.wms.controller.recordsetting.vo.RecordsettingRespVO;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.owner.OwnerConvert;
 import com.win.module.wms.convert.recordsetting.RecordsettingConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.owner.OwnerDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.owner.OwnerService;
@@ -80,14 +83,6 @@ public class OwnerController {
         return success(OwnerConvert.INSTANCE.convert(owner));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得货主列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:owner:query')")
-    public CommonResult<List<OwnerRespVO>> getOwnerList(@RequestParam("ids") Collection<Long> ids) {
-        List<OwnerDO> list = ownerService.getOwnerList(ids);
-        return success(OwnerConvert.INSTANCE.convertList(list));
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得货主分页")
@@ -123,22 +118,37 @@ public class OwnerController {
     public void exportOwnerExcel(@Valid OwnerExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<OwnerDO> list = ownerService.getOwnerList(exportReqVO);
-        // 导出 Excel
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
-        List<OwnerExcelVO> datas = OwnerConvert.INSTANCE.convertList02(list);
+        List<OwnerExcelVO> resultList = this.getExcelVo(list, mapDropDown);
-        for(OwnerExcelVO vo : datas) {
+        ExcelUtils.write(response, "货主.xlsx", "数据", OwnerExcelVO.class, resultList, mapDropDown);
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
     }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出货主 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:owner:export')")
+    @OperateLog(type = EXPORT)
+    public void exportOwnerExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<OwnerDO> list = ownerService.getOwnerList(conditions);
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<OwnerExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "货主.xlsx", "数据", OwnerExcelVO.class, resultList, mapDropDown);
+    }
+    private List<OwnerExcelVO> getExcelVo(List<OwnerDO> list, Map<Integer, String[]> mapDropDown) {
         String[] currency = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.CURRENCY);
         mapDropDown.put(11, currency);
         String[] type = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.OWNER_TYPE);
         mapDropDown.put(13, type);;
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(14, available);;
-        ExcelUtils.write(response, "货主.xls", "数据", OwnerExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<OwnerExcelVO> resultList = OwnerConvert.INSTANCE.convertList02(list);
+        for(OwnerExcelVO 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/rule/RuleController.java

@@ -3,11 +3,19 @@ package com.win.module.wms.controller.rule;
 import com.win.framework.common.pojo.CommonResult;
 import com.win.framework.common.pojo.CustomConditions;
 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.itembasic.vo.ItembasicExcelVO;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExportReqVO;
 import com.win.module.wms.controller.rule.vo.*;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.rule.RuleConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.rule.RuleDO;
+import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.rule.RuleService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -17,12 +25,16 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import static com.win.framework.common.pojo.CommonResult.success;
+import static com.win.framework.operatelog.core.enums.OperateTypeEnum.EXPORT;
 
 @Tag(name = "管理后台 - 规则")
 @RestController
@@ -97,5 +109,27 @@ public class RuleController {
         List<HashMap<String, Object>> list = ruleService.getPrecisionStrategyByItemCodes(reqVO);
         return success(list);
     }
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出规则配置 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:rule:export')")
+    @OperateLog(type = EXPORT)
+    public void exportRuleExcel(@Valid RuleExportReqVO exportReqVO,
+                                     HttpServletResponse response) throws IOException {
+        List<RuleDO> list =ruleService.getRuleList(exportReqVO);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<RuleExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "物品基本信息.xlsx", "数据", RuleExcelVO.class, resultList, mapDropDown);
+    }
+    private List<RuleExcelVO> getExcelVo(List<RuleDO> list, Map<Integer, String[]> mapDropDown) {
+
+        // 导出 Excel
+        List<RuleExcelVO> resultList = RuleConvert.INSTANCE.convertList02(list);
+        for(RuleExcelVO vo : resultList) {
+            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
+            //后端创建个字段作为前端展示的虚拟字段
+            vo.setCreator(user.getNickname());
+        }
+        return resultList;
+    }
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RuleExcelVO.java

@@ -0,0 +1,48 @@
+package com.win.module.wms.controller.rule.vo;
+
+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 io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+
+/**
+ * 物品基本信息 Excel VO
+ *
+ * @author 超级管理员
+ */
+@Data
+public class RuleExcelVO {
+    @ExcelProperty("策略代码")
+    private String strategyCode;
+
+    @ExcelProperty("优先级")
+    private Integer priority;
+
+    @ExcelProperty("名称")
+    private String name;
+
+    @ExcelProperty("状态")
+    private Integer status;
+
+    @ExcelProperty("描述")
+    private String description;
+
+    @ExcelProperty("条件")
+    private String condition;
+
+    @ExcelProperty("配置")
+    private String configuration;
+
+    @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/rule/vo/RuleExportReqVO.java

@@ -0,0 +1,31 @@
+package com.win.module.wms.controller.rule.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "管理后台 - 规则管理 Excel 导出 Request VO，参数和 RulePageReqVO 是一致的")
+@Data
+public class RuleExportReqVO {
+
+    @Schema(description = "策略代码")
+    private String strategyCode;
+
+    @Schema(description = "优先级")
+    private Integer priority;
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "状态")
+    private Integer status;
+
+    @Schema(description = "描述")
+    private String description;
+
+    @Schema(description = "条件")
+    private String condition;
+
+    @Schema(description = "配置")
+    private String configuration;
+
+}

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/rule/vo/RulePageReqVO.java

@@ -15,7 +15,6 @@ import javax.validation.constraints.NotNull;
 public class RulePageReqVO extends PageParam {
 
     @Schema(description = "策略代码")
-    @NotNull(message = "策略代码不能为空")
     private String strategyCode;
 
     @Schema(description = "优先级")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/ShiftController.java

@@ -9,10 +9,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.carrier.vo.CarrierRespVO;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExcelVO;
 import com.win.module.wms.controller.shift.vo.*;
 import com.win.module.wms.controller.shift.vo.ShiftImportExcelVo;
 import com.win.module.wms.convert.carrier.CarrierConvert;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.shift.ShiftConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.shift.ShiftDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import com.win.module.wms.service.shift.ShiftService;
@@ -79,15 +82,6 @@ public class ShiftController {
         return success(ShiftConvert.INSTANCE.convert(shift));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得班次列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:shift:query')")
-    public CommonResult<List<ShiftRespVO>> getShiftList(@RequestParam("ids") Collection<Long> ids) {
-        List<ShiftDO> list = shiftService.getShiftList(ids);
-        return success(ShiftConvert.INSTANCE.convertList(list));
-    }
-
     @GetMapping("/page")
     @Operation(summary = "获得班次分页")
     @PreAuthorize("@ss.hasPermission('wms:shift:query')")
@@ -122,20 +116,35 @@ public class ShiftController {
     public void exportShiftExcel(@Valid ShiftExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<ShiftDO> list = shiftService.getShiftList(exportReqVO);
-        // 导出 Excel
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
-        List<ShiftExcelVO> datas = ShiftConvert.INSTANCE.convertList02(list);
+        List<ShiftExcelVO> resultList = this.getExcelVo(list, mapDropDown);
-        for(ShiftExcelVO vo : datas) {
+        ExcelUtils.write(response, "班次.xlsx", "数据", ShiftExcelVO.class, resultList, mapDropDown);
-            AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
-            //后端创建个字段作为前端展示的虚拟字段
-            vo.setCreator(user.getNickname());
     }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出班次 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:shift:export')")
+    @OperateLog(type = EXPORT)
+    public void exportShiftExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<ShiftDO> list = shiftService.getShiftList(conditions);
         Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<ShiftExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "班次.xlsx", "数据", ShiftExcelVO.class, resultList, mapDropDown);
+    }
+    private List<ShiftExcelVO> getExcelVo(List<ShiftDO> list, Map<Integer, String[]> mapDropDown) {
         String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(9, available);
         String[] endAtNextDay = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
         mapDropDown.put(8, endAtNextDay);
-        ExcelUtils.write(response, "班次.xls", "数据", ShiftExcelVO.class, datas,mapDropDown);
+        // 导出 Excel
+        List<ShiftExcelVO> resultList = ShiftConvert.INSTANCE.convertList02(list);
+        for(ShiftExcelVO 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/team/TeamController.java

@@ -4,9 +4,12 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.dict.core.util.DictFrameworkUtils;
 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.shift.vo.ShiftRespVO;
 import com.win.module.wms.controller.team.vo.*;
+import com.win.module.wms.convert.itembasic.ItembasicConvert;
 import com.win.module.wms.convert.shift.ShiftConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.enums.DictTypeConstants;
 import io.swagger.v3.oas.annotations.Parameters;
 import org.springframework.web.bind.annotation.*;
@@ -83,14 +86,6 @@ public class TeamController {
         return success(TeamConvert.INSTANCE.convert(team));
     }
 
-    @GetMapping("/list")
-    @Operation(summary = "获得班组列表")
-    @Parameter(name = "ids", description = "编号列表", required = true, example = "1024,2048")
-    @PreAuthorize("@ss.hasPermission('wms:team:query')")
-    public CommonResult<List<TeamRespVO>> getTeamList(@RequestParam("ids") Collection<Long> ids) {
-        List<TeamDO> list = teamService.getTeamList(ids);
-        return success(TeamConvert.INSTANCE.convertList(list));
-    }
 
     @GetMapping("/page")
     @Operation(summary = "获得班组分页")
@@ -125,18 +120,33 @@ public class TeamController {
     public void exportTeamExcel(@Valid TeamExportReqVO exportReqVO,
               HttpServletResponse response) throws IOException {
         List<TeamDO> list = teamService.getTeamList(exportReqVO);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<TeamExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "班组.xlsx", "数据", TeamExcelVO.class, resultList, mapDropDown);
+    }
+    @PostMapping("/export-excel-senior")
+    @Operation(summary = "导出班组 Excel")
+    @PreAuthorize("@ss.hasPermission('wms:team:export')")
+    @OperateLog(type = EXPORT)
+    public void exportTeamExcel(@Valid @RequestBody CustomConditions conditions, HttpServletResponse response) throws IOException {
+        List<TeamDO> list = teamService.getTeamList(conditions);
+        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        List<TeamExcelVO> resultList = this.getExcelVo(list, mapDropDown);
+        ExcelUtils.write(response, "班组.xlsx", "数据", TeamExcelVO.class, resultList, mapDropDown);
+    }
+    private List<TeamExcelVO> getExcelVo(List<TeamDO> list, Map<Integer, String[]> mapDropDown) {
+        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
+        mapDropDown.put(7, available);
         // 导出 Excel
-        List<TeamExcelVO> datas = TeamConvert.INSTANCE.convertList02(list);
+        List<TeamExcelVO> resultList = TeamConvert.INSTANCE.convertList02(list);
-        for(TeamExcelVO vo : datas) {
+        for(TeamExcelVO vo : resultList) {
             AdminUserRespDTO user = userApi.getUser(Long.valueOf(vo.getCreator()));
             //后端创建个字段作为前端展示的虚拟字段
             vo.setCreator(user.getNickname());
         }
-        Map<Integer, String[]> mapDropDown = new HashMap<>();
+        return resultList;
-        String[] available = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.TRUE_FALSE);
-        mapDropDown.put(7, available);
-        ExcelUtils.write(response, "班组.xls", "数据", TeamExcelVO.class, datas,mapDropDown);
     }
+
     @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/convert/rule/RuleConvert.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.convert.rule;
 
 import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.rule.vo.RuleExcelVO;
 import com.win.module.wms.controller.rule.vo.RuleCreateReqVO;
 import com.win.module.wms.controller.rule.vo.RuleRespVO;
 import com.win.module.wms.controller.rule.vo.RuleUpdateReqVO;
@@ -30,5 +31,6 @@ public interface RuleConvert {
 
     PageResult<RuleRespVO> convertPage(PageResult<RuleDO> page);
     RuleDO convert(RuleRespVO bean);
+    List<RuleExcelVO> convertList02(List<RuleDO> list);
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/carrier/CarrierMapper.java

@@ -9,6 +9,7 @@ import com.win.module.wms.controller.carrier.vo.CarrierExportReqVO;
 import com.win.module.wms.controller.carrier.vo.CarrierPageReqVO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.carrier.CarrierDO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -76,4 +77,7 @@ public interface CarrierMapper extends BaseMapperX<CarrierDO> {
     default CarrierDO selectByCode(String code){
         return selectOne(CarrierDO::getCode, code);
     };
+    default List<CarrierDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/owner/OwnerMapper.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.owner.vo.OwnerExportReqVO;
 import com.win.module.wms.controller.owner.vo.OwnerPageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.owner.OwnerDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -73,4 +74,7 @@ public interface OwnerMapper extends BaseMapperX<OwnerDO> {
     }
 
     default OwnerDO selectByCode(String code){return selectOne(OwnerDO::getCode,code);};
+    default List<OwnerDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/rule/RuleMapper.java

@@ -5,10 +5,14 @@ import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
+import com.win.module.wms.controller.rule.vo.RuleExportReqVO;
 import com.win.module.wms.controller.rule.vo.RulePageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.rule.RuleDO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 规则 Mapper
  *
@@ -30,4 +34,16 @@ public interface RuleMapper extends BaseMapperX<RuleDO> {
     default PageResult<RuleDO> selectSenior(CustomConditions conditions) {
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
     }
+    default List<RuleDO> selectList(RuleExportReqVO reqVO) {
+        return selectList(new LambdaQueryWrapperX<RuleDO>()
+            .eqIfPresent(RuleDO::getStrategyCode, reqVO.getStrategyCode())
+            .eqIfPresent(RuleDO::getPriority, reqVO.getPriority())
+            .eqIfPresent(RuleDO::getName, reqVO.getName())
+            .eqIfPresent(RuleDO::getStatus, reqVO.getStatus())
+            .eqIfPresent(RuleDO::getDescription, reqVO.getDescription())
+            .eqIfPresent(RuleDO::getCondition, reqVO.getCondition())
+            .eqIfPresent(RuleDO::getConfiguration, reqVO.getConfiguration())
+            .orderByDesc(RuleDO::getId));
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/shift/ShiftMapper.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.shift.vo.ShiftExportReqVO;
 import com.win.module.wms.controller.shift.vo.ShiftPageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.shift.ShiftDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -57,5 +58,7 @@ public interface ShiftMapper extends BaseMapperX<ShiftDO> {
                 .eqIfPresent(ShiftDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(ShiftDO::getId));
     }
-
+    default List<ShiftDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/team/TeamMapper.java

@@ -7,6 +7,7 @@ import com.win.framework.mybatis.core.mapper.BaseMapperX;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
 import com.win.module.wms.controller.team.vo.TeamExportReqVO;
 import com.win.module.wms.controller.team.vo.TeamPageReqVO;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.team.TeamDO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -56,5 +57,7 @@ public interface TeamMapper extends BaseMapperX<TeamDO> {
                 .eqIfPresent(TeamDO::getAvailable, reqVO.getAvailable())
                 .orderByDesc(TeamDO::getId));
     }
-
+    default List<TeamDO> selectSeniorList(CustomConditions conditions) {
+        return selectList(QueryWrapperUtils.structure(conditions));
+    }
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierService.java

@@ -50,10 +50,10 @@ public interface CarrierService {
     /**
      * 获得承运商列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 承运商列表
      */
-    List<CarrierDO> getCarrierList(Collection<Long> ids);
+    List<CarrierDO> getCarrierList(CustomConditions conditions);
 
     /**
      * 获得承运商分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/carrier/CarrierServiceImpl.java

@@ -71,8 +71,8 @@ public class CarrierServiceImpl implements CarrierService {
     }
 
     @Override
-    public List<CarrierDO> getCarrierList(Collection<Long> ids) {
+    public List<CarrierDO> getCarrierList(CustomConditions conditions) {
-        return carrierMapper.selectBatchIds(ids);
+        return carrierMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerService.java

@@ -49,10 +49,10 @@ public interface OwnerService {
     /**
      * 获得货主列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 货主列表
      */
-    List<OwnerDO> getOwnerList(Collection<Long> ids);
+    List<OwnerDO> getOwnerList(CustomConditions conditions);
 
     /**
      * 获得货主分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/owner/OwnerServiceImpl.java

@@ -11,6 +11,7 @@ import com.win.module.wms.controller.owner.vo.*;
 import com.win.module.wms.convert.accountcalendar.AccountcalendarConvert;
 import com.win.module.wms.convert.owner.OwnerConvert;
 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.owner.OwnerDO;
 import com.win.module.wms.dal.mysql.owner.OwnerMapper;
 import org.springframework.stereotype.Service;
@@ -70,8 +71,8 @@ public class OwnerServiceImpl implements OwnerService {
     }
 
     @Override
-    public List<OwnerDO> getOwnerList(Collection<Long> ids) {
+    public List<OwnerDO> getOwnerList(CustomConditions conditions) {
-        return ownerMapper.selectBatchIds(ids);
+        return ownerMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleService.java

@@ -2,6 +2,7 @@ package com.win.module.wms.service.rule;
 
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExportReqVO;
 import com.win.module.wms.controller.rule.vo.*;
 import com.win.module.wms.dal.dataobject.rule.RuleDO;
 
@@ -58,10 +59,10 @@ public interface RuleService {
     /**
      * 获得规则列表
      *
-     * @param ids 编号
+     * @param exportReqVO 编号
      * @return 规则列表
      */
-    List<RuleDO> getRuleList(Collection<Long> ids);
+    List<RuleDO> getRuleList(RuleExportReqVO exportReqVO);
 
     /**
      * 获得规则分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/rule/RuleServiceImpl.java

@@ -8,8 +8,10 @@ import com.google.common.annotations.VisibleForTesting;
 import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.datapermission.core.util.DataPermissionUtils;
+import com.win.module.wms.controller.itembasic.vo.ItembasicExportReqVO;
 import com.win.module.wms.controller.rule.vo.*;
 import com.win.module.wms.convert.rule.RuleConvert;
+import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO;
 import com.win.module.wms.dal.dataobject.rule.RuleDO;
 import com.win.module.wms.dal.mysql.rule.RuleMapper;
 import org.checkerframework.checker.units.qual.A;
@@ -73,8 +75,8 @@ public class RuleServiceImpl implements RuleService {
     }
 
     @Override
-    public List<RuleDO> getRuleList(Collection<Long> ids) {
+    public List<RuleDO> getRuleList(RuleExportReqVO exportReqVO) {
-        return ruleMapper.selectBatchIds(ids);
+        return ruleMapper.selectList(exportReqVO);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftService.java

@@ -63,10 +63,10 @@ public interface ShiftService {
     /**
      * 获得班次列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 班次列表
      */
-    List<ShiftDO> getShiftList(Collection<Long> ids);
+    List<ShiftDO> getShiftList( CustomConditions conditions);
 
     /**
      * 获得班次分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/shift/ShiftServiceImpl.java

@@ -84,8 +84,8 @@ public class ShiftServiceImpl implements ShiftService {
     }
 
     @Override
-    public List<ShiftDO> getShiftList(Collection<Long> ids) {
+    public List<ShiftDO> getShiftList(CustomConditions conditions) {
-        return shiftMapper.selectBatchIds(ids);
+        return shiftMapper.selectSeniorList(conditions);
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamService.java

@@ -67,10 +67,10 @@ public interface TeamService {
     /**
      * 获得班组列表
      *
-     * @param ids 编号
+     * @param conditions 编号
      * @return 班组列表
      */
-    List<TeamDO> getTeamList(Collection<Long> ids);
+    List<TeamDO> getTeamList(CustomConditions conditions);
 
     /**
      * 获得班组分页

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/team/TeamServiceImpl.java

@@ -86,8 +86,8 @@ public class TeamServiceImpl implements TeamService {
     }
 
     @Override
-    public List<TeamDO> getTeamList(Collection<Long> ids) {
+    public List<TeamDO> getTeamList(CustomConditions conditions) {
-        return teamMapper.selectBatchIds(ids);
+        return teamMapper.selectSeniorList(conditions);
     }
 
     @Override