From e2d63434dba8bb6a0f27574fbee159149a64f677 Mon Sep 17 00:00:00 2001 From: luweihao Date: Thu, 27 Feb 2020 13:30:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?bug=20`7570`=20`7561`=20=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E6=89=A3=E5=87=8F=E4=BB=A3=E7=A0=81=E5=8E=BB=E9=99=A4=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java index a82b8d4..22810be 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPcnSyncErrorLog.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -45,6 +46,7 @@ public class MesPcnSyncErrorLog extends BaseBean implements Serializable { @ApiParam("异常位置") private String errorSpot; + @Lob @Column(name = "ERROR_CONTENT") @ApiParam("异常内容") private String errorContent; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java index 01015d5..5c98174 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncErrorLog.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.io.Serializable; @@ -45,6 +46,7 @@ public class MesPcnSyncErrorLog extends BaseBean implements Serializable { @ApiParam("异常位置") private String errorSpot; + @Lob @Column(name = "ERROR_CONTENT") @ApiParam("异常内容") private String errorContent; From d3c30fa9bedac2916e7fe28f39e75daabcd6b127 Mon Sep 17 00:00:00 2001 From: qianhs Date: Thu, 27 Feb 2020 13:40:15 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=20=E7=9B=98=E7=82=B9=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E8=83=BD=E5=90=A6=E7=9B=98=E7=82=B9=E5=BE=85=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E7=9A=84=E6=9D=A1=E7=A0=81=EF=BC=8C=E6=AC=A7=E6=B4=B2?= =?UTF-8?q?=E6=96=B9=E9=9D=A2=E4=B8=8D=E9=9C=80=E8=A6=81=E5=AF=B9=E8=B4=A8?= =?UTF-8?q?=E6=A3=80=E6=9D=A1=E7=A0=81=E8=BF=9B=E8=A1=8C=E5=8D=A1=E6=8E=A7?= =?UTF-8?q?=E3=80=91=E3=80=90bug7542=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java index de87da0..456348c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsSnOperateRecord.java @@ -75,4 +75,8 @@ public class WmsSnOperateRecord extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.SN_OPERATE_TYPE.class, refForeignKey = "value", value = "description") private Integer operateType; + @Column(name = "ref_sn") + @ApiParam(value = "关联二维码") + private String refSN; + } From 2c06163f88cd3a79e0459f976ce93cc92de2735e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 27 Feb 2020 14:20:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0PTL=5F=E4=B8=BB=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=98=8E=E7=BB=86=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/ptl/bean/PtlMainTaskDetail.java | 48 ++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java diff --git a/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java new file mode 100644 index 0000000..e532265 --- /dev/null +++ b/modules/i3plus-pojo-ptl/src/main/java/cn/estsh/i3plus/pojo/ptl/bean/PtlMainTaskDetail.java @@ -0,0 +1,48 @@ +package cn.estsh.i3plus.pojo.ptl.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.io.Serializable; + +/** + * @author adair.song + * @date 2020/2/12 17:41 + * @desc + */ + +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@Table(name = "PTL_MAIN_TASK_DETAIL") +@EqualsAndHashCode(callSuper = true) +@Api("主任务明细") +public class PtlMainTaskDetail extends BaseBean implements Serializable { + private static final long serialVersionUID = 7144785793974319897L; + + @Column(name = "TASK_NO") + @ApiParam("主任务编号") + private String taskNo; + + @Column(name = "PART_NO") + @ApiParam("产品物料号") + private String partNo; + + @Column(name = "PART_NAME") + @ApiParam("产品物料名称") + private String partName; + + @Column(name = "QTY") + @ApiParam("数量") + private Integer qty; + +}