diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 092c66b..88836d3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -2567,7 +2567,7 @@ public class MesEnumUtil { INCOMING_CHECK(5, "来料检验"), FIRST_CHECK(10, "首检"), ON_SITE_CHECK(20, "巡检"), - ND_CHECK(30, "末检"), + END_CHECK(30, "末检"), RC_CHECK(40, "发货检验"); private int value; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java index ad18404..c3f6856 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfQcOrderDataModel.java @@ -51,7 +51,7 @@ public class IfQcOrderDataModel extends BaseBean { private String matnr; @ApiParam("收货数量") - private String erfmg; + private Double erfmg; @ApiParam("计量单位") private String erfme;