diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index 6ad589e..2b22bce 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -34,5 +34,5 @@ public class RuleGroup extends BaseAPS { private Integer orderNumber; @JsonBackReference - List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } + public List getDetails() { return BeanRelation.list(this, ERuleGroup.Details); } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java index 7502dd2..397ff0b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java @@ -77,9 +77,9 @@ public class MesPart extends BaseBean { @ApiParam("产品类型名称") private String produceCategoryName; - @Column(name = "PORCESS_MATCH_TYPE") + @Column(name = "PROCESS_MATCH_TYPE") @ApiParam("过程编码匹配类型") - private String porcessMatchType; + private String processMatchType; @Column(name = "PACKAGE_MATCH_TYPE") @ApiParam("包装编码匹配类型") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index e120ba0..9cab718 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -61,18 +61,20 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目标存储区" , example = "2") private String destZoneNo; - @Column(name = "DEST_OP_TYPE_CODE") - @ApiParam(value = "目标作业类型" , example = "2") - private String destOpTypeCode; + @Column(name = "DEST_BUSI_TYPE_CODE") + @ApiParam(value = "目标业务类型编码" , example = "") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + private String destBusiTypeCode; + + @Column(name = "SRC_BUSI_TYPE_CODE") + @ApiParam(value = "源业务类型编码" , example = "") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") + private String srcBusiTypeCode; @Column(name = "DEST_TRANS_TYPE_CODE") @ApiParam(value = "目标交易类型" , example = "1") private String destTransTypeCode; - @Column(name = "SRC_OP_TYPE_CODE") - @ApiParam(value = "源作业类型" , example = "2") - private String srcOpTypeCode; - @Column(name = "SRC_TRANS_TYPE_CODE") @ApiParam(value = "源交易类型" , example = "1") private String srcTransTypeCode;