From 987a502d7e42dd47fb09bea712e6ac0abd0f49a6 Mon Sep 17 00:00:00 2001 From: jokelone Date: Mon, 18 Nov 2019 11:53:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E3=80=90bug=EF=BC=9A6380=20=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=AD=97=E6=AE=B5=E6=8B=BC=E5=86=99=E6=9C=89=E8=AF=AF?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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("包装编码匹配类型") From e3ba4f63497c2923420dd7da2ff3dbec16217265 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 18 Nov 2019 13:38:06 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=84=E5=88=99?= =?UTF-8?q?=E7=BB=84=E5=90=88=E6=89=A7=E8=A1=8C=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); } } From 6e8977e5aa4ae70012183a34d044cab1cddfde36 Mon Sep 17 00:00:00 2001 From: qinjia zou Date: Mon, 18 Nov 2019 14:29:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=8A=A8=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E3=80=91bug6390?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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..c0f54c2 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 @@ -62,17 +62,17 @@ public class WmsRoutingRule extends BaseBean { private String destZoneNo; @Column(name = "DEST_OP_TYPE_CODE") - @ApiParam(value = "目标作业类型" , example = "2") - private String destOpTypeCode; + @ApiParam(value = "目标业务类型编码" , example = "2") + private String destBusiTypeCode; + + @Column(name = "SRC_OP_TYPE_CODE") + @ApiParam(value = "源业务类型编码" , example = "2") + 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; From a8ebcb669b78da4084964b6f658ba35066ec8692 Mon Sep 17 00:00:00 2001 From: qinjia zou Date: Mon, 18 Nov 2019 14:33:15 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E8=87=AA=E5=8A=A8=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E3=80=91bug6390?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) 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 c0f54c2..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,12 +61,14 @@ public class WmsRoutingRule extends BaseBean { @ApiParam(value = "目标存储区" , example = "2") private String destZoneNo; - @Column(name = "DEST_OP_TYPE_CODE") - @ApiParam(value = "目标业务类型编码" , example = "2") + @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_OP_TYPE_CODE") - @ApiParam(value = "源业务类型编码" , example = "2") + @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")