Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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;

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;

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;
+
+}

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;
+
 }