From 9bcfb291e2eb8ddc485b5d0fb236c37756a63b2c Mon Sep 17 00:00:00 2001 From: lihua <531456470@qq.com> Date: Wed, 31 Jul 2019 14:25:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/redrock/assetmanage/dto/Material.java | 17 +++++++++-------- .../assetmanage/entity/AmMaterial.java | 14 +++++++------- src/main/resources/static/template.xlsx | Bin 9685 -> 9718 bytes 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/main/java/cn/redrock/assetmanage/dto/Material.java b/src/main/java/cn/redrock/assetmanage/dto/Material.java index d0004ff..a928f0b 100644 --- a/src/main/java/cn/redrock/assetmanage/dto/Material.java +++ b/src/main/java/cn/redrock/assetmanage/dto/Material.java @@ -17,29 +17,30 @@ import javax.validation.constraints.NotNull; public class Material { private Integer id; @ExcelColumn(value = "物料编号", col = 1) + @NotBlank private String code; + @ExcelColumn(value = "数量", col = 2) + + @NotNull + private Integer num; - @ExcelColumn(value = "物料数值", col = 3) + @ExcelColumn(value = "值", col = 3) @NotBlank private String value; - @ExcelColumn(value = "物料型号", col = 4) + @ExcelColumn(value = "型号", col = 4) @NotBlank private String modelNum; - @ExcelColumn(value = "物料封装", col = 5) + @ExcelColumn(value = "封装", col = 5) @NotBlank private String packages; @ExcelColumn(value = "公司名称", col = 6) private String company; - @ExcelColumn(value = "物料数量", col = 2) - @NotNull - private Integer num; - - @ExcelColumn(value = "物料位置", col = 7) + @ExcelColumn(value = "位号", col = 7) @NotBlank private String position; diff --git a/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java b/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java index f052485..e79943e 100644 --- a/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java +++ b/src/main/java/cn/redrock/assetmanage/entity/AmMaterial.java @@ -20,23 +20,23 @@ public class AmMaterial { @ExcelColumn(value = "物料编号", col = 1) private String code; - @ExcelColumn(value = "物料数值", col = 3) + @ExcelColumn(value = "数量", col = 2) + private Integer num; + + @ExcelColumn(value = "值", col = 3) private String value; - @ExcelColumn(value = "物料型号", col = 4) + @ExcelColumn(value = "型号", col = 4) @Column(name = "model_num") private String modelNum; - @ExcelColumn(value = "物料封装", col = 5) + @ExcelColumn(value = "封装", col = 5) private String packages; @ExcelColumn(value = "公司名称", col = 6) private String company; - @ExcelColumn(value = "物料数量", col = 2) - private Integer num; - - @ExcelColumn(value = "物料位置", col = 7) + @ExcelColumn(value = "位号", col = 7) private String position; @ExcelColumn(value = "备注", col = 8) diff --git a/src/main/resources/static/template.xlsx b/src/main/resources/static/template.xlsx index 7b41715952695190e6756235e21e28846e882aa9..2b462065d87518419c4a8316e6d76c01b3a350b6 100644 GIT binary patch delta 3158 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 LO0%>`{XP0WVJq84 delta 3134 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