mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 21:52:07 +08:00
板材库导入导出、下载导入模版 无用字段删除:长/宽/规格
This commit is contained in:
+1
-1
@@ -121,7 +121,7 @@ public class PlateManageController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@GetMapping("/get-import-template")
|
@GetMapping("/get-import-template")
|
||||||
@Operation(summary = "获得导入用户模板")
|
@Operation(summary = "获得导入板材模板")
|
||||||
@PreAuthorize("@ss.hasAnyPermissions('system:plate:export-template','base:plate:export-template')")
|
@PreAuthorize("@ss.hasAnyPermissions('system:plate:export-template','base:plate:export-template')")
|
||||||
public void importTemplate(HttpServletResponse response) {
|
public void importTemplate(HttpServletResponse response) {
|
||||||
plateService.exportTemplate(response, "excel_plate_add.xlsx");
|
plateService.exportTemplate(response, "excel_plate_add.xlsx");
|
||||||
|
|||||||
-16
@@ -40,34 +40,18 @@ public class PlateImportExcelVO {
|
|||||||
@ColumnWidth(10)
|
@ColumnWidth(10)
|
||||||
private String texture;
|
private String texture;
|
||||||
|
|
||||||
@ExcelProperty("宽度")
|
|
||||||
@ColumnWidth(10)
|
|
||||||
// @NotEmpty(message = "宽度不能为空")
|
|
||||||
private String width;
|
|
||||||
|
|
||||||
@ExcelProperty("长度")// float(8,3)
|
|
||||||
@ColumnWidth(10)
|
|
||||||
// @NotEmpty(message = "长度不能为空")
|
|
||||||
private String height;
|
|
||||||
|
|
||||||
@ExcelProperty("*厚度")
|
@ExcelProperty("*厚度")
|
||||||
@ColumnWidth(10)
|
@ColumnWidth(10)
|
||||||
@NotEmpty(message = "厚度不能为空")
|
@NotEmpty(message = "厚度不能为空")
|
||||||
private String thickness;
|
private String thickness;
|
||||||
|
|
||||||
@ExcelProperty("规格")
|
|
||||||
// @NotEmpty(message = "规格不能为空")
|
|
||||||
private String spec;
|
|
||||||
|
|
||||||
@ExcelProperty("备注")
|
@ExcelProperty("备注")
|
||||||
private String remark;
|
private String remark;
|
||||||
|
|
||||||
@ExcelProperty("品牌")
|
@ExcelProperty("品牌")
|
||||||
// @NotEmpty(message = "品牌不能为空")
|
|
||||||
private String brand;
|
private String brand;
|
||||||
|
|
||||||
@ExcelProperty("价格")
|
@ExcelProperty("价格")
|
||||||
// @NotEmpty(message = "价格不能为空")
|
|
||||||
private String price;
|
private String price;
|
||||||
|
|
||||||
@ExcelProperty("上传结果")
|
@ExcelProperty("上传结果")
|
||||||
|
|||||||
-3
@@ -43,11 +43,9 @@ public class PlateRespVO {
|
|||||||
private Boolean texture;
|
private Boolean texture;
|
||||||
|
|
||||||
@Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "宽度", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("宽度")
|
|
||||||
private Double width;
|
private Double width;
|
||||||
|
|
||||||
@Schema(description = "高度", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "高度", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("长度")
|
|
||||||
private Double height;
|
private Double height;
|
||||||
|
|
||||||
@Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "厚度", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@@ -64,7 +62,6 @@ public class PlateRespVO {
|
|||||||
private String brand;
|
private String brand;
|
||||||
|
|
||||||
@Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "规格", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
@ExcelProperty("规格")
|
|
||||||
private String spec;
|
private String spec;
|
||||||
|
|
||||||
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便")
|
@Schema(description = "备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "随便")
|
||||||
|
|||||||
-3
@@ -67,8 +67,6 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
|
|||||||
data.setResult("板材【*】信息请填写完整");
|
data.setResult("板材【*】信息请填写完整");
|
||||||
this.flag = false;
|
this.flag = false;
|
||||||
}
|
}
|
||||||
checkData(data.getHeight(),"长度",data);
|
|
||||||
checkData(data.getWidth(),"宽度",data);
|
|
||||||
setIfInvalid(data.getThickness(),"厚度",data);
|
setIfInvalid(data.getThickness(),"厚度",data);
|
||||||
checkData(data.getThickness(),"厚度",data);
|
checkData(data.getThickness(),"厚度",data);
|
||||||
if (data.getPrice() == null || data.getPrice().equals("")) {
|
if (data.getPrice() == null || data.getPrice().equals("")) {
|
||||||
@@ -87,7 +85,6 @@ public final class PlateExcelListener<T> extends ExcelListener<PlateImportExcelV
|
|||||||
checkLength(data.getGoodsName(),"物料名称",data,64);
|
checkLength(data.getGoodsName(),"物料名称",data,64);
|
||||||
checkLength(data.getMaterial(),"材质",data,64);
|
checkLength(data.getMaterial(),"材质",data,64);
|
||||||
checkLength(data.getColor(),"颜色",data,32);
|
checkLength(data.getColor(),"颜色",data,32);
|
||||||
checkLength(data.getSpec(),"规格",data,64);
|
|
||||||
checkLength(data.getBrand(),"品牌",data,64);
|
checkLength(data.getBrand(),"品牌",data,64);
|
||||||
checkLength(data.getRemark(),"备注",data,255);
|
checkLength(data.getRemark(),"备注",data,255);
|
||||||
|
|
||||||
|
|||||||
BIN
Binary file not shown.
Reference in New Issue
Block a user