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

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -26,7 +23,10 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_ASN_MASTER")
+@Table(name = "WMS_DOC_ASN_MASTER", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("ASN主表信息")
 public class WmsASNMaster extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import java.util.List;
 
@@ -28,7 +29,13 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_ASN_DETAILS")
+@Table(name = "WMS_DOC_ASN_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SN_1D"),
+        @Index(columnList = "SN_2D"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("ASN订单明细信息")
 public class WmsASNMasterDetails extends BaseBean {
     @Column(name = "PART_NO")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionStepCall.java

@@ -4,17 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 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.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 作业步骤调用
@@ -28,7 +24,11 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_ACTION_STEP_CALL")
+@Table(name="WMS_ACTION_STEP_CALL", indexes = {
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "AS_ID"),
+        @Index(columnList = "AM_ID")
+})
 @Api("作业步骤调用信息")
 public class WmsActionStepCall extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -26,7 +23,12 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_MOVEMENT_DETAILS")
+@Table(name = "WMS_DOC_MOVEMENT_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SRC_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("移库单明细表")
 public class WmsDocMovementDetails extends BaseBean {
     @Column(name = "PART_NO")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java

@@ -9,10 +9,7 @@ import lombok.ToString;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -27,7 +24,13 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_MOVEMENT_MASTER")
+@Table(name = "WMS_DOC_MOVEMENT_MASTER", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "REF_NO"),
+        @Index(columnList = "ERP_SRC_NO"),
+        @Index(columnList = "BUSI_TYPE"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("移库单表")
 @ToString
 public class WmsDocMovementMaster extends BaseBean {

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 移库单条码表
@@ -27,7 +24,12 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_MOVEMENT_SN")
+@Table(name="WMS_DOC_MOVEMENT_SN", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SN"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("移库条码信息")
 public class WmsDocMovementSn extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 库存移动单明细信息
@@ -25,7 +22,11 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_MOVE_DETAILS")
+@Table(name="WMS_MOVE_DETAILS", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("库存移动单明细信息")
 public class WmsMoveDetails extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java

@@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -24,7 +25,11 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_MOVE_MASTER")
+@Table(name = "WMS_MOVE_MASTER", indexes = {
+        @Index(columnList = "TRANS_TYPE_CODE"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("库存移动单主表信息")
 public class WmsMoveMaster extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : 库存移动单条码信息
@@ -26,7 +23,12 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_MOVE_SN")
+@Table(name="WMS_MOVE_SN", indexes = {
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "SN"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("库存移动单条码信息")
 public class WmsMoveSn extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java

@@ -8,10 +8,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.List;
 
 /**
@@ -26,7 +23,10 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_PO_MASTER")
+@Table(name = "WMS_DOC_PO_MASTER", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("PO主表信息")
 public class WmsPOMaster extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java

@@ -9,10 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 
 /**
  * @Description : PO订单明细信息
@@ -26,7 +23,11 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_DOC_PO_DETAILS")
+@Table(name = "WMS_DOC_PO_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("PO订单明细信息")
 public class WmsPOMasterDetails extends BaseBean {
     @Column(name = "PART_NO")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -26,7 +27,13 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="WMS_DOC_PO_SN")
+@Table(name="WMS_DOC_PO_SN", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "SN_1D"),
+        @Index(columnList = "SN_2D"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("PO条码信息")
 public class WmsPoSn extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -22,7 +23,11 @@ import javax.persistence.Table;
  **/
 @Data
 @Entity
-@Table(name = "WMS_STOCK_QUAN")
+@Table(name = "WMS_STOCK_QUAN", indexes = {
+        @Index(columnList = "WH_NO"),
+        @Index(columnList = "ZONE_NO"),
+        @Index(columnList = "LOCATE_NO")
+})
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -10,10 +10,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.Date;
 
 /**
@@ -25,7 +22,20 @@ import java.util.Date;
  **/
 @Data
 @Entity
-@Table(name = "WMS_STOCK_SN")
+@Table(name = "WMS_STOCK_SN", indexes = {
+        @Index(columnList = "PACKAGE_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "REF_SRC"),
+        @Index(columnList = "SN"),
+        @Index(columnList = "SN_2D"),
+        @Index(columnList = "WH_NO"),
+        @Index(columnList = "ZONE_NO"),
+        @Index(columnList = "LOCATE_NO"),
+        @Index(columnList = "LOT_NO"),
+        @Index(columnList = "FIX_LOT_NO"),
+        @Index(columnList = "DATE_CODE"),
+        @Index(columnList = "VENDOR_NO")
+        })
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -25,7 +26,11 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_TASK_DETAILS")
+@Table(name = "WMS_TASK_DETAILS", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO"),
+        @Index(columnList = "ITEM_STATUS")
+})
 @Api("作业任务明细信息")
 public class WmsTaskDetails extends BaseBean {
 

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -25,7 +26,13 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "WMS_TRANS_QUAN")
+@Table(name = "WMS_TRANS_QUAN", indexes = {
+        @Index(columnList = "WH_NO"),
+        @Index(columnList = "ZONE_NO"),
+        @Index(columnList = "LOCATE_NO"),
+        @Index(columnList = "REF_SRC"),
+        @Index(columnList = "ORGANIZE_CODE")
+})
 @Api("库存交易信息")
 public class WmsTransQuan extends BaseBean {