diff --git a/src/main/java/mjkf/xinke/main/model/db/Material.java b/src/main/java/mjkf/xinke/main/model/db/Material.java index ea49db9..40039e7 100644 --- a/src/main/java/mjkf/xinke/main/model/db/Material.java +++ b/src/main/java/mjkf/xinke/main/model/db/Material.java @@ -95,6 +95,22 @@ public class Material extends Model { @TableField("CATEGORY4") private String category4; + @ApiModelProperty("名称") + @TableField("NAME") + private String name; + + @ApiModelProperty("单位") + @TableField("UNIT") + private String unit; + + @ApiModelProperty("规格") + @TableField("SPEC") + private String spec; + + @ApiModelProperty("税率%") + @TableField("TAX") + private Integer tax; + @ApiModelProperty("是否初始内建类型(不允许删除)") @TableField("IS_BUILTIN") private Integer isBuiltin; @@ -120,10 +136,14 @@ public class Material extends Model { public Material(MaterialCreateRequest params, SaBaseLoginUser user) { this.id = params.getId(); this.parentId = params.getParentId(); - this.category1 = params.getCategory1(); - this.category2 = params.getCategory2(); - this.category3 = params.getCategory3(); - this.category4 = params.getCategory4(); +// this.category1 = params.getCategory1(); +// this.category2 = params.getCategory2(); +// this.category3 = params.getCategory3(); +// this.category4 = params.getCategory4(); + this.name = params.getName(); + this.unit = params.getUnit(); + this.spec = params.getSpec(); + this.tax = params.getTax(); this.updateTime = LocalDateTime.now(); this.createTime = LocalDateTime.now(); this.createUserName = user.getName(); @@ -131,10 +151,14 @@ public class Material extends Model { } public void edit(MaterialEditRequest params, SaBaseLoginUser user) { - this.category1 = params.getCategory1(); - this.category2 = params.getCategory2(); - this.category3 = params.getCategory3(); - this.category4 = params.getCategory4(); +// this.category1 = params.getCategory1(); +// this.category2 = params.getCategory2(); +// this.category3 = params.getCategory3(); +// this.category4 = params.getCategory4(); + this.name = params.getName(); + this.unit = params.getUnit(); + this.spec = params.getSpec(); + this.tax = params.getTax(); this.updateTime = LocalDateTime.now(); this.updateUserName = user.getName(); this.updateUserId = user.getId(); diff --git a/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java b/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java index 4bb88c7..cbdad3e 100644 --- a/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java +++ b/src/main/java/mjkf/xinke/main/model/vo/MaterialCreateRequest.java @@ -16,17 +16,29 @@ public class MaterialCreateRequest { @ApiModelProperty("父级id") private String parentId; - @ApiModelProperty("分类1") - private String category1; +// @ApiModelProperty("分类1") +// private String category1; +// +// @ApiModelProperty("分类2") +// private String category2; +// +// @ApiModelProperty("分类3") +// private String category3; +// +// @ApiModelProperty("分类4") +// private String category4; - @ApiModelProperty("分类2") - private String category2; + @ApiModelProperty("名称") + private String name; - @ApiModelProperty("分类3") - private String category3; + @ApiModelProperty("单位") + private String unit; - @ApiModelProperty("分类4") - private String category4; + @ApiModelProperty("规格") + private String spec; + + @ApiModelProperty("税率") + private Integer tax; public void check() throws Exception{ String flag = this.parentId.replace(".00", ""); diff --git a/src/main/java/mjkf/xinke/main/model/vo/MaterialEditRequest.java b/src/main/java/mjkf/xinke/main/model/vo/MaterialEditRequest.java index 35f4ac7..6726cdb 100644 --- a/src/main/java/mjkf/xinke/main/model/vo/MaterialEditRequest.java +++ b/src/main/java/mjkf/xinke/main/model/vo/MaterialEditRequest.java @@ -6,17 +6,29 @@ import lombok.Data; @Data public class MaterialEditRequest { - @ApiModelProperty("分类1") - private String category1; +// @ApiModelProperty("分类1") +// private String category1; +// +// @ApiModelProperty("分类2") +// private String category2; +// +// @ApiModelProperty("分类3") +// private String category3; +// +// @ApiModelProperty("分类4") +// private String category4; - @ApiModelProperty("分类2") - private String category2; + @ApiModelProperty("分名称") + private String name; - @ApiModelProperty("分类3") - private String category3; + @ApiModelProperty("分单位") + private String unit; - @ApiModelProperty("分类4") - private String category4; + @ApiModelProperty("分规格") + private String spec; + + @ApiModelProperty("税率") + private Integer tax; public void check() throws Exception{