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

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java

@@ -325,6 +325,14 @@ public class AndonManageQueue extends BaseBean {
     @ApiParam(value = "安灯状态集合")
     private List<String> statusCodeList;
 
+    @Transient
+    @ApiParam(value = "日发生次数")
+    private int dayTime;
+
+    @Transient
+    @ApiParam(value = "周发生次数")
+    private int weekendsTime;
+
     // 是否转呼
     public Integer getIsShiftCall() {
         return this.isShiftCall == null ? 0 : this.isShiftCall;

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

@@ -106,6 +106,52 @@ public class AndonEnumUtil {
     }
 
     /**
+     * 统计方式
+     * 10-是，20-否
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum COUNT_TYPE {
+        DAY("10","按照天统计"),
+        WEEKEND("20","按照周统计");
+
+        private String value;
+        private String description;
+
+        COUNT_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].value, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = "";
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].description, val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 按灯状态
      * 10-是，20-否
      */
@@ -211,9 +257,10 @@ public class AndonEnumUtil {
         SIGN(2,"20","响应"),
         RESOLVE(3,"30","解决"),
         CANCEL(4,"40", "撤销"),
-        COMMIT(5,"50","提交"),
-        PASS(6,"60","审批"),
-        REJECT(7,"70","驳回");
+        COMMIT(5,"50","解决待审"),// 20190917将“提交”更改为“解决待审”
+        PASS(6,"60","审批完成"), // 20190917将“审批”更改为“审批完成”
+        REJECT(7,"70","驳回"),
+        CONFIRMED_CANCEL(8,"80","撤销已确认"); // 20190917增加这个枚举
 
         private int value;
         private String code;
@@ -245,6 +292,16 @@ public class AndonEnumUtil {
             return tmp;
         }
 
+        public static String codeOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (StringUtils.equalsIgnoreCase(values()[i].code, val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
         public static int descriptionOfValue(String val) {
             int tmp = -1;
             for (int i = 0; i < values().length; i++) {

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

@@ -12,6 +12,43 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 public class MesEnumUtil {
 
     /**
+     * MesWorkOrder实体对应的approvalStatus值  审批状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_APPROVAL_STATUS {
+
+        WAIT_APPROVAL(10, "待审批"),
+        COMPLETE_APPROVAL(20, "已审批"),
+        REJECT_APPROVAL(30, "驳回");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_APPROVAL_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            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;
+        }
+    }
+
+    /**
      * mes-pcn定时任务状态
      *
      */
@@ -357,9 +394,9 @@ public class MesEnumUtil {
 
         CREATE(10, "创建"),
         LANDED(20, "下达"),
-        OPEN(30, "开启"),
+        OPEN(30, "启动"),
         PAUSE(40, "暂停"),
-        CANCEL(50, "撤销"),
+        CANCEL(50, "取消"),
         CLOSE(60, "关闭");
 
         private int value;
@@ -515,7 +552,9 @@ public class MesEnumUtil {
 
         MES("MES", "来源于MES"),
         AMES("AMES", "来源于AMES"),
-        SAP("SAP", "来源于SAP");
+        SAP("SAP", "来源于SAP"),
+        CREATE("CREATE", "手工新增"),
+        RESOLVE("RESOLVE", "计划分解");
 
         private String value;
         private String description;

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

@@ -13,13 +13,12 @@ public class MesPcnEnumUtil {
 
     /**
      * mes-pcn定时任务状态
-     *
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_PCN_TASK_STATUS{
+    public enum MES_PCN_TASK_STATUS {
 
-        OPEN(1,"OPEN"),
-        CLOSE(2,"CLOSE");
+        OPEN(1, "OPEN"),
+        CLOSE(2, "CLOSE");
 
         private int value;
         private String description;
@@ -50,13 +49,12 @@ public class MesPcnEnumUtil {
 
     /**
      * mes-pcn定时任务同步结果状态
-     *
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_PCN_TASK_SYNC_STATUS{
+    public enum MES_PCN_TASK_SYNC_STATUS {
 
-        SUCCESS(1,"mes主服务定时任务工作清单同步成功"),
-        ERROR(2,"mes主服务定时任务工作清单同步失败");
+        SUCCESS(1, "mes主服务定时任务工作清单同步成功"),
+        ERROR(2, "mes主服务定时任务工作清单同步失败");
 
         private int value;
         private String description;
@@ -90,10 +88,10 @@ public class MesPcnEnumUtil {
      * 10.
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SYNC_PATTERN{
+    public enum SYNC_PATTERN {
 
-        UPDATE(1,"修改或新增"),
-        INSERT(2,"新增");
+        UPDATE(1, "修改或新增"),
+        INSERT(2, "新增");
 
         private int value;
         private String description;
@@ -127,10 +125,10 @@ public class MesPcnEnumUtil {
      * 10.
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum SYNC_TYPE{
+    public enum SYNC_TYPE {
 
-        GET_MES_DATA(1,"pcn获取mes数据"),
-        DATA_TO_MES(2,"pcn推送数据至mes");
+        GET_MES_DATA(1, "pcn获取mes数据"),
+        DATA_TO_MES(2, "pcn推送数据至mes");
 
         private int value;
         private String description;
@@ -232,4 +230,119 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * RAW_PART_TYPE 原材料类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RAW_PART_TYPE {
+
+        RAW(10, "lotNo", "原材料"),
+        SEMIFINISHED(20, "fixLotNo", "半成品");
+
+        private int value;
+        private String code;
+        private String description;
+
+        RAW_PART_TYPE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+    }
+
+    /**
+     * RAW_PART_STATUS 原材料状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum RAW_PART_STATUS {
+
+        READY(10, "待投料"),
+        ALREADY(20, "已投料");
+
+        private int value;
+        private String description;
+
+        RAW_PART_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            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;
+        }
+    }
+
+    /**
+     * PROCESS_BOM_ISFEED 是否投料
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROCESS_BOM_ISFEED {
+
+        FEED(1, "投料"),
+        NOT_FEED(2, "不投料");
+
+        private int value;
+        private String description;
+
+        PROCESS_BOM_ISFEED(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            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;
+        }
+    }
+
+
 }

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

@@ -395,6 +395,18 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装String对象成小于不等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringSmallerNotEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
+            packBean.addColumnQuery("s_"+columnName," and model." + columnName + " < :m_s_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成大于语句
      *
      * @param columnName 列名
@@ -405,6 +417,17 @@ public class DdlPreparedPack {
             packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data);
         }
     }
+    /**
+     * 封装double对象成大于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberBiggerEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && Double.parseDouble(data.toString()) > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " >= :m_" + columnName, data);
+        }
+    }
 
     /**
      * 封装double对象成小于语句
@@ -417,6 +440,17 @@ public class DdlPreparedPack {
             packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data);
         }
     }
+    /**
+     * 封装double对象成小于等于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getNumberSmallerEqualPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && Double.parseDouble(data.toString()) > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " <= :m_" + columnName, data);
+        }
+    }
 
     /**
      * 封装long或者int的整数对象成equal语句(不等于)

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

@@ -70,6 +70,10 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
     private Integer extractGap;
 
+    @Column(name="EXTRACT_CONDITION")
+    @ApiParam(value="从数据库抽取的条件限制")
+    private String extractCondition;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

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

@@ -0,0 +1,37 @@
+package cn.estsh.i3plus.pojo.mes.pcn.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:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT_GROUP")
+@Api("班组")
+public class MesShiftGroup extends BaseBean {
+    @Column(name="GROUP_CODE")
+    @ApiParam("班组代码")
+    private String groupCode;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("班组名称")
+    private String groupName;
+}

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

@@ -111,6 +111,22 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name="SHIFT_GROUP")
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @Column(name="APPROVAL_STATUS")
+    @ApiParam("审批状态")
+    private Integer approvalStatus;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
     public double getQtyVal() {
         return this.qty == null ? 0.0d : this.qty;
     }
@@ -138,4 +154,8 @@ public class MesWorkOrder extends BaseBean {
     public int getWorkOrderTypeVal() {
         return this.workOrderType == null ? 0 : this.workOrderType;
     }
+
+    public int getApprovalStatusVal() {
+        return this.approvalStatus == null ? 0 : this.approvalStatus;
+    }
 }

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesCellFeedRepository extends BaseRepository<MesCellFeed, Long> {
+}

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

@@ -0,0 +1,15 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesCellFeed;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesRawPartSn;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/18 10:05 AM
+ * @Description:
+ **/
+@Repository
+public interface MesRawPartSnRepository extends BaseRepository<MesRawPartSn, Long> {
+}

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

@@ -1,10 +1,11 @@
 package cn.estsh.i3plus.pojo.mes.pcn.sqlpack;
 
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.enumutil.MesPcnEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesConfig;
-import cn.estsh.i3plus.pojo.mes.pcn.bean.MesLabelTemplate;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.*;
 import org.apache.commons.lang3.StringUtils;
 
 /**
@@ -16,6 +17,7 @@ import org.apache.commons.lang3.StringUtils;
  **/
 public class MesHqlPack {
 
+
     /**
      * 通用查询条件
      *
@@ -52,6 +54,7 @@ public class MesHqlPack {
 
     /**
      * 根据打印模板的模板代码查询模板信息
+     *
      * @param organizeCode
      * @param mesLabelTemplate
      * @return
@@ -63,4 +66,35 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 获取工作中心下所有的投料数据
+     * @param mesCellFeed
+     * @param org
+     * @return
+     */
+    public static DdlPackBean getMesCellFeed(MesCellFeed mesCellFeed, String org) {
+        DdlPackBean packBean = getAllBaseData(org);
+        DdlPreparedPack.getStringEqualPack(mesCellFeed.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getNumberBiggerPack(0, "rawQty", packBean);
+        return packBean;
+    }
+
+
+    /**
+     * 获取原材料扫描信息的对应工序BOM
+     * @param mesProcessBom
+     * @param mesRawPartSn
+     * @return
+     */
+    public static DdlPackBean getMesProcessBomRawPartSn(MesProcessBom mesProcessBom, MesRawPartSn mesRawPartSn) {
+        DdlPackBean packBean = getAllBaseData(mesProcessBom.getOrganizeCode());
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProcessBom.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getNumEqualPack(MesPcnEnumUtil.PROCESS_BOM_ISFEED.FEED.getValue(),"isFeed",packBean);
+        DdlPreparedPack.getStringEqualPack(mesRawPartSn.getPartNo(), "itemPartNo", packBean);
+        return packBean;
+    }
+
+
 }

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

@@ -57,7 +57,7 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam("同步方式")
     private Integer syncPattern;
 
-    @Column(name="SYNC_TYPE")//1\pcn获取mes数据   2、pcn推送数据至mes
+    @Column(name="SYNC_TYPE")//1.pcn获取mes数据   2.pcn推送数据至mes
     @ApiParam("同步类型")
     private Integer syncType;
 
@@ -66,11 +66,14 @@ public class MesPcnSyncCfg extends BaseBean {
     @ApiParam(value ="上一同步时间")
     private String lastSyncTime;
 
-
     @Column(name="EXTRACT_GAP")
     @ApiParam(value="从数据库抽取的最大值 目前为分钟为限制")
     private Integer extractGap;
 
+    @Column(name="EXTRACT_CONDITION")
+    @ApiParam(value="从数据库抽取的条件限制")
+    private String extractCondition;
+
     public int getSyncFrequencyVal() {
         return this.syncFrequency == null ? 0 : this.syncFrequency;
     }

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

@@ -100,6 +100,11 @@ public class MesPlanOrder extends BaseBean {
     private String workCenterCode;
 
     /**********************  冗余字段 *********************************/
+
+    @Transient
+    @ApiParam(value="区域")
+    public String areaCode;
+
     @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="创建日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
@@ -122,21 +127,6 @@ public class MesPlanOrder extends BaseBean {
     @ApiParam(value="计划结束日期查询用，查询结束日期",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
-    @Transient
-    public List<MesEnumUtil.PLAN_ORDER_TYPE> planTypeEnum;
-
-    @Transient
-    public List<MesEnumUtil.PLAN_ORDER_STATUS> planOrderStatusEnum;
-
-    @Transient
-    public List<MesEnumUtil.PLAN_ORDER_TYPE> getPlanTypeEnum() {
-        return Arrays.asList(MesEnumUtil.PLAN_ORDER_TYPE.values());
-    }
-
-    public List<MesEnumUtil.PLAN_ORDER_STATUS> getPlanOrderStatusEnum() {
-        return Arrays.asList(MesEnumUtil.PLAN_ORDER_STATUS.values());
-    }
-
     public double getPlanQtyVal() {
         return this.planQty == null ? 0.0d : this.planQty;
     }

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

@@ -0,0 +1,37 @@
+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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT_GROUP")
+@Api("班组")
+public class MesShiftGroup extends BaseBean {
+    @Column(name="GROUP_CODE")
+    @ApiParam("班组代码")
+    private String groupCode;
+
+    @Column(name="GROUP_NAME")
+    @ApiParam("班组名称")
+    private String groupName;
+}

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

@@ -0,0 +1,50 @@
+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;
+
+/**
+ * @Description :mes状态配置表
+ * @Reference :
+ * @Author : wangjie
+ * @CreateDate : 2019-09-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_STATUS")
+@Api("系统业务动作")
+public class MesStatus extends BaseBean {
+    @Column(name="STATUS_CODE")
+    @ApiParam("状态代码")
+    private String statusCode;
+
+    @Column(name="STATUS_NAME")
+    @ApiParam("状态名称")
+    private String statusName;
+
+    @Column(name="STATUS_VALUE")
+    @ApiParam("状态值")
+    private Integer statusValue;
+
+    @Column(name="STATUS_FIELD")
+    @ApiParam("状态字段")
+    private String statusField;
+
+    public int getStatusValueVal() {
+        return this.statusValue == null ? 0 : this.statusValue;
+    }
+}

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

@@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.mes.bean;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -125,6 +124,22 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("备注")
     private String memo;
 
+    @Column(name="SHIFT_GROUP")
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @Column(name="APPROVAL_STATUS")
+    @ApiParam("审批状态")
+    private Integer approvalStatus;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
     /**********************  冗余字段 *********************************/
     @Transient
     @ApiParam(value="工作中心名称")
@@ -143,6 +158,10 @@ public class MesWorkOrder extends BaseBean {
     public String shiftName;
 
     @Transient
+    @ApiParam(value="班组名称")
+    public String shiftGroupName;
+
+    @Transient
     @ApiParam(value="产品配置名称")
     public String prodCfgName;
 
@@ -167,31 +186,6 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
     public String endTimeEnd;
 
-
-    @Transient
-    @ApiParam("工单类型枚举")
-    private List<MesEnumUtil.WORK_ORDER_TYPE> workOrderTypeDropData;
-
-    public List<MesEnumUtil.WORK_ORDER_TYPE> getWorkOrderTypeDropData() {
-        return Arrays.asList(MesEnumUtil.WORK_ORDER_TYPE.values());
-    }
-
-    @Transient
-    @ApiParam("工单状态枚举")
-    private List<MesEnumUtil.WORK_ORDER_STATUS> workOrderStatusDropData;
-
-    public List<MesEnumUtil.WORK_ORDER_STATUS> getWorkOrderStatusDropData() {
-        return Arrays.asList(MesEnumUtil.WORK_ORDER_STATUS.values());
-    }
-
-    @Transient
-    @ApiParam("工单来源枚举")
-    private List<MesEnumUtil.WORK_ORDER_SOURCE> workOrderSourceDropData;
-
-    public List<MesEnumUtil.WORK_ORDER_SOURCE> getWorkOrderSourceDropData() {
-        return Arrays.asList(MesEnumUtil.WORK_ORDER_SOURCE.values());
-    }
-
     @Transient
     @ApiParam("mes生产工单页面按钮控制")
     private MesWorkOrderButtonModel workOrderButtonModel;
@@ -224,4 +218,8 @@ public class MesWorkOrder extends BaseBean {
     public int getWorkOrderTypeVal() {
         return this.workOrderType == null ? 0 : this.workOrderType;
     }
+
+    public int getApprovalStatusVal() {
+        return this.approvalStatus == null ? 0 : this.approvalStatus;
+    }
 }

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

@@ -0,0 +1,222 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel;
+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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-19-17:36
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_WORK_ORDER_LOG")
+@Api("生产工单日志")
+public class MesWorkOrderLog extends BaseBean {
+    @Column(name="ORDER_NO")
+    @ApiParam("工单号")
+    private String orderNo;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
+    @Column(name="QTY")
+    @ApiParam("数量")
+    private Double qty;
+
+    @Column(name="COMPLETE_QTY")
+    @ApiParam("完成数量")
+    private Double completeQty;
+
+    @Column(name="REPAIR_QTY")
+    @ApiParam("返修数量")
+    private Double repairQty;
+
+    @Column(name="SCRAP_QTY")
+    @ApiParam("报废数量")
+    private Double scrapQty;
+
+    @Column(name="SEQ")
+    @ApiParam("工单序号")
+    private Double seq;
+
+    @Column(name="WO_STATUS")
+    @ApiParam("工单状态")
+    private Integer workOrderStatus;
+
+    @Column(name="WO_TYPE")
+    @ApiParam("工单类型")
+    private Integer workOrderType;
+
+    @Column(name="NEXT_ORDER")
+    @ApiParam("下一工单")
+    private String nextOrder;
+
+    @Column(name="PLAN_ORDER_NO")
+    @ApiParam("生产计划单号")
+    private String planOrderNo;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="SCHEDULE_DATE")
+    @ApiParam("排产日期")
+    private String scheduleDate;
+
+    @Column(name="CUST_PROD_LINE_CODE")
+    @ApiParam("客户产线代码")
+    private String custProdLineCode;
+
+    @Column(name="SHIFT_CODE")
+    @ApiParam("班次")
+    private String shiftCode;
+
+    @Column(name="START_TIME")
+    @ApiParam("开始时间")
+    private String startTime;
+
+    @Column(name="END_TIME")
+    @ApiParam("结束时间")
+    private String endTime;
+
+    @Column(name="WO_SOURCE")
+    @ApiParam("工单来源")
+    private String workOrderSource;
+
+    @Column(name="MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Column(name="SHIFT_GROUP")
+    @ApiParam("班组")
+    private String shiftGroup;
+
+    @Column(name="APPROVAL_STATUS")
+    @ApiParam("审批状态")
+    private Integer approvalStatus;
+
+    @Column(name="CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name="CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
+    /**********************  冗余字段 *********************************/
+    @Transient
+    @ApiParam(value="工作中心名称")
+    public String workCenterName;
+
+    @Transient
+    @ApiParam(value="工作单元名称")
+    public String workCellName;
+
+    @Transient
+    @ApiParam(value="客户产线名称")
+    public String custProdLineName;
+
+    @Transient
+    @ApiParam(value="班次名称")
+    public String shiftName;
+
+    @Transient
+    @ApiParam(value="班组名称")
+    public String shiftGroupName;
+
+    @Transient
+    @ApiParam(value="产品配置名称")
+    public String prodCfgName;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
+    public String startTimeStart;
+
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划开始日期查询用，查询截至日期",example = "2018-12-31 23:59:59")
+    public String startTimeEnd;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划结束日期查询用，查询结束日期起始",example = "2018-12-31 23:59:59")
+    public String endTimeStart;
+
+    @Transient
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @ApiParam(value="计划结束日期查询用，查询结束日期截至",example = "2018-12-31 23:59:59")
+    public String endTimeEnd;
+
+    @Transient
+    @ApiParam("mes生产工单页面按钮控制")
+    private MesWorkOrderButtonModel workOrderButtonModel;
+
+
+    public double getQtyVal() {
+        return this.qty == null ? 0.0d : this.qty;
+    }
+
+    public double getCompleteQtyVal() {
+        return this.completeQty == null ? 0.0d : this.completeQty;
+    }
+
+    public double getRepairQtyVal() {
+        return this.repairQty == null ? 0.0d : this.repairQty;
+    }
+
+    public double getScrapQtyVal() {
+        return this.scrapQty == null ? 0.0d : this.scrapQty;
+    }
+
+    public double getSeqVal() {
+        return this.seq == null ? 0.0d : this.seq;
+    }
+
+    public int getWorkOrderStatusVal() {
+        return this.workOrderStatus == null ? 0 : this.workOrderStatus;
+    }
+
+    public int getWorkOrderTypeVal() {
+        return this.workOrderType == null ? 0 : this.workOrderType;
+    }
+
+    public int getApprovalStatusVal() {
+        return this.approvalStatus == null ? 0 : this.approvalStatus;
+    }
+}

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

@@ -17,8 +17,8 @@ import java.io.Serializable;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("mes生产计划导入异常结果model")
-public class MesPlanOrderExcelErrorModel implements Serializable {
+@Api("mes导入异常结果model")
+public class MesExcelErrorModel implements Serializable {
 
     @ApiParam("错误的行号")
     private int rowNum;

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

@@ -18,22 +18,25 @@ import java.util.List;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@Api("mes生产计划导入结果model")
-public class MesPlanOrderExcelResultModel implements Serializable {
+@Api("mes导入结果model")
+public class MesExcelResultModel<T> implements Serializable {
 
     @ApiParam("结果")
     private boolean result;
 
-    @ApiParam("成功数量")
-    private int successNum;
+    @ApiParam("成功行数量")
+    private int successRowNum;
 
-    @ApiParam("失败数量")
-    private int errorNum;
+    @ApiParam("失败行数量")
+    private int failRowNum;
 
     @ApiParam("错误信息集合")
-    private List<MesPlanOrderExcelErrorModel> mesPlanOrderExcelErrorModel;
+    private List<MesExcelErrorModel> mesExcelErrorModel;
 
     @ApiParam("错误的行号")
     private String errorRows;
 
+    @ApiParam("导入数据集合")
+    private List<T> excelList;
+
 }

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

@@ -23,14 +23,14 @@ public class MesWorkOrderButtonModel implements Serializable {
     @ApiParam("修改按钮")
     private boolean updateButton;
 
-    @ApiParam("按配置修改按钮")
-    private boolean updateButton4Config;
+//    @ApiParam("按配置修改按钮")
+//    private boolean updateButton4Config;
 
     @ApiParam("下达按钮")
     private boolean transmitButton;
 
-    @ApiParam("测试动态下达按钮")
-    private boolean dynamicTransmitButton4Test;
+//    @ApiParam("测试动态下达按钮")
+//    private boolean dynamicTransmitButton4Test;
 
     @ApiParam("启动按钮")
     private boolean startUpButton;
@@ -38,7 +38,7 @@ public class MesWorkOrderButtonModel implements Serializable {
     @ApiParam("暂停按钮")
     private boolean suspendButton;
 
-    @ApiParam("撤销按钮")
+    @ApiParam("取消按钮")
     private boolean revokeButton;
 
     @ApiParam("关闭按钮")

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesShiftGroupRepository.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.MesShiftGroup;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-18-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesShiftGroupRepository extends BaseRepository<MesShiftGroup, Long> {
+}

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

@@ -0,0 +1,17 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
+import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrderLog;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: wangjie
+ * @CreateDate:2019-09-19-17:13
+ * @Modify:
+ **/
+@Repository
+public interface MesWorkOrderLogRepository extends BaseRepository<MesWorkOrderLog, Long> {
+}

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

@@ -154,31 +154,38 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCenterCode())) {
             DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCenterCode(), "workCenterCode", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getWorkCellCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getWorkCellCode(), "workCellCode", packBean);
+        if (mesWorkOrder.getApprovalStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(mesWorkOrder.getApprovalStatus(), "approvalStatus", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getWorkOrderType() + "") && mesWorkOrder.getWorkOrderTypeVal() != 0) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getWorkOrderType(), "workOrderType", packBean);
         }
-        if (StringUtils.isNotEmpty(mesWorkOrder.getProdCfgCode())) {
-            DdlPreparedPack.getStringEqualPack(mesWorkOrder.getProdCfgCode(), "prodCfgCode", packBean);
+        if (StringUtils.isNotEmpty(mesWorkOrder.getCustOrderNo())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCustOrderNo(), "custOrderNo", packBean);
         }
         if (StringUtils.isNotEmpty(mesWorkOrder.getPlanOrderNo())) {
             DdlPreparedPack.getStringLikerPack(mesWorkOrder.getPlanOrderNo(), "planOrderNo", packBean);
         }
+        if (StringUtils.isNotEmpty(mesWorkOrder.getCreateUser())) {
+            DdlPreparedPack.getStringLikerPack(mesWorkOrder.getCreateUser(), "createUser", packBean);
+        }
         if (mesWorkOrder.getIsValid() != null) {
             DdlPreparedPack.getNumEqualPack(mesWorkOrder.getIsValid(), "isValid", packBean);
         }
 
         // 时间段查询
-//        DdlPreparedPack.timeBuilder(
-//                mesWorkOrder.getStartTimeStart(),
-//                mesWorkOrder.getStartTimeEnd(),
-//                "startTime", packBean, true);
-//        DdlPreparedPack.timeBuilder(
-//                mesWorkOrder.getEndTimeStart(),
-//                mesWorkOrder.getEndTimeEnd(),
-//                "endTime", packBean, true);
+        DdlPreparedPack.timeBuilder(
+                mesWorkOrder.getStartTimeStart(),
+                mesWorkOrder.getStartTimeEnd(),
+                "startTime", packBean, true);
+        DdlPreparedPack.timeBuilder(
+                mesWorkOrder.getEndTimeStart(),
+                mesWorkOrder.getEndTimeEnd(),
+                "endTime", packBean, true);
+        DdlPreparedPack.timeBuilder(
+                mesWorkOrder.getCreateDateTimeStart(),
+                mesWorkOrder.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
         DdlPreparedPack.getOrderDefault(mesWorkOrder);
         DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesWorkOrder.getOrderByParam()}, packBean);
         return packBean;
@@ -733,6 +740,7 @@ public class MesHqlPack {
         DdlPreparedPack.getStringEqualPack(mesProcessBom.getItemPartNo(), "itemPartNo", packBean);
         DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCenterCode(), "workCenterCode", packBean);
         DdlPreparedPack.getStringEqualPack(mesProcessBom.getWorkCellCode(), "workCellCode", packBean);
+        DdlPreparedPack.getNumEqualPack(mesProcessBom.getIsFeed(), "isFeed", packBean);
         DdlPreparedPack.getNumNOEqualPack(mesProcessBom.getId(), "id", packBean);
         return packBean;
     }
@@ -802,13 +810,8 @@ public class MesHqlPack {
      */
     public static DdlPackBean getMesKeyData(MesKeyData keyData, String organizeCode) {
         DdlPackBean packBean = getAllBaseDataByNormalPro(keyData, organizeCode);
-        if (StringUtils.isNotEmpty(keyData.getKeyDataCode())) {
         DdlPreparedPack.getStringLikerPack(keyData.getKeyDataCode(), "keyDataCode", packBean);
-        }
-        if (StringUtils.isNotEmpty(keyData.getKeyDataName())) {
         DdlPreparedPack.getStringLikerPack(keyData.getKeyDataName(), "keyDataName", packBean);
-        }
-
         return packBean;
     }
 

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java

@@ -159,7 +159,7 @@ public class CoreHqlPack {
 
         // String Like
         DdlPreparedPack.getStringLikerPack(organize.getName(),"name",result);
-        DdlPreparedPack.getStringLikerPack(organize.getName(),"organizeCode",result);
+        DdlPreparedPack.getStringLikerPack(organize.getOrganizeCode(),"organizeCode",result);
         // Number In
         DdlPreparedPack.getInPackList(idList,"id",result);
         return result;

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

@@ -106,6 +106,10 @@ public class WmsLocate extends BaseBean {
     @ApiParam(value = "入库箱数", example = "-1")
     private Integer destBoxQty;
 
+    @Transient
+    @ApiParam(value = "错误信息", example = "-1")
+    private String errorMsg;
+
     @Column(name = "ENCRYPTION_NO")
     @ApiParam(value = "加密编码")
     private String encryptionNo;

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/GenerateLocateRule.java

@@ -22,31 +22,30 @@ public class GenerateLocateRule {
     /**
      * 存储区
      */
-    List<String> zonesList;
+    private List<String> zonesList;
 
     /**
      * 库位类型
      */
-    Integer locateType;
+    private Integer locateType;
 
     /**
      * 工厂代码
      */
-    String organizeCode;
+    private String organizeCode;
 
     /**
      * 库位代码
      */
-    String locateNo;
+    private String locateNo;
 
     /**
      * 入库箱数
      */
-    Integer destQty;
+    private Integer destQty;
 
     /**
      * 物料名称
      */
-    String partNo;
-
+    private String partNo;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/engine/rule/WmsSNNextStatusRule.java

@@ -23,6 +23,8 @@ public class WmsSNNextStatusRule {
     private int srcSNStatusCode;
     // 目的条码状态
     private int destSNStatusCode;
+    // 目的条码的质量状态
+    private int destQCStatusCode;
 
     public int getTransTypeCode() {
         return transTypeCode;
@@ -79,4 +81,12 @@ public class WmsSNNextStatusRule {
     public void setDefaultInStock(boolean defaultInStock) {
         this.defaultInStock = defaultInStock;
     }
+
+    public int getDestQCStatusCode() {
+        return destQCStatusCode;
+    }
+
+    public void setDestQCStatusCode(int destQCStatusCode) {
+        this.destQCStatusCode = destQCStatusCode;
+    }
 }