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

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@@ -15,7 +14,6 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.MappedSuperclass;
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotEmpty;
 import java.util.Date;
 import java.util.List;
 
@@ -105,14 +103,4 @@ public class BaseOrder extends BaseCode {
     public List<WorkRelation> getPostRelations() {
         return BeanRelation.list(this, EBaseOrder.PostRelations);
     }
-
-    @JsonBackReference
-    public List<BaseOrder> getUpperOrders() {
-        return BeanRelation.list(this, EBaseOrder.UpperOrders);
-    }
-
-    @JsonBackReference
-    public List<BaseOrder> getLowerOrders() {
-        return BeanRelation.list(this, EBaseOrder.LowerOrders);
-    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java

@@ -36,10 +36,15 @@ public class ImportDetail extends BaseAPS {
     @ApiParam(value ="内部表名")
     private String inName;
 
-    @Column(name="TYPE")
+    @Column(name="IMPORT_TYPE")
     @ApiParam(value ="导入类型")
     @FieldAnnotation(defaultValue = "REPLACE")
-    private ApsEnumUtil.IMPORT_DETAIL_TYPE type;
+    private ApsEnumUtil.IMPORT_DETAIL_TYPE importType;
+
+    @Column(name="SKIP_ROWS")
+    @ApiParam(value ="跳过行数")
+    @FieldAnnotation(defaultValue = "0")
+    private Integer skipRows;
 
     @Column(name="ORDER_NUMBER")
     @ApiParam(value ="序号")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java

@@ -5,6 +5,4 @@ public enum EBaseOrder {
     Material,
     PrevRelations,
     PostRelations,
-    UpperOrders,
-    LowerOrders
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java

@@ -10,15 +10,12 @@ import java.util.Date;
 
 @Data
 public class GanttCalendarModel {
-    private Long parent;
+    private Long resourceId;
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)
-    private Date start_date;
+    private Date startDate;
     @JsonSerialize(using = CustomDateSerializer.class)
     @JsonDeserialize(using = CustomDateDeserializer.class)
-    private Date end_date;
+    private Date endDate;
-    private String color;
+    private String cls;
-    private Long id;
-    private Long workId;
-    private String text;
 }

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -1347,6 +1347,45 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+    /**
+     * 库存移动单状态状态:10=新建,20=已处理,30=处理出错
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WMSSHIPPING_ORDER_STATUS {
+        CREATE(10, "新建"),
+        PENDING(20, "已处理"),
+        ERROR(30, "处理出错");
+
+        private int value;
+        private String description;
+
+        WMSSHIPPING_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 
     /**
      * 库存移动单明细状态
@@ -4304,4 +4343,150 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 收货看板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RECEIVING_GOODS_STATUS {
+        WAIT_RECEIVING(10, "待收货"),
+        RECEIVING(20, "收货中"),
+        COMPLETE_RECEIVING(30, "收货完成"),
+        UN_RECEIVED(40, "延迟未收货"),
+        ELSE(50,"其他");
+
+        private int value;
+        private String description;
+
+        RECEIVING_GOODS_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static RECEIVING_GOODS_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 发运看板状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum FINAL_SHIPMENT_STATUS {
+        CREATE(10, "新建"),
+        PROCESSING(20, "处理中"),
+        COMPLETE(30, "已完成");
+
+        private int value;
+        private String description;
+
+        FINAL_SHIPMENT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static FINAL_SHIPMENT_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
+    /**
+     * 生产计划主表状态创建
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_MASTER_STATUS {
+        CREATE(10,"CREATE", "创建"),
+        PLANNED(20,"PLANNED", "已计划"),
+        CLOSE(30,"CLOSE", "已关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WORK_ORDER_MASTER_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }

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

@@ -63,4 +63,18 @@ public class MesDatasource extends BaseBean {
     @ApiParam("设备代码")
     private String equipmentCode;
 
+    @Override
+    public String toString() {
+        return "MesDatasource{" +
+                "dsCode='" + dsCode + '\'' +
+                ", dsName='" + dsName + '\'' +
+                ", dsType='" + dsType + '\'' +
+                ", dsHost='" + dsHost + '\'' +
+                ", dsPort=" + dsPort +
+                ", dsUser='" + dsUser + '\'' +
+                ", dsPassword='" + dsPassword + '\'' +
+                ", dsDbName='" + dsDbName + '\'' +
+                ", equipmentCode='" + equipmentCode + '\'' +
+                '}';
+    }
 }

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDefectRecord.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,30 +23,33 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name="MES_DEFECT_RECORD")
+@Table(name = "MES_DEFECT_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("不良信息记录表")
 public class MesDefectRecord extends BaseBean {
-    @Column(name="SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name="PART_NAME")
+    @Column(name = "PART_NAME")
     @ApiParam("物料名称")
     private String partName;
 
-    @Column(name="DEFECT_CODE")
+    @Column(name = "DEFECT_CODE")
     @ApiParam("缺陷代码")
     private String defectCode;
 
-    @Column(name="DEFECT_NAME")
+    @Column(name = "DEFECT_NAME")
     @ApiParam("缺陷名称")
     private String defectName;
 
-    @Column(name="DEFECT_LOCATION")
+    @Column(name = "DEFECT_LOCATION")
     @ApiParam("缺陷位置")
     private String defectLocation;
 
@@ -57,19 +57,19 @@ public class MesDefectRecord extends BaseBean {
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name="REPAIR_STATUS")
+    @Column(name = "REPAIR_STATUS")
     @ApiParam("维修状态")
     private Integer repairStatus;
 
-    @Column(name="WORK_CENTER_CODE")
+    @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    @Column(name="WORK_CELL_CODE")
+    @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @Column(name="MEMO")
+    @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesDismantleRecord.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.math.BigDecimal;
 
 /**
@@ -26,7 +23,10 @@ import java.math.BigDecimal;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_DISMANTLE_RECORD")
+@Table(name = "MES_DISMANTLE_RECORD", indexes = {
+        @Index(columnList = "SN"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("物料拆解记录表")
 public class MesDismantleRecord extends BaseBean {
 

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

@@ -9,10 +9,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;
 
 /**
  * @Author: Wynne.Lu
@@ -24,7 +21,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE")
+@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装规格")
 public class MesPackage extends BaseBean {
     @Column(name = "PACKAGE_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageDetail.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;
 
 /**
@@ -23,7 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_DETAIL")
+@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装规格明细")
 public class MesPackageDetail extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackageTravel.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;
 
 /**
@@ -23,7 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_TRAVEL")
+@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装履历表")
 public class MesPackageTravel extends BaseBean {
 

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

@@ -9,10 +9,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:
@@ -26,7 +23,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PLAN_ORDER")
+@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
 @Api("生产主计划")
 public class MesPlanOrder extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdBindRecord.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,10 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PROD_BIND_RECORD")
+@Table(name = "MES_PROD_BIND_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "KP_SN")
+})
 @Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean {
     @Column(name = "SERIAL_NUMBER")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSn.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.io.Serializable;
 
 /**
@@ -26,7 +23,11 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCE_SN")
+@Table(name = "MES_PRODUCE_SN", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("产品条码表")
 public class MesProduceSn extends BaseBean implements Serializable {
 
@@ -120,15 +121,15 @@ public class MesProduceSn extends BaseBean implements Serializable {
     @ApiParam("条码类型 10=正常 20=首检件")
     private Integer snType;
 
-    @Column(name = "TRAY")
+    @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
-    private String tray;
+    private String trayNo;
 
     @Transient
     @ApiParam("返回信息")
     private String resultMsg;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 
@@ -187,7 +188,7 @@ public class MesProduceSn extends BaseBean implements Serializable {
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
                 ", snType=" + snType +
-                ", tray='" + tray + '\'' +
+                ", trayNo='" + trayNo + '\'' +
                 ", resultMsg='" + resultMsg + '\'' +
                 ", operateType=" + operateType +
                 ", outWorkCenterTimeStart='" + outWorkCenterTimeStart + '\'' +

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProduceSnTravel.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,12 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCE_SN_TRAVEL")
+@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "MODIFY_DATE_TIME")
+})
 @Api("产品条码履历表")
 public class MesProduceSnTravel extends BaseBean {
     @Column(name = "SERIAL_NUMBER")
@@ -112,7 +114,15 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("客户零件号")
     private String custPartNo;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型 10=正常（默认），20=首检件")
+    private Integer snType;
+
+    @Column(name = "TRAY_NO")
+    @ApiParam("托盘号")
+    private String trayNo;
+
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.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,12 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCT_DATA")
+@Table(name = "MES_PRODUCT_DATA", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "OBJECT_CODE"),
+        @Index(columnList = "MODIFY_DATE_TIME")
+})
 @Api("生产数据")
 public class MesProductData extends BaseBean {
     @Column(name = "WORK_CENTER_CODE")
@@ -48,6 +54,10 @@ public class MesProductData extends BaseBean {
     @ApiParam("产品条码")
     private String serialNumber;
 
+    @Column(name = "PRODUCT_SN")
+    @ApiParam("产品条码")
+    private String productSn;
+
     @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckData.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 = "MES_QC_CHECK_DATA")
+@Table(name = "MES_QC_CHECK_DATA", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "SN")
+})
 @Api("质量过程检测数据")
 public class MesQcCheckData extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrder.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,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_ORDER")
+@Table(name = "MES_QUEUE_ORDER", indexes = {
+        @Index(columnList = "CUST_FLAG_NO")
+})
 @Api("生产队列主表")
 public class MesQueueOrder extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueOrderDetail.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,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_ORDER_DETAIL")
+@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
+        @Index(columnList = "ORDER_NO")
+})
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.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,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_RAW_PART_SN")
+@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")})
 @Api("原材料信息")
 public class MesRawPartSn extends BaseBean {
     @Column(name = "PART_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRepairRecord.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 = "MES_REPAIR_RECORD")
+@Table(name = "MES_REPAIR_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("维修信息记录表")
 public class MesRepairRecord extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesScrapRecord.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,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_SCRAP_RECORD")
+@Table(name = "MES_SCRAP_RECORD", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("报废信息记录表")
 public class MesScrapRecord extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWcCheckRecord.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;
 
 /**
@@ -23,7 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WC_CHECK_RECORD")
+@Table(name = "MES_WC_CHECK_RECORD", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("开线检查记录")
 public class MesWcCheckRecord extends BaseBean {
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.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;
 
 /**
@@ -23,7 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_CELL_MONITOR_LOG")
+@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("工位监控异常信息")
 public class MesWorkCellMonitorLog extends BaseBean {
 

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

@@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

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

@@ -9,10 +9,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:
@@ -26,7 +23,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER")
+@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
 @Api("生产工单")
 public class MesWorkOrder extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkOrderLog.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,10 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER_LOG")
+@Table(name = "MES_WORK_ORDER_LOG", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("生产工单日志")
 public class MesWorkOrderLog extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java

@@ -2,7 +2,6 @@ package cn.estsh.i3plus.pojo.mes.pcn.model;
 
 
 import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPackage;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.AllArgsConstructor;
@@ -67,9 +66,6 @@ public class ProdPackageModel {
     @ApiParam("包装集合")
     private List<MesPackage> packageList;
 
-    @ApiParam("工单集合")
-    private List<MesWorkOrder> workOrderList;
-
     @ApiParam("打印状态文字")
     private String printStrStatus;
 

modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/sqlpack/MesHqlPack.java

@@ -69,14 +69,12 @@ public class MesHqlPack {
     /**
      * 根据打印模板的模板代码查询模板信息
      *
-     * @param organizeCode
      * @param mesLabelTemplate
      * @return
      */
-    public static DdlPackBean getLabelTemplate(String organizeCode, MesLabelTemplate mesLabelTemplate) {
+    public static DdlPackBean getLabelTemplate( MesLabelTemplate mesLabelTemplate) {
         DdlPackBean packBean = DdlPackBean.getDdlPackBean();
         DdlPreparedPack.getStringEqualPack(mesLabelTemplate.getTemplateCode(), "templateCode", packBean);
-        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
         return packBean;
     }
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustOrder.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,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_CUST_ORDER")
+@Table(name = "MES_CUST_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
 @Api("客户信息")
 public class MesCustOrder extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefectRecord.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;
 import java.util.Date;
 
@@ -25,30 +26,33 @@ import java.util.Date;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_DEFECT_RECORD")
+@Table(name = "MES_DEFECT_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("不良信息记录表")
 public class MesDefectRecord extends BaseBean {
-    @Column(name="SERIAL_NUMBER")
+    @Column(name = "SERIAL_NUMBER")
     @ApiParam("产品条码")
     private String serialNumber;
 
-    @Column(name="PART_NO")
+    @Column(name = "PART_NO")
     @ApiParam("物料号")
     private String partNo;
 
-    @Column(name="PART_NAME")
+    @Column(name = "PART_NAME")
     @ApiParam("物料名称")
     private String partName;
 
-    @Column(name="DEFECT_CODE")
+    @Column(name = "DEFECT_CODE")
     @ApiParam("缺陷代码")
     private String defectCode;
 
-    @Column(name="DEFECT_NAME")
+    @Column(name = "DEFECT_NAME")
     @ApiParam("缺陷名称")
     private String defectName;
 
-    @Column(name="DEFECT_LOCATION")
+    @Column(name = "DEFECT_LOCATION")
     @ApiParam("缺陷位置")
     private String defectLocation;
 
@@ -56,19 +60,19 @@ public class MesDefectRecord extends BaseBean {
     @ApiParam("面位")
     private String sideLocation;
 
-    @Column(name="REPAIR_STATUS")
+    @Column(name = "REPAIR_STATUS")
     @ApiParam("维修状态")
     private Integer repairStatus;
 
-    @Column(name="WORK_CENTER_CODE")
+    @Column(name = "WORK_CENTER_CODE")
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
-    @Column(name="WORK_CELL_CODE")
+    @Column(name = "WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;
 
-    @Column(name="MEMO")
+    @Column(name = "MEMO")
     @ApiParam("备注")
     private String memo;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDismantleRecord.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,10 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_DISMANTLE_RECORD")
+@Table(name = "MES_DISMANTLE_RECORD", indexes = {
+        @Index(columnList = "SN"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("物料拆解记录表")
 public class MesDismantleRecord extends BaseBean {
 

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

@@ -9,10 +9,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;
 
 /**
@@ -27,7 +24,9 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_EQU_TASK")
+@Table(name = "MES_EQU_TASK", indexes = {
+        @Index(columnList = "TASK_NO")
+})
 @Api("设备作业任务")
 public class MesEquTask extends BaseBean {
 
@@ -84,7 +83,7 @@ public class MesEquTask extends BaseBean {
     private String pageType;
 
     @Transient
-    @ApiParam(value ="明细列表")
+    @ApiParam(value = "明细列表")
     private List<MesEquTaskDetail> mesEquTaskDetailList;
 
 }

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

@@ -9,10 +9,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;
 
 /**
@@ -27,7 +24,9 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_EQU_TASK_DETAIL")
+@Table(name = "MES_EQU_TASK_DETAIL", indexes = {
+        @Index(columnList = "EQUIPMENT_CODE")
+})
 @Api("设备作业任务明细")
 public class MesEquTaskDetail extends BaseBean {
 

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

@@ -9,10 +9,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 :设备维修作业记录
@@ -26,7 +23,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_EQU_TASK_REPAIR_RECORD")
+@Table(name = "MES_EQU_TASK_REPAIR_RECORD", indexes = {
+        @Index(columnList = "EQUIPMENT_CODE")
+})
 @Api("设备维修作业记录")
 public class MesEquTaskRepairRecord extends BaseBean {
 

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

@@ -9,10 +9,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 :设备点检保养作业记录
@@ -26,7 +23,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_EQU_TASK_STANDARD_RECORD")
+@Table(name = "MES_EQU_TASK_STANDARD_RECORD", indexes = {
+        @Index(columnList = "EQUIPMENT_CODE")
+})
 @Api("设备点检保养作业记录")
 public class MesEquTaskStandardRecord extends BaseBean {
 

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

@@ -9,10 +9,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;
 
 /**
  * @Author: Wynne.Lu
@@ -24,7 +21,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE")
+@Table(name = "MES_PACKAGE", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装规格")
 public class MesPackage extends BaseBean {
     @Column(name = "PACKAGE_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageDetail.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;
 
 /**
@@ -23,7 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_DETAIL")
+@Table(name = "MES_PACKAGE_DETAIL", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装规格明细")
 public class MesPackageDetail extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackageTravel.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;
 
 /**
@@ -23,7 +24,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PACKAGE_TRAVEL")
+@Table(name = "MES_PACKAGE_TRAVEL", indexes = {@Index(columnList = "PACKAGE_NO")})
 @Api("包装履历表")
 public class MesPackageTravel extends BaseBean {
 

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

@@ -9,10 +9,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:
@@ -26,7 +23,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PLAN_ORDER")
+@Table(name = "MES_PLAN_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
 @Api("生产主计划")
 public class MesPlanOrder extends BaseBean {
     @Column(name = "ORDER_NO")

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

@@ -12,6 +12,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
@@ -26,7 +27,10 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PROD_BIND_RECORD")
+@Table(name = "MES_PROD_BIND_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "KP_SN")
+})
 @Api("产品绑定记录表")
 public class MesProdBindRecord extends BaseBean {
     @Column(name = "SERIAL_NUMBER")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSn.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 = "MES_PRODUCE_SN")
+@Table(name = "MES_PRODUCE_SN", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("产品条码表")
 public class MesProduceSn extends BaseBean {
 
@@ -117,11 +118,11 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("条码类型")
     private Integer snType;
 
-    @Column(name = "TRAY")
+    @Column(name = "TRAY_NO")
     @ApiParam("托盘号")
-    private String tray;
+    private String trayNo;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 
@@ -184,7 +185,7 @@ public class MesProduceSn extends BaseBean {
                 ", custSn='" + custSn + '\'' +
                 ", custPartNo='" + custPartNo + '\'' +
                 ", snType=" + snType +
-                ", tray='" + tray + '\'' +
+                ", trayNo='" + trayNo + '\'' +
                 ", operateType=" + operateType +
                 ", resultMsg='" + resultMsg + '\'' +
                 '}';

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.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,12 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCE_SN_TRAVEL")
+@Table(name = "MES_PRODUCE_SN_TRAVEL", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "MODIFY_DATE_TIME")
+})
 @Api("产品条码履历表")
 public class MesProduceSnTravel extends BaseBean {
     @Column(name = "SERIAL_NUMBER")
@@ -112,7 +114,15 @@ public class MesProduceSnTravel extends BaseBean {
     @ApiParam("客户零件号")
     private String custPartNo;
 
-    @Column(name="OPERATE_TYPE")
+    @Column(name = "SN_TYPE")
+    @ApiParam("条码类型 10=正常（默认），20=首检件")
+    private Integer snType;
+
+    @Column(name = "TRAY_NO")
+    @ApiParam("托盘号")
+    private String trayNo;
+
+    @Column(name = "OPERATE_TYPE")
     @ApiParam("操作类型")
     private Integer operateType;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.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,12 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_PRODUCT_DATA")
+@Table(name = "MES_PRODUCT_DATA", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "PRODUCT_SN"),
+        @Index(columnList = "OBJECT_CODE"),
+        @Index(columnList = "MODIFY_DATE_TIME")
+})
 @Api("生产数据")
 public class MesProductData extends BaseBean {
     @Column(name = "WORK_CENTER_CODE")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQcCheckData.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 = "MES_QC_CHECK_DATA")
+@Table(name = "MES_QC_CHECK_DATA", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME"),
+        @Index(columnList = "SN")
+})
 @Api("质量过程检测数据")
 public class MesQcCheckData extends BaseBean {
 

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

@@ -9,10 +9,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.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -29,7 +26,9 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_ORDER")
+@Table(name = "MES_QUEUE_ORDER", indexes = {
+        @Index(columnList = "CUST_FLAG_NO")
+})
 @Api("生产队列主表")
 public class MesQueueOrder extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.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,9 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_ORDER_DETAIL")
+@Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
+        @Index(columnList = "ORDER_NO")
+})
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRawPartSn.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,7 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_RAW_PART_SN")
+@Table(name = "MES_RAW_PART_SN", indexes = {@Index(columnList = "RAW_SN")})
 @Api("原材料信息")
 public class MesRawPartSn extends BaseBean {
     @Column(name = "PART_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRepairRecord.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,10 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_REPAIR_RECORD")
+@Table(name = "MES_REPAIR_RECORD", indexes = {
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("维修信息记录表")
 public class MesRepairRecord extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesScrapRecord.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,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_SCRAP_RECORD")
+@Table(name = "MES_SCRAP_RECORD", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("报废信息记录表")
 public class MesScrapRecord extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWcCheckRecord.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;
 
 /**
@@ -23,7 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WC_CHECK_RECORD")
+@Table(name = "MES_WC_CHECK_RECORD", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("开线检查记录")
 public class MesWcCheckRecord extends BaseBean {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.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;
 
 /**
@@ -23,7 +24,9 @@ import javax.persistence.Table;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_CELL_MONITOR_LOG")
+@Table(name = "MES_WORK_CELL_MONITOR_LOG", indexes = {
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("工位监控异常信息")
 public class MesWorkCellMonitorLog extends BaseBean {
 

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

@@ -31,6 +31,10 @@ public class MesWorkCellParamCfg extends BaseBean {
     @ApiParam("工作单元代码")
     private String workCellCode;
 
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
     @Column(name = "PARAM_CODE")
     @ApiParam("参数代码")
     private String paramCode;

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

@@ -9,10 +9,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:
@@ -26,7 +23,7 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER")
+@Table(name = "MES_WORK_ORDER", indexes = {@Index(columnList = "ORDER_NO")})
 @Api("生产工单")
 public class MesWorkOrder extends BaseBean {
     @Column(name = "ORDER_NO")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.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,10 @@ import javax.persistence.Transient;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_ORDER_LOG")
+@Table(name = "MES_WORK_ORDER_LOG", indexes = {
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "CREATE_DATE_TIME")
+})
 @Api("生产工单日志")
 public class MesWorkOrderLog extends BaseBean {
     @Column(name = "ORDER_NO")

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

@@ -0,0 +1,62 @@
+package cn.estsh.i3plus.pojo.wms.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.ColumnDefault;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description : MES_生产计划主明细表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-09 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PP_DETAILS")
+@Api("MES_生产计划明细表")
+public class MesPpDetails extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592727L;
+
+    @Column(name="WROKORDER_NO")
+    @ApiParam("工单号")
+    private String woekorderNo;
+
+    @Column(name="ITEM")
+    @ApiParam("行号")
+    private Integer item;
+
+    @Column(name="PART_NO")
+    @ApiParam("零件号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("零件名称")
+    private String partNameRdd;
+
+    @Column(name = "QTY", columnDefinition = "decimal(18,8)")
+    @ColumnDefault("0")
+    @ApiParam(value = "工单数量", example = "0")
+    public Double qty;
+
+    public Integer getItem() {
+        return item == null ? 0 : this.item.intValue();
+    }
+
+    public Double getQty() {
+        return qty == null ? 0D : this.qty.doubleValue();
+    }
+}

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

@@ -0,0 +1,66 @@
+package cn.estsh.i3plus.pojo.wms.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;
+
+/**
+ * @Description : MES_生产计划主表
+ * @Reference :
+ * @Author : jessica.chen
+ * @CreateDate : 2019-11-09 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PP_MASTER")
+@Api("MES_生产计划主表")
+public class MesPpMaster extends BaseBean{
+
+    private static final long serialVersionUID = 9214639813072592726L;
+
+    @Column(name="WROKORDER_NO")
+    @ApiParam("工单号")
+    private String woekorderNo;
+
+    @Column(name="PDLINE_NO")
+    @ApiParam("产线代码")
+    private String pdlineNo;
+
+    @Column(name="PLAN_PRODUCT_TIME")
+    @ApiParam("生产日期")
+    private String planProductTime;
+
+    @Column(name="SHIFT_NO")
+    @ApiParam("班次代码")
+    private String shitNo;
+
+    @Column(name="START_PRODUCT_TIME")
+    @ApiParam("开始生产时间")
+    private String startProductTime;
+
+    @Column(name="END_PRODUCT_TIME")
+    @ApiParam("结束生产时间")
+    private String endProductTime;
+
+    @Column(name="ORDER_STATUS")
+    @ApiParam(value = "单据状态", example = "0")
+    private Integer orderStatus = 0;
+
+    public Integer getOrderStatus() {
+        return orderStatus == null ? 0 : this.orderStatus.intValue();
+    }
+
+
+}

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

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+* @Description : 生产计划模板
+* @Reference :
+* @author: jessica.chen
+* @date: 2019/12/10 17:10
+* @Modify:
+*/
+
+@Data
+@Api(value="生产计划模板",description = "生产计划模板")
+public class MesPpTemplate extends BaseBean {
+
+    private static final long serialVersionUID = 2167743108452607913L;
+
+    @ApiParam(value = "工单号")
+    @AnnoOutputColumn
+    private String woekorderNo;
+
+    @ApiParam(value = "产线代码")
+    @AnnoOutputColumn
+    private String pdlineNo;
+
+    @ApiParam(value = "生产日期")
+    @AnnoOutputColumn
+    private String planProductTime;
+
+    @ApiParam(value = "班次代码")
+    @AnnoOutputColumn
+    private String shitNo;
+
+    @ApiParam(value = "开始生产时间")
+    @AnnoOutputColumn
+    private String startProductTime;
+
+    @ApiParam(value = "结束生产时间")
+    @AnnoOutputColumn
+    private String endProductTime;
+
+    @ApiParam(value = "零件号")
+    @AnnoOutputColumn
+    private String partNo;
+
+    @ApiParam(value = "零件描述")
+    @AnnoOutputColumn
+    private String partNameRdd;
+
+    @ApiParam(value = "工单数量")
+    @AnnoOutputColumn
+    private Double qty;
+}

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

@@ -114,8 +114,21 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "加密编码")
     private String encryptionNo;
 
+    @Column(name = "LAST_CS_TIME")
+    @ApiParam(value = "末次盘点时间")
+    private String lastCsTime;
+
+    @Transient
+    @ApiParam(value = "末次盘点开始时间")
+    private String lastCsTimeStart ;
+
+    @Transient
+    @ApiParam(value = "末次盘点结束时间")
+    private String lastCsTimeEnd;
+
     public WmsLocate() {
     }
+
     public WmsLocate(String locateNo,Integer destBoxQty) {
         this.locateNo = locateNo;
         this.destBoxQty = destBoxQty;

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

@@ -30,7 +30,7 @@ import javax.persistence.*;
         @Index(columnList = "ORGANIZE_CODE"),
         @Index(columnList = "PART_NO")
 })
-@Api("库存移动单主表信息")
+@Api("库存移动单处理成功后的记录")
 public class WmsMoveToERP extends BaseBean {
 
     private static final long serialVersionUID = -6223527594941733060L;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java

@@ -56,6 +56,12 @@ public class WmsInterfaceDataMapper extends BaseBean {
      */
     @Column(name = "SRC_WHERE", length = 255)
     public String srcWhere;
+
+    /**
+     * 来源表的分组条件，按分组发送，多个列名用半角逗号分隔
+     */
+    @Column(name = "SRC_GROUP_COLUMNS", length = 255)
+    public String srcGroupColumns;
     /**
      * 数据同步到业务库后需要更新的接口库标记字段，多个字段用半角逗号分隔
      * 例如：SYNFLG=Y,SYNDATE={#XX}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsCarDto.java

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Transient;
+import java.io.Serializable;
+
+@Data
+public class WmsCarDto implements Serializable {
+
+    @Column(name="CAR_NO")
+    @ApiParam(value ="车牌号")
+    private String carNo;
+
+    @Column(name="CAR_DESC")
+    @ApiParam(value ="车辆描述")
+    private String carDesc;
+
+    @Column(name="MAX_CAPACITY")
+    @ApiParam(value ="载重量(KG)")
+    private String maxCapacity;
+
+    @Column(name="DRIVER_NO")
+    @ApiParam(value ="默认驾驶员")
+    private String driverNo;
+
+    @Column(name="PHONE")
+    @ApiParam(value ="车主电话")
+    private String phone;
+
+    @Column(name="VENDOR_NO")
+    @ApiParam(value ="所属供应商")
+    private String vendorNo;
+
+    @Transient
+    @ApiParam("司机名称")
+    private String driverNameRdd;
+
+    @Transient
+    @ApiParam(value = "供应商名称")
+    private String vendorNameRdd;
+
+    @ApiParam(value = "是否删除，默认否")
+    private Integer isDeleted = 2;
+
+    @ApiParam("是否有效，默认是")
+    private Integer isValid = 1;
+
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsDriverDto.java

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.wms.dto;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import java.io.Serializable;
+
+@Data
+public class WmsTmsDriverDto implements Serializable {
+
+    @Column(name="DRIVER_NO")
+    @ApiParam(value ="驾驶员编号")
+    private String driverNo;
+
+    @Column(name="DRIVER_NAME")
+    @ApiParam(value ="驾驶员姓名")
+    private String driverName;
+
+    @Column(name="SEX")
+    @ApiParam(value ="驾驶员性别")
+    private Integer sex;
+
+    @Column(name="AGE")
+    @ApiParam(value ="驾驶员年龄")
+    private String age;
+
+    @Column(name="ID_NO")
+    @ApiParam(value ="驾驶员身份证号")
+    private String idNo;
+
+    @Column(name="ADRESS")
+    @ApiParam(value ="驾驶员籍贯")
+    private String adress;
+
+    @Column(name="PHONE")
+    @ApiParam(value ="车牌号")
+    private String phone;
+
+    @Column(name="LOGIN_NO")
+    @ApiParam(value =" 登录账号")
+    private String loginNo;
+
+    @ApiParam("是否删除，默认否")
+    private Integer isDeleted = 2;
+
+    @ApiParam("是否有效，默认是")
+    private Integer isValid = 1;
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpDetailsRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.MesPpDetails;
+import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :MES_生产计划明细表
+ * @Reference :
+ * @Author : jessica,chen
+ * @CreateDate : 2019-11-27 14:49
+ * @Modify:
+ **/
+@Repository
+public interface MesPpDetailsRepository extends BaseRepository<MesPpDetails, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/repository/MesPpMasterRepository.java

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.MesPpMaster;
+import cn.estsh.i3plus.pojo.wms.bean.WmsFile;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :MES_生产计划主表
+ * @Reference :
+ * @Author : jessica,chen
+ * @CreateDate : 2019-11-27 14:49
+ * @Modify:
+ **/
+@Repository
+public interface MesPpMasterRepository extends BaseRepository<MesPpMaster, Long> {
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -44,14 +44,14 @@ public class WmsHqlPack {
             DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
         }
 
-        // 封装有效状态、删除状态、创建人和创建时间
-        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
-        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
-        DdlPreparedPack.getStringLikerPack(bean.getCreateUser(), "createUser", hqlStr);
+        DdlPreparedPack.getStringEqualPack(bean.getCreateUser(), "createUser", hqlStr);
         if (StringUtils.isNotBlank(bean.getCreateDateTimeStart()) && StringUtils.isNotBlank(bean.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(bean.getCreateDateTimeStart(), bean.getCreateDateTimeEnd(), "createDatetime", hqlStr, true);
         }
+        // 封装有效状态、删除状态、创建人和创建时间
+        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
 
         return hqlStr;
     }
@@ -2574,4 +2574,41 @@ public class WmsHqlPack {
         return result;
     }
 
+    /**
+     * 生产计划主表信息分页查询条件
+     *
+     * @param mesPpMaster
+     * @return
+     */
+    public static DdlPackBean packHqlMesPpMaster(MesPpMaster mesPpMaster) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(mesPpMaster.getWoekorderNo(), "woekorderNo", result);
+        DdlPreparedPack.getNumEqualPack(mesPpMaster.getOrderStatus(), "orderStatus", result);
+        DdlPreparedPack.getStringEqualPack(mesPpMaster.getPdlineNo(), "pdlineNo", result);
+        DdlPreparedPack.getStringBiggerPack(mesPpMaster.getStartProductTime(), "startProductTime", result);
+        DdlPreparedPack.getStringSmallerPack(mesPpMaster.getEndProductTime(), "endProductTime", result);
+
+        getStringBuilderPack(mesPpMaster, result);
+
+        return result;
+    }
+
+    /**
+     * 生产计划明细表信息分页查询条件
+     *
+     * @param mesPpDetails
+     * @return
+     */
+    public static DdlPackBean packHqlMesPpDetails(MesPpDetails mesPpDetails) {
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringLikerPack(mesPpDetails.getPartNo(), "partNo", result);
+        DdlPreparedPack.getStringEqualPack(mesPpDetails.getWoekorderNo(), "woekorderNo", result);
+
+        getStringBuilderPack(mesPpDetails, result);
+
+        return result;
+    }
+
 }