diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/PlateManageController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/PlateManageController.java index 2fb1f6222..4ef933615 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/PlateManageController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/PlateManageController.java @@ -121,7 +121,7 @@ public class PlateManageController { } @GetMapping("/get-import-template") - @Operation(summary = "获得导入用户模板") + @Operation(summary = "获得导入板材模板") @PreAuthorize("@ss.hasAnyPermissions('system:plate:export-template','base:plate:export-template')") public void importTemplate(HttpServletResponse response) { plateService.exportTemplate(response, "excel_plate_add.xlsx"); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateImportExcelVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateImportExcelVO.java index 53ef954f5..99f133179 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateImportExcelVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateImportExcelVO.java @@ -40,34 +40,18 @@ public class PlateImportExcelVO { @ColumnWidth(10) private String texture; - @ExcelProperty("宽度") - @ColumnWidth(10) -// @NotEmpty(message = "宽度不能为空") - private String width; - - @ExcelProperty("长度")// float(8,3) - @ColumnWidth(10) -// @NotEmpty(message = "长度不能为空") - private String height; - @ExcelProperty("*厚度") @ColumnWidth(10) @NotEmpty(message = "厚度不能为空") private String thickness; - @ExcelProperty("规格") -// @NotEmpty(message = "规格不能为空") - private String spec; - @ExcelProperty("备注") private String remark; @ExcelProperty("品牌") -// @NotEmpty(message = "品牌不能为空") private String brand; @ExcelProperty("价格") -// @NotEmpty(message = "价格不能为空") private String price; @ExcelProperty("上传结果") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateRespVO.java index 1f29836d2..98714f56e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/manage/plate/vo/plate/PlateRespVO.java @@ -43,11 +43,9 @@ public class PlateRespVO { private Boolean texture; @Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("宽度") private Double width; @Schema(description = "高度", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("长度") private Double height; @Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED) @@ -64,7 +62,6 @@ public class PlateRespVO { private String brand; @Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED) - @ExcelProperty("规格") private String spec; @Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateExcelListener.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateExcelListener.java index a617b23d3..6ecc5eae3 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateExcelListener.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/manage/plate/PlateExcelListener.java @@ -67,8 +67,6 @@ public final class PlateExcelListener extends ExcelListener extends ExcelListener