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

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdCfgDetail.java

@@ -47,6 +47,14 @@ public class MesProdCfgDetail extends BaseBean implements Serializable {
     @ApiParam("是否虚零件")
     private Integer isVirtual;
 
+    @Column(name = "IS_LEFT_PART")
+    @ApiParam("是否左零件")
+    private Integer isLeftPart;
+
+    @Column(name = "PRINTER_NAME")
+    @ApiParam("打印机名称")
+    private String printerName;
+
     @Transient
     @ApiParam("零件名称")
     private String partName;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.java

@@ -236,6 +236,18 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("物料版本号")
     private String versionNo;
 
+    @Transient
+    @ApiParam("配方内容")
+    private String formulaContent;
+
+    @Transient
+    @ApiParam("分组队列编号")
+    private String queueGroupNo;
+
+    @Transient
+    @ApiParam("组内编号")
+    private Integer groupNo;
+
     public MesProduceSn() {
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualBom.java

@@ -8,12 +8,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Index;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
-import javax.persistence.Table;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -74,4 +69,8 @@ public class MesQueueJitActualBom extends BaseBean implements Serializable {
     @Column(name = "PART_COLOR_VALUE")
     @ApiParam("零件色值")
     private String partColorValue;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
 }