From 563955570daf19e4d794e6fbc97c6db6e464eea3 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 31 Oct 2019 22:04:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E4=BC=98=E5=8C=96=201078?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 9 +++++++-- .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java | 5 ----- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 11 ++++++++--- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java | 5 ----- .../java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 1 - 6 files changed, 16 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 41e5a23..182a1d5 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -46,9 +47,9 @@ public class MesPackage extends BaseBean { @ApiParam("包装规格数量") private Double packSpecQty; - @Column(name = "NUIT") + @Column(name = "UNIT") @ApiParam("包装规格数量") - private String nuit; + private String unit; @Column(name = "LOT_NO") @ApiParam("批号") @@ -62,6 +63,10 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱") private Integer isSealed; + @Transient + @ApiParam("封箱状态") + private String sealStatus; + @Column(name = "PRINT_STATUS") @ApiParam("打印状态10：未打印 20：已打印") private Integer printStatus; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java index f2aee4d..a302a3e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.java @@ -112,10 +112,6 @@ public class MesProduceSn extends BaseBean implements Serializable { @ApiParam("客户代码") private String custCode; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name = "SN_TYPE") @ApiParam("条码类型 10=正常 20=首检件") private Integer snType; @@ -178,7 +174,6 @@ public class MesProduceSn extends BaseBean implements Serializable { ", workOrderNo='" + workOrderNo + '\'' + ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + - ", packageSn='" + packageSn + '\'' + ", snType='" + snType + '\'' + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 08e041a..3314cf6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -46,9 +47,9 @@ public class MesPackage extends BaseBean { @ApiParam("包装规格数量") private Double packSpecQty; - @Column(name = "NUIT") - @ApiParam("包装规格数量") - private String nuit; + @Column(name = "UNIT") + @ApiParam("单位") + private String unit; @Column(name = "LOT_NO") @ApiParam("批号") @@ -62,6 +63,10 @@ public class MesPackage extends BaseBean { @ApiParam("是否封箱") private Integer isSealed; + @Transient + @ApiParam("封箱状态") + private String sealStatus; + @Column(name = "PRINT_STATUS") @ApiParam("打印状态10：未打印 20：已打印") private Integer printStatus; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java index c89db3f..d0dfa6f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcessBom.java @@ -83,7 +83,7 @@ public class MesProcessBom extends BaseBean { @ApiParam(value = "是否投料配置") private Integer isFeed; - @Column(name = "is_BIND_KEY") + @Column(name = "IS_BIND_KEY") @ApiParam(value = "是否绑定关键件") private Integer isBindKey; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java index fa582cd..842e8eb 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java @@ -109,10 +109,6 @@ public class MesProduceSn extends BaseBean { @ApiParam("客户代码") private String custCode; - @Column(name = "PACKAGE_SN") - @ApiParam("包装条码") - private String packageSn; - @Column(name = "SN_TYPE") @ApiParam("条码类型") private Integer snType; @@ -171,7 +167,6 @@ public class MesProduceSn extends BaseBean { ", workOrderNo='" + workOrderNo + '\'' + ", custSn='" + custSn + '\'' + ", custPartNo='" + custPartNo + '\'' + - ", packageSn='" + packageSn + '\'' + ", snType='" + snType + '\'' + ", tray='" + tray + '\'' + ", resultMsg='" + resultMsg + '\'' + diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index deb4a29..a6b6ce2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -880,7 +880,6 @@ public class MesHqlPack { public static DdlPackBean getMesProdCfgExcludeById(MesProdRouteCfg mesProdRouteCfg, String org) { DdlPackBean packBean = getAllBaseData(org); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean); - DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean); DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getNumNOEqualPack(mesProdRouteCfg.getId(), "id", packBean); return packBean; From 80c340308a95ea1c9d1fc8ee827df266a8643b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Thu, 31 Oct 2019 22:43:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3POJO=E4=B8=AD=E7=9A=84=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E9=95=BF=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 33e46a0..eee5432 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -76,12 +76,12 @@ public class WmsInterfaceDataMapper extends BaseBean { /** * 目标实体对象的名字，多个字段用半角逗号分隔 */ - @Column(name = "DEST_BEAN_NAME", length = 50) + @Column(name = "DEST_BEAN_NAME", length = 500) public String destBeanName; /** * 目标实体对象判断数据是否存在的一组业务属性名称，多个属性用半角逗号分隔 */ - @Column(name = "DEST_PK_PROPERTIES", length = 50) + @Column(name = "DEST_PK_PROPERTIES", length = 500) public String destPkProperties; /** * 源表字段与目标对象属性的映射关系，List 对象，JSON 格式存储