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

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

@@ -12,6 +12,121 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 
 public class MesEnumUtil {
 
+
+    /**
+     * Mes  客户订单来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CUST_ORDER_SOURCE {
+
+        MES("MES", "来源于MES"),
+        SAP("SAP", "来源于SAP");
+
+        private String value;
+        private String description;
+
+        CUST_ORDER_SOURCE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String 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.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesCustOrder 订单类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CUST_ORDER_TYPE {
+
+        STANDARD(10, "标准");
+
+        private int value;
+        private String description;
+
+        CUST_ORDER_TYPE(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;
+        }
+    }
+
+    /**
+     * MesCustOrder实体对应的status值   状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CUST_ORDER_STATUS {
+
+        CREATE(10, "CREATED", "创建"),
+        DEAL(20, "DEAL", "已处理"),
+        CLOSE(30, "CLOSE", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CUST_ORDER_STATUS(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;
+        }
+    }
+
     /**
      * MesProductEncodeCfg 匹配类型
      */
@@ -737,7 +852,8 @@ public class MesEnumUtil {
 
         MES_PLAN_ORDER(10, "生产计划"),
         MES_EQUIPMENT(20, "设备台账"),
-        MES_EQU_TASK_STANDARD(30, "设备作业要求");
+        MES_EQU_TASK_STANDARD(30, "设备作业要求"),
+        MES_CUST_ORDER(40, "客户订单");
 
         private int value;
         private String description;
@@ -2595,7 +2711,8 @@ public class MesEnumUtil {
         PCN_PULL(60, "PCN_PULL"),
         PCN_PUSH(70, "PCN_PUSH"),
         FDFS_DOWNLOAD(80, "FDFS_DOWNLOAD"),
-        REWORK_REPAIR(90, "REWORK_REPAIR");
+        REWORK_REPAIR(90, "REWORK_REPAIR"),
+        PCN_LOGIN(100, "PCN_LOGIN");
 
         private int value;
         private String description;

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

@@ -58,4 +58,8 @@ public class MesPcnSysUserOffline extends BaseBean {
     @ApiParam(value = "部门名称", access = "部门名称")
     private String organizeName;
 
+    @Column(name="USER_TYPE")
+    @ApiParam(value ="账号类型（枚举，待定）" , example ="-1")
+    private Integer userType;
+
 }

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

@@ -0,0 +1,83 @@
+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;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\6 11:45
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_CUST_ORDER")
+@Api("客户信息")
+public class MesCustOrder extends BaseBean {
+
+    @Column(name = "ORDER_NO")
+    @ApiParam("订单号")
+    private String orderNo;
+
+    @Column(name = "ORDER_TYPE")
+    @ApiParam("订单类型")
+    private Integer orderType;
+
+    @Column(name = "PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name = "PART_NAME")
+    @ApiParam("物料名称")
+    private String partName;
+
+    @Column(name = "QTY")
+    @ApiParam("数量")
+    private Integer qty;
+
+    @Column(name = "STATUS")
+    @ApiParam("状态")
+    private Integer status;
+
+    @Column(name = "ORDER_DATE")
+    @ApiParam("订单日期")
+    private String orderDate;
+
+    @Column(name = "CUST_CODE")
+    @ApiParam("客户代码")
+    private String custCode;
+
+    @Column(name = "CUST_ORDER_NO")
+    @ApiParam("客户订单号")
+    private String custOrderNo;
+
+    @Column(name = "SOURCE")
+    @ApiParam("计划来源")
+    private String source;
+
+    @Column(name = "MEMO")
+    @ApiParam("备注")
+    private String memo;
+
+    @Transient
+    @ApiParam(value = "订单日期查询用，查询开始日期", example = "2019-01-31 23:59:59")
+    public String orderTimeStart;
+
+    @Transient
+    @ApiParam(value = "订单日期查询用，查询结束日期", example = "2019-12-31 23:59:59")
+    public String orderTimeEnd;
+}

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

@@ -0,0 +1,14 @@
+package cn.estsh.i3plus.pojo.mes.repository;
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.bean.MesCustOrder;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: joke.wang
+ * @CreateDate: 2019\11\6 13:47
+ * @Modify:
+ **/
+public interface MesCustOrderRepository extends BaseRepository<MesCustOrder, Long> {
+}

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

@@ -1706,4 +1706,37 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    /**
+     * 客户订单
+     * @param mesCustOrder
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getMesCustOrder(MesCustOrder mesCustOrder, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesCustOrder, organizeCode);
+        if (!StringUtils.isEmpty(mesCustOrder.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesCustOrder.getPartNo(), "partNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesCustOrder.getCustCode())) {
+            DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustCode(), "custCode", packBean);
+        }
+        if (!StringUtils.isEmpty(mesCustOrder.getCustOrderNo())) {
+            DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustOrderNo(), "custOrderNo", packBean);
+        }
+        if (!StringUtils.isEmpty(mesCustOrder.getCreateUser())) {
+            DdlPreparedPack.getStringLikerPack(mesCustOrder.getCreateUser(), "createUser", packBean);
+        }
+        if (mesCustOrder.getOrderType() != null) {
+            DdlPreparedPack.getNumEqualPack(mesCustOrder.getOrderType(), "orderType", packBean);
+        }
+        if (mesCustOrder.getStatus() != null) {
+            DdlPreparedPack.getNumEqualPack(mesCustOrder.getStatus(), "status", packBean);
+        }
+        DdlPreparedPack.timeBuilder(
+                mesCustOrder.getOrderTimeStart(),
+                mesCustOrder.getOrderTimeEnd(),
+                "orderDate", packBean, true);
+        return packBean;
+    }
 }