diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/scrproduction/param/ScrProductionParam.java b/snowy-main/src/main/java/vip/xiaonuo/modular/scrproduction/param/ScrProductionParam.java index 88994df..0b5ae7a 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/scrproduction/param/ScrProductionParam.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/scrproduction/param/ScrProductionParam.java @@ -81,28 +81,28 @@ public class ScrProductionParam extends BaseParam { /** * 回收率 */ - @NotNull(message = "扣铁粉渣用量不能为空,请检查conts参数", groups = {add.class, edit.class}) + // @NotNull(message = "扣铁粉渣用量不能为空,请检查conts参数", groups = {add.class, edit.class}) private BigDecimal conts; /** * 耗电量 */ - @NotNull(message = "耗电量不能为空,请检查power参数", groups = {add.class, edit.class}) + //@NotNull(message = "耗电量不能为空,请检查power参数", groups = {add.class, edit.class}) private BigDecimal power; /** * 渣Mn */ - @NotNull(message = "渣Mn不能为空,请检查slagMn参数", groups = {add.class, edit.class}) + // @NotNull(message = "渣Mn不能为空,请检查slagMn参数", groups = {add.class, edit.class}) private BigDecimal slagMn; /** * 炉编号 */ - @NotNull(message = "炉编号不能为空,请检查furnaceCode参数", groups = {add.class, edit.class}) + //@NotNull(message = "炉编号不能为空,请检查furnaceCode参数", groups = {add.class, edit.class}) private String furnaceCode; /** * 单耗 */ - @NotNull(message = "单耗不能为空,请检查units参数", groups = {add.class, edit.class}) + // @NotNull(message = "单耗不能为空,请检查units参数", groups = {add.class, edit.class}) private BigDecimal units; private Integer year; private Integer month; diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/scrtraindata/entity/ScrTrainData.java b/snowy-main/src/main/java/vip/xiaonuo/modular/scrtraindata/entity/ScrTrainData.java index 3a7c795..8036f1c 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/scrtraindata/entity/ScrTrainData.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/scrtraindata/entity/ScrTrainData.java @@ -78,4 +78,15 @@ public class ScrTrainData extends BaseEntity { @Excel(name = "部门") private String workPlace; + /** + * 内部数量 + */ + @Excel(name = "内部数量") + private Integer nbNum; + + /** + * 外部数量 + */ + @Excel(name = "外部数量") + private Integer wbNum; } diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/scrtraindata/param/ScrTrainDataParam.java b/snowy-main/src/main/java/vip/xiaonuo/modular/scrtraindata/param/ScrTrainDataParam.java index 6133171..f5f3677 100644 --- a/snowy-main/src/main/java/vip/xiaonuo/modular/scrtraindata/param/ScrTrainDataParam.java +++ b/snowy-main/src/main/java/vip/xiaonuo/modular/scrtraindata/param/ScrTrainDataParam.java @@ -60,8 +60,18 @@ public class ScrTrainDataParam extends BaseParam { /** * 内部还是外部 */ - @NotNull(message = "内部还是外部不能为空,请检查nborwb参数", groups = {add.class, edit.class}) + //@NotNull(message = "内部还是外部不能为空,请检查nborwb参数", groups = {add.class, edit.class}) private Integer nborwb; + /** + * 内部数量 + */ + @NotNull(message = "内部数量不能为空,请检查nbNum参数", groups = {add.class, edit.class}) + private Integer nbNum; + /** + * 外部数量 + */ + @NotNull(message = "外部数量不能为空,请检查wbNum参数", groups = {add.class, edit.class}) + private Integer wbNum; /** * 日期