Merge branches 'ext-dev' and '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/MesBoardShiftSection.java

@@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 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 javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -54,6 +49,10 @@ public class MesBoardShiftSection extends BaseBean implements Serializable {
     @ApiParam("是否跨天")
     private Integer isSpanday;
 
+    @Column(name = "SEQ")
+    @ApiParam("顺序")
+    private Integer seq;
+
     @Transient
     @ApiParam("班次名称")
     private String shiftName;

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

@@ -4,8 +4,6 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
@@ -13,7 +11,6 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
 import java.io.Serializable;
-import java.math.BigDecimal;
 
 /**
  * @Description:
@@ -33,7 +30,6 @@ import java.math.BigDecimal;
         @Index(columnList = "PRODUCT_SN"),
         @Index(columnList = "CREATE_DATE_TIME"),
         @Index(columnList = "MODIFY_DATE_TIME"),
-        @Index(columnList = "PART_NO"),
         @Index(columnList = "WORK_ORDER_NO")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "SERIAL_NUMBER"})

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

@@ -32,9 +32,7 @@ import java.io.Serializable;
 @Inheritance(strategy = InheritanceType.JOINED)
 @Table(name = "MES_QUEUE_JIT_PLAN_BOM", indexes = {
         @Index(columnList = "JIS_PLAN_NO"),
-        @Index(columnList = "ORGANIZE_CODE"),
-        @Index(columnList = "PRODUCE_CTGY_CODE"),
-        @Index(columnList = "PART_NO")
+        @Index(columnList = "PRODUCE_CTGY_CODE")
 })
 @Api("MES_客户JIT预装队列BOM")
 public class MesQueueJitPlanBom extends BaseBean implements Serializable {