From 8dc11f7f867cf064aae87361c831336934b77880 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 14 Nov 2023 16:51:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8E=BB=E6=8E=89=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/controller/areabasic/vo/AreabasicExcelVO.java | 3 --- .../wms/controller/areabasic/vo/AreabasicExportReqVO.java | 3 --- .../win/module/wms/controller/process/vo/ProcessExcelVO.java | 3 --- .../module/wms/controller/process/vo/ProcessExportReqVO.java | 3 --- .../controller/productionline/vo/ProductionlineExcelVO.java | 3 --- .../productionline/vo/ProductionlineExportReqVO.java | 3 --- .../module/wms/controller/project/vo/ProjectExportReqVO.java | 3 --- .../win/module/wms/dal/mysql/areabasic/AreabasicMapper.java | 1 - .../com/win/module/wms/dal/mysql/process/ProcessMapper.java | 1 - .../wms/dal/mysql/productionline/ProductionlineMapper.java | 1 - .../com/win/module/wms/dal/mysql/project/ProjectMapper.java | 1 - 11 files changed, 25 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicExcelVO.java index 5f2154fd..cd978587 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicExcelVO.java @@ -23,9 +23,6 @@ public class AreabasicExcelVO { @ExcelProperty("名称") private String name; - @ExcelProperty("描述") - private String description; - @ExcelProperty("仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicExportReqVO.java index 6f7614fe..0ae9f5ec 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicExportReqVO.java @@ -18,9 +18,6 @@ public class AreabasicExportReqVO { @Schema(description = "名称") private String name; - @Schema(description = "描述") - private String description; - @Schema(description = "仓库代码") private String warehouseCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessExcelVO.java index d0519290..829ba42b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessExcelVO.java @@ -23,9 +23,6 @@ public class ProcessExcelVO { @ExcelProperty("名称") private String name; - @ExcelProperty("描述") - private String description; - @ExcelProperty(value = "类型", converter = DictConvert.class) @DictFormat("process_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String type; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessExportReqVO.java index ffa51f19..20ca33b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessExportReqVO.java @@ -18,9 +18,6 @@ public class ProcessExportReqVO { @Schema(description = "名称") private String name; - @Schema(description = "描述") - private String description; - @Schema(description = "类型") private String type; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineExcelVO.java index 38815a10..54624825 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineExcelVO.java @@ -23,9 +23,6 @@ public class ProductionlineExcelVO { @ExcelProperty("名称") private String name; - @ExcelProperty("描述") - private String description; - @ExcelProperty(value = "类型", converter = DictConvert.class) @DictFormat("production_line_type") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String type; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineExportReqVO.java index a242061b..7e9ee896 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineExportReqVO.java @@ -18,9 +18,6 @@ public class ProductionlineExportReqVO { @Schema(description = "名称") private String name; - @Schema(description = "描述") - private String description; - @Schema(description = "类型") private String type; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/vo/ProjectExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/vo/ProjectExportReqVO.java index e4fec69d..a36d3da1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/vo/ProjectExportReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/project/vo/ProjectExportReqVO.java @@ -18,9 +18,6 @@ public class ProjectExportReqVO { @Schema(description = "名称") private String name; - @Schema(description = "描述") - private String description; - @Schema(description = "客户代码") private String customerCode; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java index f3c7b84a..c42e939e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/areabasic/AreabasicMapper.java @@ -47,7 +47,6 @@ public interface AreabasicMapper extends BaseMapperX { return selectList(new LambdaQueryWrapperX() .eqIfPresent(AreabasicDO::getCode, reqVO.getCode()) .likeIfPresent(AreabasicDO::getName, reqVO.getName()) - .eqIfPresent(AreabasicDO::getDescription, reqVO.getDescription()) .eqIfPresent(AreabasicDO::getWarehouseCode, reqVO.getWarehouseCode()) .eqIfPresent(AreabasicDO::getType, reqVO.getType()) .eqIfPresent(AreabasicDO::getIsFunctional, reqVO.getIsFunctional()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java index 8d463244..4adacbc4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/process/ProcessMapper.java @@ -46,7 +46,6 @@ public interface ProcessMapper extends BaseMapperX { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProcessDO::getCode, reqVO.getCode()) .likeIfPresent(ProcessDO::getName, reqVO.getName()) - .eqIfPresent(ProcessDO::getDescription, reqVO.getDescription()) .eqIfPresent(ProcessDO::getType, reqVO.getType()) .eqIfPresent(ProcessDO::getWorkshopCode, reqVO.getWorkshopCode()) .eqIfPresent(ProcessDO::getProductionLineCode, reqVO.getProductionLineCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java index 056c1faa..9158eb92 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionline/ProductionlineMapper.java @@ -46,7 +46,6 @@ public interface ProductionlineMapper extends BaseMapperX { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProductionlineDO::getCode, reqVO.getCode()) .likeIfPresent(ProductionlineDO::getName, reqVO.getName()) - .eqIfPresent(ProductionlineDO::getDescription, reqVO.getDescription()) .eqIfPresent(ProductionlineDO::getType, reqVO.getType()) .eqIfPresent(ProductionlineDO::getWorkshopCode, reqVO.getWorkshopCode()) .eqIfPresent(ProductionlineDO::getRawLocationCode, reqVO.getRawLocationCode()) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java index 49478d77..b8fd9a94 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/project/ProjectMapper.java @@ -41,7 +41,6 @@ public interface ProjectMapper extends BaseMapperX { return selectList(new LambdaQueryWrapperX() .eqIfPresent(ProjectDO::getCode, reqVO.getCode()) .likeIfPresent(ProjectDO::getName, reqVO.getName()) - .eqIfPresent(ProjectDO::getDescription, reqVO.getDescription()) .eqIfPresent(ProjectDO::getCustomerCode, reqVO.getCustomerCode()) .eqIfPresent(ProjectDO::getAvailable, reqVO.getAvailable()) .betweenIfPresent(ProjectDO::getActiveTime, reqVO.getActiveTime())