【合并冲突】

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

@@ -231,7 +231,8 @@ public class BlockSoftSwitchEnumUtil {
         CLOUD(5,"Cloud调用"),
         REST(6,"REST调用"),
         WEB_SERVICE(7,"WebService"),
-        SOCKET(8,"socket");
+        SOCKET(8,"socket"),
+        RETRY(9,"重试");
 
         private int value;
         private String description;

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

@@ -245,12 +245,12 @@ public class CommonEnumUtil {
             return tmp;
         }
 
-        public static int descOf(boolean desc) {
-            return desc ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
+        public static int boolOfOfVal(boolean boolVal) {
+            return boolVal ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
         }
 
-        public static int descOf(int desc) {
-            return desc == 0 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
+        public static int intOfVal(int boolIntVal) {
+            return boolIntVal == 1 ? TRUE_OR_FALSE.TRUE.getValue() : TRUE_OR_FALSE.FALSE.getValue();
         }
 
         public static TRUE_OR_FALSE valueOfEnum(int value){

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

@@ -7973,6 +7973,46 @@ public class MesEnumUtil {
     }
 
     /**
+     * 看板-安灯监控状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_QUEUE_STATUS {
+        CALL(10, "呼叫"),
+        RESPONSE(20, "响应"),
+        SOLVE(30, "解决");
+
+        private int value;
+        private String description;
+
+        ANDON_QUEUE_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getValueStr() {
+            return value + "";
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(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)

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

@@ -7479,7 +7479,8 @@ public class WmsEnumUtil {
         PICK(40, "REPAIR", "挑选"),
         REPAIR(50, "REPAIR", "返修"),
         BIND(60, "BIND", "绑定"),
-        OUTSTOCK(70, "OUTSTOCK", "出库");
+        OUTSTOCK(70, "OUTSTOCK", "出库"),
+        RE_PACKING(80, "RE_PACKING", "重绑");
         private int value;
         private String code;
         private String description;
@@ -9243,4 +9244,53 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
+    /**
+     * PLC业务类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_BUSI_TYPE {
+        DR(10, "DR", "DR"),
+        DF(20, "DF", "DF"),
+        IP(30, "IP", "IP");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PLC_BUSI_TYPE(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 String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }
+
+
+

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/jpa/daoimpl/BaseRepositoryImpl.java

@@ -580,7 +580,7 @@ public class BaseRepositoryImpl<T, ID extends Serializable> extends SimpleJpaRep
     @Override
     public int listCount() {
         try{
-            Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model",Long.class)
+            Long count = entityManager.createQuery("select count(model) from " + persistentClass.getName() + " as model", Long.class)
                     .getSingleResult();
             return count == null ? 0 : count.intValue();
         }catch(NoResultException e){

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -237,7 +237,7 @@ public class DdlPreparedPack {
      */
     public static void getStringRightLikerPack(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
-            packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, val + "%");
+            packBean.addColumnQuery("rl_"+columnName, " and model." + columnName + " like :m_rl_" + columnName, val + "%");
         }
     }
 
@@ -250,7 +250,7 @@ public class DdlPreparedPack {
      */
     public static void getStringLeftLikerPack(String val, String columnName, DdlPackBean packBean) {
         if (val != null && val.trim().length() > 0) {
-            packBean.addColumnQuery(columnName, " and model." + columnName + " like :m_" + columnName, "%" + val);
+            packBean.addColumnQuery("ll_"+columnName, " and model." + columnName + " like :m_ll_" + columnName, "%" + val);
         }
     }
 

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

@@ -1,11 +1,12 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
@@ -28,6 +29,8 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "IF_PRODUCT_OFF_LINE")
+@NoArgsConstructor
+@AllArgsConstructor
 @Api("生产报工表")
 public class IfProductOffLine extends BaseBean implements Serializable {
 
@@ -153,4 +156,12 @@ public class IfProductOffLine extends BaseBean implements Serializable {
     @Column(name = "BASE_MODULE")
     @ApiParam("BaseModule零件号")
     private String baseModule;
+
+    public IfProductOffLine(String partNo, String packageNo, Double qty, String workCenterCode, Integer qcStatus) {
+        this.partNo = partNo;
+        this.packageNo = packageNo;
+        this.qty = qty;
+        this.workCenterCode = workCenterCode;
+        this.qcStatus = qcStatus;
+    }
 }

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

@@ -0,0 +1,53 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Description : MES_看板工位信息
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_LINE_COORDS_MATRIX")
+@Api("MES_看板产线坐标")
+public class MesBoardLineCoordsMatrix extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -7823702941907604215L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @Column(name = "X_AXIS")
+    @ApiParam("X坐标")
+    private String xAxis;
+
+    @Column(name = "Y_AXIS")
+    @ApiParam("Y坐标")
+    private String yAxis;
+
+}

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

@@ -0,0 +1,73 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Description : MES_看板工位信息
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_LINE_MATRIX")
+@Api("MES_看板产线矩阵")
+public class MesBoardLineMatrix extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 4414374274261870347L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @Column(name = "PICTURE_URL")
+    @ApiParam("产线图片路径")
+    private String pictureUrl;
+
+    @Column(name = "USER_FIRST")
+    @ApiParam("用户编号1")
+    private String userFirst;
+
+    @Column(name = "USER_SECOND")
+    @ApiParam("用户编号2")
+    private String userSecond;
+
+    @Column(name = "USER_THIRD")
+    @ApiParam("用户编号3")
+    private String userThird;
+
+    @Column(name = "USER_FORTH")
+    @ApiParam("用户编号4")
+    private String userForth;
+
+    @Column(name = "USER_FIFTH")
+    @ApiParam("用户编号5")
+    private String userFifth;
+
+    @Column(name = "USER_SIXTH")
+    @ApiParam("用户编号6")
+    private String userSixth;
+
+}

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

@@ -0,0 +1,61 @@
+package cn.estsh.i3plus.pojo.mes.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;
+
+/**
+ * @Description : MES_看板工位信息
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_BOARD_LINE_STAFF_MATRIX")
+@Api("MES_看板产线员工能力矩阵")
+public class MesBoardLineStaffMatrix extends BaseBean implements Serializable {
+    private static final long serialVersionUID = 1889056360071546259L;
+
+    @Column(name = "BOARD_CODE")
+    @ApiParam("看板代码")
+    private String boardCode;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("产线代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工位代码")
+    private String workCellCode;
+
+    @Column(name = "USER_CODE")
+    @ApiParam("员工编号")
+    private String userCode;
+
+    @Column(name = "X_AXIS")
+    @ApiParam("X坐标")
+    private Double xAxis;
+
+    @Column(name = "Y_AXIS")
+    @ApiParam("Y坐标")
+    private Double yAxis;
+
+}

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

@@ -37,4 +37,8 @@ public class MesBoardPicture extends BaseBean implements Serializable {
     @Column(name = "PICTURE_URL")
     @ApiParam("图片路径")
     private String pictureUrl;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
 }

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

@@ -33,12 +33,12 @@ public class MesBoardSwitchCfg extends BaseBean implements Serializable {
     @ApiParam("看板代码")
     private String boardCode;
 
-    @Column(name = "SWITCH_INTERRVAL")
+    @Column(name = "SWITCH_INTERVAL")
     @ApiParam("屏切换频次")
-    private Integer switchInterrval;
+    private Integer switchInterval;
 
-    @Column(name = "LINE_SWITCH_INTERRVAL")
+    @Column(name = "LINE_SWITCH_INTERVAL")
     @ApiParam("产线切换频次")
-    private Integer lineSwitchInterrval;
+    private Integer lineSwitchInterval;
 
 }

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

@@ -0,0 +1,43 @@
+package cn.estsh.i3plus.pojo.mes.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 Wynne.Lu
+ * @date 2020/10/27 13:29
+ * @desc
+ */
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_LINE_FAULT_RECORD")
+@Api("产线故障记录表")
+public class MesLineFaultRecord extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 6108659377329720059L;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name = "EQU_NAME")
+    @ApiParam("设备名称")
+    private String equName;
+
+    @Column(name = "FAULT_TIME")
+    @ApiParam("故障时长（分）")
+    private Double faultTime;
+}

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

@@ -25,7 +25,9 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_ORDER", indexes = {
-        @Index(columnList = "CUST_FLAG_NO")
+        @Index(columnList = "CUST_FLAG_NO"),
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "ORDER_NO")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO"})
 })

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderBom.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.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -27,7 +24,11 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_QUEUE_ORDER_BOM")
+@Table(name = "MES_QUEUE_ORDER_BOM", indexes = {
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "PART_NO")
+})
 @Api("MES_生产队列散件清单")
 public class MesQueueOrderBom extends BaseBean  implements Serializable {
 

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

@@ -25,7 +25,10 @@ import java.io.Serializable;
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
 @Table(name = "MES_QUEUE_ORDER_DETAIL", indexes = {
-        @Index(columnList = "ORDER_NO")
+        @Index(columnList = "ORDER_NO"),
+        @Index(columnList = "SERIAL_NUMBER"),
+        @Index(columnList = "QUEUE_GROUP_NO"),
+        @Index(columnList = "PRODUCE_CATEGORY_CODE")
 }, uniqueConstraints = {
         @UniqueConstraint(columnNames = {"ORGANIZE_CODE", "ORDER_NO", "PART_NO", "PRODUCE_CATEGORY_CODE"})
 })

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

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.mes.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 javax.persistence.Transient;
+import java.io.Serializable;
+
+/**
+ * @Description : 员工信息
+ * @Reference :
+ * @Author : amy
+ * @CreateDate : 2018-11-07 14:21
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_STAFF")
+@Api("员工信息")
+public class MesStaff extends BaseBean implements Serializable {
+    private static final long serialVersionUID = -8330599945613548761L;
+
+    @Column(name = "USER_CODE")
+    @ApiParam("员工编号")
+    private String userCode;
+
+    @Column(name = "USER_NAME")
+    @ApiParam("姓名")
+    private String userName;
+
+    @Column(name = "PICTURE_URL")
+    @ApiParam("照片路径")
+    private String pictureUrl;
+
+    @Column(name = "SKILL_LEVEL")
+    @ApiParam("技能等级")
+    private Integer skillLevel;
+
+    @Transient
+    private Double xAxis;
+
+    @Transient
+    private Double yAxis;
+
+    @Transient
+    private String workCellCode;
+}

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

@@ -98,4 +98,8 @@ public class MesWorkCell extends BaseBean implements Serializable {
     @ApiParam("工位类型名称")
     private String workCellTypeName;
 
+    @Transient
+    @ApiParam("安灯呼叫状态")
+    private Integer andonQueueStatus;
+
 }

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

@@ -11,10 +11,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.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
 
@@ -30,7 +27,13 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_CELL_POINT")
+@Table(name = "MES_WORK_CELL_POINT", indexes = {
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE"),
+        @Index(columnList = "QUEUE_SEQ"),
+        @Index(columnList = "QUEUE_DETAIL_SEQ")
+})
 @Api("工站队列")
 public class MesWorkCellPoint extends BaseBean implements Serializable {
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.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.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
+import javax.persistence.*;
 import java.io.Serializable;
 
 /**
@@ -27,7 +24,13 @@ import java.io.Serializable;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-@Table(name = "MES_WORK_CELL_POINT_GROUP")
+@Table(name = "MES_WORK_CELL_POINT_GROUP", indexes = {
+        @Index(columnList = "ORGANIZE_CODE"),
+        @Index(columnList = "WORK_CENTER_CODE"),
+        @Index(columnList = "WORK_CELL_CODE"),
+        @Index(columnList = "QUEUE_GROUP_NO"),
+        @Index(columnList = "ORDER_NO")
+})
 @Api("工站分组队列")
 public class MesWorkCellPointGroup extends BaseBean implements Serializable {
 

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

@@ -13,7 +13,6 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.*;
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description:
@@ -387,6 +386,11 @@ public class MesWorkOrder extends BaseBean implements Serializable {
     @ApiParam("已报工数量")
     private Integer productOffLineQty;
 
+    @Transient
+    @ApiParam("生产节拍")
+    private Integer takt;
+
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
@@ -419,10 +423,11 @@ public class MesWorkOrder extends BaseBean implements Serializable {
         return this.approvalStatus == null ? 0 : this.approvalStatus;
     }
 
-    public MesWorkOrder(){}
+    public MesWorkOrder() {
+    }
 
-    public MesWorkOrder(String orderNo,String startTime,String workCenterCode,Double qty,
-                        String partNo,String partNameRdd,String itemPartNo,Double itemQty){
+    public MesWorkOrder(String orderNo, String startTime, String workCenterCode, Double qty,
+                        String partNo, String partNameRdd, String itemPartNo, Double itemQty) {
         this.orderNo = orderNo;
         this.startTime = startTime;
         this.workCenterCode = workCenterCode;

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

@@ -18,4 +18,31 @@ public class MgnBoardAssembleCompRateModel {
     @ApiParam("合格率偏差值")
     private String fpyDeviationValue;
 
+    @ApiParam("日期")
+    private String date;
+
+    @ApiParam("目标OEE")
+    private String planOee;
+
+    @ApiParam("实际OEE")
+    private String finaOee;
+
+    @ApiParam("缺陷名称")
+    private String defectName;
+
+    @ApiParam("缺陷占比")
+    private String defectProportion;
+
+    @ApiParam("一次目标良品值")
+    private Double planFirstPassYield;
+
+    @ApiParam("最终目标良品值")
+    private Double planPassYield;
+
+    @ApiParam("一次良品率")
+    private String firstQualifiedRate;
+
+    @ApiParam("最终良品率")
+    private String finalQualifiedRate;
+
 }

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

@@ -20,6 +20,21 @@ public class MgnBoardListModel {
     @ApiParam("当班实际产量")
     private Double shiftActualYield;
 
+    @ApiParam("当前时间分钟")
+    private String currentMinTime;
+
+    /**
+     * 开班时间到当前时间按分钟累计计划数量
+     */
+    @ApiParam("每分钟计划产量")
+    private Double minPlanYield;
+
+    /**
+     * 开班时间到当前时间按分钟累计实际数量
+     */
+    @ApiParam("每分钟实际产量")
+    private Double minActualYield;
+
     @ApiParam("计划完成率")
     private String planCompleteRate;
 

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

@@ -111,4 +111,12 @@ public class QueueJitActualModel {
         this.createDatetime = createDatetime;
     }
 
+    public QueueJitActualModel(Long id, String vinCode, String jisActualNo, String produceCtgyCode, String custPlantCode, String createDatetime) {
+        this.id = id;
+        this.vinCode = vinCode;
+        this.jisActualNo = jisActualNo;
+        this.produceCtgyCode = produceCtgyCode;
+        this.custPlantCode = custPlantCode;
+        this.createDatetime = createDatetime;
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardModel.java

@@ -0,0 +1,41 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/10/28 11:27 AM
+ * @Modify:
+ */
+@Data
+public class BjBoardModel implements Serializable {
+
+    @ApiParam("jsa数量")
+    private Integer jsaQty;
+    @ApiParam("完成数量")
+    private Integer completeQty;
+    @ApiParam("总数量")
+    private Integer totalQty;
+    @ApiParam("预警数量")
+    private Integer warnQty;
+    @ApiParam("预警率")
+    private Integer warnRate;
+    @ApiParam("目标合格率")
+    private Integer targetRate = 0;
+    @ApiParam("一次合格率")
+    private Integer onceQualityRate = 0;
+
+    @ApiParam("x坐标内容")
+    private String xAxis;
+
+    @ApiParam("x坐标内容")
+    private List<String> xAxisList;
+
+    @ApiParam("显示数据")
+    private List<BjBoardSeriesModel> seriesModels;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/BjBoardSeriesModel.java

@@ -0,0 +1,18 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author: jokelin
+ * @Date: 2020/10/28 2:56 PM
+ * @Modify:
+ */
+@Data
+public class BjBoardSeriesModel {
+    @ApiParam("名称")
+    private String name;
+    @ApiParam("显示数量")
+    private Integer qty;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/CodeRule.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Document.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Head.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/JisaJphReportModel.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import lombok.Data;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Message.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import com.thoughtworks.xstream.annotations.XStreamImplicit;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjJitPlanModel.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/MgnBjRecipePartsModel.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import lombok.Data;
 

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/OptionCode.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Part.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.ApiParam;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Parts.java

@@ -1,4 +1,4 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import lombok.Data;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/bj/Pn.java

@@ -1,11 +1,10 @@
-package cn.estsh.i3plus.pojo.mes.model.mgnbj;
+package cn.estsh.i3plus.pojo.mes.model.mgn.bj;
 
 import com.thoughtworks.xstream.annotations.XStreamAlias;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.List;
 
 /**

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/AndonModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/28 17:30
+ * @desc
+ */
+@Data
+public class AndonModel {
+
+    private String workCenterCode;
+
+    private Double xAxis;
+
+    private Double yAxis;
+
+    private String expInfo;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/DefectModel.java

@@ -0,0 +1,22 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
+
+import lombok.Data;
+
+import java.util.Map;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/28 13:47
+ * @desc
+ */
+@Data
+public class DefectModel {
+
+    private String workCenterCode;
+
+    private Map<String, Double> percents;
+
+    private Integer total;
+
+    private String queryBeginTime;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/GoodRateModel.java

@@ -0,0 +1,26 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/28 20:50
+ * @desc
+ */
+@Data
+public class GoodRateModel {
+
+    private String workCenterCode;
+
+    private Double goodRate;
+
+    private Integer total;
+
+    private Integer goodTotal;
+
+    private String color;
+
+    private Double passPercentMax;
+
+    private Double passPercentMin;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/OeeModel.java

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/28 13:47
+ * @desc
+ */
+@Data
+public class OeeModel {
+
+    private String workCenterCode;
+
+    private Integer takt;
+
+    private Integer standardTakt;
+
+    private String color;
+
+    private Double threshold = 0.03;
+
+    private Double realProductivity;
+
+    private Double oeePercent;
+
+    private Double realWorkTime;
+
+    private String shiftBeginTime;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/ProductivityModel.java

@@ -0,0 +1,20 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
+
+import lombok.Data;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/28 14:10
+ * @desc
+ */
+@Data
+public class ProductivityModel {
+
+    private String time;
+
+    private Integer planProductivity;
+
+    private Integer realProductivity;
+
+    private boolean isCurrentInfo;
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/mgn/tj/StaffMatrixModel.java

@@ -0,0 +1,24 @@
+package cn.estsh.i3plus.pojo.mes.model.mgn.tj;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesStaff;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author Wynne.Lu
+ * @date 2020/10/28 21:44
+ * @desc
+ */
+@Data
+public class StaffMatrixModel {
+
+    private List<String> workCenterCodes;
+
+    private String currentWorkCenterCode;
+
+    private String workCenterPictureUrl;
+
+    private List<MesStaff> staffs;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineCoordsMatrixRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineCoordsMatrix;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesBoardLineCoordsMatrixRepository extends BaseRepository<MesBoardLineCoordsMatrix, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineMatrixRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineMatrix;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesBoardLineMatrixRepository extends BaseRepository<MesBoardLineMatrix, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesBoardLineStaffMatrixRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesBoardLineStaffMatrix;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-10-11
+ * @Modify:
+ **/
+@Repository
+public interface MesBoardLineStaffMatrixRepository extends BaseRepository<MesBoardLineStaffMatrix, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesLineFaultRecordRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesLineFaultRecord;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : wynne.lu
+ * @CreateDate : 2019-07-30
+ * @Modify:
+ **/
+@Repository
+public interface MesLineFaultRecordRepository extends BaseRepository<MesLineFaultRecord, Long> {
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesStaffRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesStaff;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesStaffRepository extends BaseRepository<MesStaff, Long> {
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitClientModel.java

@@ -39,6 +39,17 @@ public class SuitClientModel implements Serializable {
     private Integer actionId;
 
     /**
+     * 调用方自定义标识
+     */
+    @XStreamAsAttribute
+    private String suitSid;
+
+    /**
+     * 重试记录id
+     */
+    private Long retryRecordId;
+
+    /**
      * 适配器信息
      */
     private BsSuitCaseModel suitCaseModel;
@@ -142,4 +153,23 @@ public class SuitClientModel implements Serializable {
         // 设置默认
         this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
     }
+
+    public SuitClientModel(SuitModel suitModel, BsSuitCaseModel suitCaseModel) {
+        this.requestSource = suitModel.getRequestSource();
+        this.suitSid = suitModel.getSuitSid();
+        this.retryRecordId = suitModel.getRetryRecordId();
+
+        this.caseTypeId = suitCaseModel.getBsSuitCase().getCaseTypeId();
+        this.actionId = suitCaseModel.getBsSuitCase().getSuitActionId();
+        this.suitCaseCode = suitCaseModel.getBsSuitCase().getSuitCaseCode();
+        this.suitCaseModel = suitCaseModel;
+
+        // 设置默认
+        this.suitCaseStatusCode = ResourceEnumUtil.MESSAGE.SUCCESS.getCode();
+        // 设置默认
+        this.suitSslKeyResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+        // 设置默认
+        this.suitResult = CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue();
+    }
+
 }

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitModel.java

@@ -0,0 +1,45 @@
+package cn.estsh.i3plus.pojo.model.softswitch;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.BlockSoftSwitchEnumUtil;
+import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitCaseParam;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :
+ *      软适配执行适配器(客户端服务端适配总入口)
+ *      所需的参数模型
+ * @Reference :
+ * @Author : yunhao
+ * @CreateDate : 2020-10-28 15:51
+ * @Modify:
+ **/
+@Data
+public class SuitModel implements Serializable {
+
+    private static final long serialVersionUID = 8981933192688480221L;
+
+    @ApiParam(value = "适配器代码")
+    private String suitCaseCode;
+
+    @ApiParam(value = "适配SID")
+    private String suitSid;
+
+    @AnnoOutputColumn(refClass = BlockSoftSwitchEnumUtil.REQUEST_SOURCE.class)
+    @ApiParam(value = "适配来源")
+    private Integer requestSource;
+
+    @ApiParam(value = "重试记录id")
+    private Long retryRecordId;
+
+    @ApiParam(value = "适配器参数XML")
+    private String paramXml;
+
+    @ApiParam(value = "适配器参数")
+    private List<BsSuitCaseParam> bsSuitCaseParamList;
+
+}

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitRecordModel.java

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.model.softswitch;
 
+import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitFile;
 import cn.estsh.i3plus.pojo.softswitch.bean.BsSuitRecord;
 import io.swagger.annotations.ApiModel;
@@ -23,6 +24,9 @@ public class SuitRecordModel {
     @ApiModelProperty("适配文件")
     private BsSuitFile bsSuitFile;
 
+    @ApiModelProperty("分页信息")
+    private Pager pager;
+
     public SuitRecordModel() {
     }
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/softswitch/SuitServerModel.java

@@ -39,6 +39,13 @@ public class SuitServerModel implements Serializable {
 
     // 请求ID
     private String requestId;
+
+    // 调用方自定义标识
+    private String suitSid;
+
+    // 重试记录id
+    private Long retryRecordId;
+
     // 传输单对象
     @XmlElement(name = "data")
     @XStreamAlias("data")
@@ -110,4 +117,14 @@ public class SuitServerModel implements Serializable {
 
     //    @XStreamImplicit
     private String analyzeMessage;
+
+    public SuitServerModel(){
+    }
+    public SuitServerModel(SuitModel suitModel){
+        this.suitCaseCode = suitModel.getSuitCaseCode();
+        this.requestSource = suitModel.getRequestSource();
+        this.suitSid= suitModel.getSuitSid();
+        this.retryRecordId = suitModel.getRetryRecordId();
+        this.obj = suitModel.getParamXml();
+    }
 }

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/bean/BsSuitRecord.java

@@ -61,6 +61,15 @@ public class BsSuitRecord extends BaseBean {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long suitCaseDetailId;
 
+    @Column(name = "SUIT_SID")
+    @ApiParam(value = "适配记录SID")
+    private String suitSid;
+
+    @Column(name = "RETRY_RECORD_ID")
+    @ApiParam(value = "重试记录id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long retryRecordId;
+
     @Column(name = "SUIT_METHOD_ID")
     @ApiParam(value = "适配方式id枚举（定时适配，主动适配）")
     private Integer suitMethodId;

modules/i3plus-pojo-softswitch/src/main/java/cn/estsh/i3plus/pojo/softswitch/sqlpack/SoftSwitchHqlPack.java

@@ -320,6 +320,7 @@ public class SoftSwitchHqlPack {
 
         DdlPreparedPack.getInPackList(bsSuitRecord.getSearchIdList(),"id",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitCaseId(),"suitCaseId",ddlPackBean);
+        DdlPreparedPack.getStringLikePack(bsSuitRecord.getSuitSid(),"suitSid",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseNameRdd(),"suitCaseNameRdd",ddlPackBean);
         DdlPreparedPack.getNumEqualPack(bsSuitRecord.getSuitTypeId(),"suitTypeId",ddlPackBean);
         DdlPreparedPack.getStringLikerPack(bsSuitRecord.getSuitCaseCode(),"suitCaseCode",ddlPackBean);

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

@@ -286,8 +286,8 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("物料编号")
     public String partNo;
 
-    @ApiParam(value = "标题")
     @Transient
+    @ApiParam(value = "标题")
     public String title;
 
     @Transient
@@ -354,6 +354,9 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam("目标库位代码")
     public String destLocateNo;
 
+    @Transient
+    @ApiParam("查询状态集合")
+    public List<Integer> orderStatusList;
 
     public int getOrderStatusVal() {
         return this.orderStatus == null ? 0 : this.orderStatus;

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

@@ -14,6 +14,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description : 库位物料表
@@ -87,6 +88,26 @@ public class WmsLocatePart extends BaseBean {
     @ApiParam("库位类型")
     private Integer locateType;
 
+    @Transient
+    @ApiParam("库位类型")
+    private List<Integer> locateTypeList;
+
+    @Transient
+    @ApiParam("物料类型")
+    private List<String> partTypeList;
+
+    @Transient
+    @ApiParam(value = "存储区")
+    private String zoneNo;
+
+    @Transient
+    @ApiParam(value = "仓库")
+    private String whNo;
+
+    @Transient
+    @ApiParam(value = "库存单位")
+    private String stockUnit;
+
     public Double getMin() {
         return this.min == null ? 0 : this.min;
     }
@@ -107,5 +128,23 @@ public class WmsLocatePart extends BaseBean {
         return this.min ==null?0:this.min.doubleValue();
     }
 
+    public WmsLocatePart() {
+    }
 
+    public WmsLocatePart(String locateNo, String partNo, String partNameRdd, Double pullQty, Double max, Double min,
+                         Integer isGeneratePicklist, Double safetyStock, Double moq, String zoneNo, String whNo,
+                         String stockUnit) {
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.pullQty = pullQty;
+        this.max = max;
+        this.min = min;
+        this.isGeneratePicklist = isGeneratePicklist;
+        this.safetyStock = safetyStock;
+        this.moq = moq;
+        this.zoneNo = zoneNo;
+        this.whNo = whNo;
+        this.stockUnit = stockUnit;
+    }
 }

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

@@ -278,6 +278,18 @@ public class WmsPOMasterDetails extends BaseBean {
         this.qty = qty;
     }
 
+    public WmsPOMasterDetails(String orderNo, String partNo, String partNameRdd, String planDate, String planTime,
+                              Double snp, Long totalBoxes, Double qty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.planDate = planDate;//批次号（yyyyMMdd）
+        this.planTime = planTime;//批次号（yyyyMMdd）
+        this.snp = snp;
+        this.totalBoxes = totalBoxes.intValue();
+        this.qty = qty;
+    }
+
     public WmsPOMasterDetails(String orderNo, String erpSrcNo, String partNo, Double qty,
                               Double rcQty, Integer itemStatus) {
         this.orderNo = orderNo;

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

@@ -0,0 +1,100 @@
+package cn.estsh.i3plus.pojo.wms.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
+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 :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-10-28 9:54
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "WMS_PLC")
+@Api("WMSPLC配置表")
+public class WmsPlc extends BaseBean {
+
+    @Column(name = "PLC_CODE")
+    @ApiParam("PLC代码")
+    private String plcCode;
+
+    @Column(name = "PLC_NAME")
+    @ApiParam("PLC名称")
+    private String plcName;
+
+    @Column(name = "BUSI_TYPE")
+    @ApiParam("业务类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PLC_BUSI_TYPE.class)
+    private Integer busiType;
+
+    @Column(name = "OPC_URL")
+    @ApiParam("OPC路径")
+    private String opcUrl;
+
+    @Column(name = "CHANNEL")
+    @ApiParam("通道")
+    private String channel;
+
+    @Column(name = "DEVICE")
+    @ApiParam("终端")
+    private String device;
+
+    @Column(name = "TAG_NAME")
+    @ApiParam("标签名称")
+    private String tagName;
+
+    @Column(name = "TAG_ADDRESS")
+    @ApiParam("标签地址")
+    private String tagAddress;
+
+    @Column(name = "DATA_TYPE")
+    @ApiParam("标签数据类型")
+    private String dataType;
+
+    /*@Column(name = "DATA_TYPE")
+    @ApiParam("标签类别")
+    private Integer dataType;*/
+
+    @Column(name = "USER_NAME")
+    @ApiParam("用户名")
+    private String userName;
+
+    @Column(name = "PASSWORD")
+    @ApiParam("密码")
+    private String password;
+
+    @Column(name = "START_VALUE")
+    @ApiParam("开始节点")
+    private Integer startValue;
+
+    @Column(name = "end_VALUE")
+    @ApiParam("结束节点")
+    private Integer endValue;
+
+    @Column(name = "NAME_SPACE_INDEX")
+    @ApiParam("空间索引")
+    private Integer nameSpaceIndex = 2;
+
+    @Column(name = "REQUEST_INTERVAL")
+    @ApiParam("请求间隔")
+    private Double requestInterval = 500.0;
+
+
+
+}

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

@@ -36,7 +36,7 @@ public class WmsSerialSnTrans extends BaseBean {
 
     @Column(name = "BATCH_NO")
     @ApiParam(value = "BATCH号")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String batchNo;
 
     @Column(name="SERIAL_SN")
@@ -47,7 +47,7 @@ public class WmsSerialSnTrans extends BaseBean {
     @Column(name="BH_TYPE")
     @ApiParam("BH类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2, dataSrc = "FG_INSTOCK_SN_TYPE")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.FG_INSTOCK_SN_TYPE.class)
     private Integer bhType;
 
     @Column(name = "PART_NO")
@@ -77,15 +77,26 @@ public class WmsSerialSnTrans extends BaseBean {
     @Column(name="TRANS_TYPE")
     @ApiParam("操作类型")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 1, dataSrc = "BACTH_TRANS_TYPE")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BACTH_TRANS_TYPE.class)
     private Integer transType;
 
     @Column(name = "IS_OK")
     @ApiParam(value = "是否合格")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
-    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class)
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "TRUE_OR_FALSE", isRequire = 2)
     private Integer isOk;
 
+    @Column(name = "LOT_NO")
+    @ApiParam("生产批次")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+    private String lotNo;
+
+    @Column(name = "STATUS")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "MOVE_ORDER_DETAILS_STATUS")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_DETAILS_STATUS.class)
+    @ApiParam("状态")
+    private Integer status;
+
     @Transient
     @ApiParam("操作类型")
     private List<Integer> transTypeLst;

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

@@ -356,4 +356,10 @@ public class WmsStockQuan extends BaseBean {
         this.scrapQty = scrapQty;
         this.areaNo = areaNo;
     }
+
+    public WmsStockQuan(String partNo, String partNameRdd, Double qty) {
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.qty = qty;
+    }
 }

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

@@ -72,6 +72,11 @@ public class WmsWorkCenter extends BaseBean {
             searchColumnName = "zoneNo,locateNo,locateName", listColumnName = "locateNo,locateName", explicitColumnName = "locateNo")
     private String descLocationCode;
 
+    @Column(name = "PRE_WO_MINUTE", columnDefinition = "int default 600")
+    @ApiParam(value = "计算未完成工单的提前时间")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)
+    private Integer preWoMinute;
+
     @Column(name = "PRE_READY_MINUTE", columnDefinition = "int default 180")
     @ApiParam(value = "提前拉动时间")
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2)

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/snapshot/erp/WmsErpQuanAreas.java

@@ -0,0 +1,38 @@
+package cn.estsh.i3plus.pojo.wms.bean.snapshot.erp;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+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 : ERP 库存比对包含的库存地点
+ * @Reference :
+ * @Author : rock.yu
+ * @CreateDate : 2020-10-27 14:06
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="WMS_ERP_QUAN_AREAS")
+public class WmsErpQuanAreas extends BaseBean implements Comparable<WmsErpQuanAreas> {
+    private static final long serialVersionUID = 5560607687871639209L;
+
+    @Column(name="AREA_NO")
+    @ApiParam("库存地点")
+    public String areaNo;
+
+    @Override
+    public int compareTo(WmsErpQuanAreas o) {
+        return this.getAreaNo().compareTo(o.getAreaNo());
+    }
+}

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsVendorDelayMasterModel.java

@@ -17,6 +17,12 @@ import lombok.Data;
 public class WmsVendorDelayMasterModel extends BaseBean {
 
     private static final long serialVersionUID = 1589775350017343999L;
+    @ApiParam(value = "订单号")
+    private String orderNo;
+
+    @ApiParam(value = "原因")
+    public String reason;
+
     @ApiParam(value = "供应商代码")
     private String vendorNo;
 
@@ -26,12 +32,28 @@ public class WmsVendorDelayMasterModel extends BaseBean {
     @ApiParam(value = "延迟次数")
     private Long delayCount;
 
+    @ApiParam(value = "延迟次数")
+    private Long sumDelayCount;
+
     @ApiParam(value = "查询开始时间")
     private String startDateTime;
 
     @ApiParam(value = "查询结束时间")
     private String endDateTime;
 
+    @ApiParam("计划交货日期")
+    private String planDate;
+
+    @ApiParam("计划交货时间")
+    private String planTime;
+
+    @ApiParam("实际交货时间")
+    private String actualPlanTime;
+
+    @ApiParam("计划交货时间")
+    private String planPlanDateTime;
+
+
     public WmsVendorDelayMasterModel(String vendorNo, String vendorName, Long count, String organizeCode, String createDateTime) {
         this.vendorNo = vendorNo;
         this.vendorName = vendorName;
@@ -40,6 +62,22 @@ public class WmsVendorDelayMasterModel extends BaseBean {
         this.createDatetime = createDateTime;
     }
 
+    public WmsVendorDelayMasterModel(String orderNo, String reason, String planDate, String planTime, String actualPlanTime, String vendorNo, String vendorName, String organizeCode) {
+        this.orderNo = orderNo;
+        this.reason = reason;
+        this.planDate = planDate;
+        this.planTime = planTime;
+        this.actualPlanTime = actualPlanTime;
+        this.vendorNo = vendorNo;
+        this.vendorName = vendorName;
+        this.organizeCode = organizeCode;
+    }
+
+    public WmsVendorDelayMasterModel(String vendorNo, Long delayCount) {
+        this.vendorNo = vendorNo;
+        this.delayCount = delayCount;
+    }
+
     public WmsVendorDelayMasterModel() {
 
     }

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

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpCheckPoint;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WmsErpCheckPointRepository extends BaseRepository<WmsErpCheckPoint, Long> {
+}

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

@@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.snapshot.erp.WmsErpQuanAreas;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface WmsErpQuanAreasRepository extends BaseRepository<WmsErpQuanAreas, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.wms.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.wms.bean.WmsPlc;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jimmy.zeng
+ * @CreateDate : 2020-10-28 10:47
+ * @Modify:
+ **/
+@Repository
+public interface WmsPlcRepository extends BaseRepository<WmsPlc, Long> {
+}

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

@@ -1749,11 +1749,14 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringNoEqualPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
-        DdlPreparedPack.getOrderByPack(
+        /*DdlPreparedPack.getOrderByPack(
                 new Object[]{CommonEnumUtil.FALSE, CommonEnumUtil.FALSE},
-                new String[]{"sn", "createDatetime"}, result);
+                new String[]{"sn", "createDatetime"}, result);*/
+//        result.setWhereAppend(result.getWhereAppend() + " and sn <> '"+wmsStockSn.getSn()+"'");
+
         return result;
     }