Merge remote-tracking branch 'remotes/origin/dev' into test

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

@@ -269,8 +269,8 @@ public class SwebEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum MESSAGE_TYPE {
 
-        MAIL(1, "邮件", "邮件"),
-        LETTER(2, "站内信", "站内信"),
+//        MAIL(1, "邮件", "邮件"),
+//        LETTER(2, "站内信", "站内信"),
         SWEB_NOTICE(3, "SWEB通知", "SWEB通知"),
         SWEB_PUBLIC_NOTICE(4, "SWEB公告", "SWEB公告");
 
@@ -410,15 +410,15 @@ public class SwebEnumUtil {
         SWEB_FE("SWEB_FE", "SWEB_FE", "sweb系统");
 
         private String value;
-        private String name;
+        private String code;
         private String description;
 
         FE_PLATFORM() {
         }
 
-        FE_PLATFORM(String value, String name, String description) {
+        FE_PLATFORM(String value, String code, String description) {
             this.value = value;
-            this.name = name;
+            this.code = code;
             this.description = description;
         }
 
@@ -426,8 +426,8 @@ public class SwebEnumUtil {
             return value;
         }
 
-        public String getName() {
-            return name;
+        public String getCode() {
+            return code;
         }
 
         public String getDescription() {
@@ -438,7 +438,7 @@ public class SwebEnumUtil {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
                 if (values()[i].value == val) {
-                    tmp = values()[i].name;
+                    tmp = values()[i].code;
                 }
             }
             return tmp;
@@ -457,7 +457,74 @@ public class SwebEnumUtil {
         public static String codeOfDescription(String code) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].name.equals(code)) {
+                if (values()[i].code.equals(code)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 用户消息状态
+     * 1.READ：已读
+     * 2.UNREAD：未读
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MESSAGE_STATUS {
+
+        READ(1,"已读","fa cell-fa fa-file-text"),
+        UNREAD(2,"未读","fa cell-fa fa-file-o");
+
+        private int value;
+        private String code;
+        private String description;
+
+        MESSAGE_STATUS() {
+        }
+
+        MESSAGE_STATUS(int value, String description, String code) {
+            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 valueOfCode(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        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;
+        }
+
+        public static String codeOfDescription(String code) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].code.equals(code)) {
                     tmp = values()[i].description;
                 }
             }

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

@@ -307,6 +307,30 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装String对象成大于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringBiggerPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " > :m_" + columnName, data);
+        }
+    }
+
+    /**
+     * 封装String对象成小于语句
+     *
+     * @param columnName 列名
+     * @param packBean
+     */
+    public static void getStringSmallerPack(Object data, String columnName, DdlPackBean packBean) {
+        if (data != null && !StringUtils.isEmpty(String.valueOf(data))) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " < :m_" + columnName, data);
+        }
+    }
+
+    /**
      * 封装double对象成大于语句
      *
      * @param columnName 列名

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

@@ -36,6 +36,10 @@ public class MesProduceSn extends BaseBean {
     @ApiParam("物料号")
     private String partNo;
 
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
+
     @Column(name="QTY")
     @ApiParam("数量")
     private Double qty;

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description:
@@ -33,12 +34,16 @@ public class MesQueueOrder extends BaseBean {
 
     @Column(name="VIN_CODE")
     @ApiParam("Vin")
-    private Integer vinCode;
+    private String vinCode;
 
     @Column(name="CUST_FLAG_NO")
     @ApiParam("客户标识号")
     private String custFlagNo;
 
+    @Column(name="PROD_CFG_CODE")
+    @ApiParam("产品配置代码")
+    private String prodCfgCode;
+
     @Column(name="SEQ")
     @ApiParam("排序")
     private Double seq;
@@ -59,6 +64,14 @@ public class MesQueueOrder extends BaseBean {
     @ApiParam("区域代码")
     private String areaCode;
 
+    @Transient
+    @ApiParam("起始车号")
+    private String custFlagNoStart;
+
+    @Transient
+    @ApiParam("截至车号")
+    private String custFlagNoEnd;
+
     public int getStatusVal() {
         return this.status == null ? 0 : this.status;
     }

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

@@ -33,7 +33,11 @@ public class MesQueueOrderDetail extends BaseBean {
 
     @Column(name="PART_NO")
     @ApiParam("物料号")
-    private Integer partNo;
+    private String partNo;
+
+    @Column(name="PART_NAME_RDD")
+    @ApiParam("物料名称")
+    private String partNameRdd;
 
     @Column(name="SERIAL_NUMBER")
     @ApiParam("产品条码")
@@ -53,7 +57,7 @@ public class MesQueueOrderDetail extends BaseBean {
 
     @Column(name="WORK_TYPE")
     @ApiParam("生产类型")
-    private String workType;
+    private String workOrderType;
 
     @Column(name="PRODUCE_CATEGORY")
     @ApiParam("产品类型")

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

@@ -88,6 +88,10 @@ public class MesWorkOrder extends BaseBean {
     @ApiParam("工作中心代码")
     private String workCenterCode;
 
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
     @Column(name="WORK_CELL_CODE")
     @ApiParam("工作单元代码")
     private String workCellCode;

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

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
 import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import cn.estsh.i3plus.pojo.mes.bean.MesPlanOrder;
+import cn.estsh.i3plus.pojo.mes.bean.MesQueueOrder;
 import cn.estsh.i3plus.pojo.mes.bean.MesWorkOrder;
 import org.apache.commons.lang3.StringUtils;
 
@@ -155,4 +156,29 @@ public class MesHqlPack {
         DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesWorkOrder.getOrderByParam()} , packBean);
         return packBean;
     }
+
+    /**
+     * 生产队列查询条件封装
+     * @param mesQueueOrder
+     * @return
+     */
+    public static DdlPackBean getQueueOrder(MesQueueOrder mesQueueOrder, String organizeCode) {
+        DdlPackBean packBean = getAllBaseData(organizeCode);
+        if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoStart())) {
+            DdlPreparedPack.getStringBiggerPack(mesQueueOrder.getCustFlagNoStart(), "custFlagNo", packBean);
+        }
+
+        if (StringUtils.isNotEmpty(mesQueueOrder.getCustFlagNoEnd() + "")) {
+            DdlPreparedPack.getStringSmallerPack(mesQueueOrder.getCustFlagNoEnd(), "custFlagNo", packBean);
+        }
+        // 时间段查询
+        DdlPreparedPack.timeBuilder(
+                mesQueueOrder.getCreateDateTimeStart(),
+                mesQueueOrder.getCreateDateTimeEnd(),
+                "createDatetime", packBean, true);
+
+        DdlPreparedPack.getOrderDefault(mesQueueOrder);
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{mesQueueOrder.getOrderByParam()} , packBean);
+        return packBean;
+    }
 }

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

@@ -63,4 +63,12 @@ public class BasVendor extends BaseBean{
     @Column(name = "PASSWORD")
     @ApiParam(value = "密码")
     private String password;
+
+    public BasVendor() {
+    }
+
+    public BasVendor(Long id,String userName) {
+        this.id = id;
+        this.userName = userName;
+    }
 }