Merge branch 'dev' into test

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

@@ -260,6 +260,10 @@ public class AndonManageQueue extends BaseBean {
     private List<Object> statusList;
 
     @Transient
+    @ApiParam(value = "查询条件：ANDON状态")
+    private List<Object> typeList;
+
+    @Transient
     @ApiParam(value = "比例", example = "0")
     private Double proportion;
 

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java

@@ -271,11 +271,13 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
-        DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getActionCode(), "actionCode", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getAndonOrderNo(), "andonOrderNo", result);
         DdlPreparedPack.getStringEqualPack(andonManageQueue.getShiftCode(), "shiftCode", result);
+        DdlPreparedPack.getInPackList(andonManageQueue.getStatusList(), "statusCode", result); // 只有安灯任务管理特殊用途
         DdlPreparedPack.getInPackArray(obj, "statusCode", result);
+        DdlPreparedPack.getInPackList(andonManageQueue.getTypeList(), "alarmCode", result); // 只有安灯任务管理特殊用途
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
 
         if(StringUtils.isNotBlank(andonManageQueue.getCallTimeStart()) || StringUtils.isNotBlank(andonManageQueue.getCallTimeEnd())){
             DdlPreparedPack.timeBuilder(andonManageQueue.getCallTimeStart(), andonManageQueue.getCallTimeEnd(), "callTime", result, true);
@@ -285,7 +287,8 @@ public class AndonHqlPack {
         // 根据优先级倒序，序号升序排序
 //        DdlPreparedPack.getOrderByPack(new Object[]{2, 1},
 //                new String[]{"priorityLevel", "seq"}, result);
-        result.setOrderByStr(andonManageQueue.orderBy());
+
+         result.setOrderByStr(andonManageQueue.orderBy());
 
         return result;
     }

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

@@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
@@ -21,7 +22,7 @@ import java.util.List;
  **/
 @Data
 @Api("订单基类")
-public class BaseOrder extends BaseAPS {
+public class BaseOrder extends BaseCode {
     @Column(name="COUNT")
     @ApiParam(value ="数量")
     private Double count;

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

@@ -15,6 +15,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.lang.reflect.Method;
+import java.sql.JDBCType;
 
 /**
  * @Description :字段信息
@@ -75,6 +76,10 @@ public class FieldInfo extends BaseCode {
     @ApiParam(value ="主键标识")
     private Boolean mainKey;
 
+    @Column(name="JDBC_TYPE")
+    @ApiParam(value ="数据库类型")
+    private JDBCType jdbcType;
+
     @JsonIgnore
     private transient Class<? extends BaseBean> clazz;
     @JsonIgnore

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -36,4 +38,7 @@ public class Inventory extends BaseOrder {
     @ApiParam(value ="多余量")
     private Double excessCount;
 
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
 }

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -43,4 +45,8 @@ public class PurchaseOrder extends BaseOrder {
     @Column(name="EXCESS_COUNT")
     @ApiParam(value ="多余量")
     private Double excessCount;
+
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
 }

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

@@ -1,5 +1,7 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -40,4 +42,8 @@ public class SalesOrder extends BaseOrder {
     @Column(name="CALC_LEAD_TIME")
     @ApiParam(value ="提前期计算值")
     private String calcLeadTime;
+
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
 }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java

@@ -243,7 +243,7 @@ public class BeanRelationUtil {
      * 将指定包下的类加载到内存中
      * @param packName
      */
-    private static List<Class<?>> loadClass(String packName) {
+    public static List<Class<?>> loadClass(String packName) {
         List<Class<?>> clses = new ArrayList<>();
         ClassLoader loader = Thread.currentThread().getContextClassLoader();
         String strFile = packName.replaceAll("\\.", "/");

modules/i3plus-pojo-aps/src/main/resources/relations/ImportProject.xml

@@ -2,6 +2,6 @@
 <Class name="ImportProject">
     <Relation field="Link" name="DataLink" type="MULTI_TO_ONE">
     </Relation>
-    <Relation field="Details" name="ImportDetail" reverset="Project" type="ONE_TO_MULTI" owner="true">
+    <Relation field="Details" name="ImportDetail" reverse="Project" type="ONE_TO_MULTI" owner="true">
     </Relation>
 </Class>

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseBean.java

@@ -134,7 +134,7 @@ public abstract class BaseBean implements Serializable {
         String result = "";
         if (orderByParam!=null&&orderByParam.trim().length()>0) {
             result = " order by " + orderByParam;
-            if(ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
+            if(ascOrDesc!= null && ascOrDesc == CommonEnumUtil.ASC_OR_DESC.ASC.getValue()) {
                 result += " asc";
             }else{
                 result += " desc";

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

@@ -350,14 +350,16 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WORK_CENTER_RUNNING_STATUS {
 
-        RUNNING(1, "开线"),
+        RUNNING(1, "start", "开线"),
-        STOPPED(2, "停线");
+        STOPPED(2, "stop", "停线");
 
         private int value;
+        private String code;
         private String description;
 
-        WORK_CENTER_RUNNING_STATUS(int value, String description) {
+        WORK_CENTER_RUNNING_STATUS(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -365,6 +367,10 @@ public class MesPcnEnumUtil {
             return value;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -378,6 +384,16 @@ public class MesPcnEnumUtil {
             }
             return tmp;
         }
+
+        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;
+        }
     }
 
     /**
@@ -386,10 +402,10 @@ public class MesPcnEnumUtil {
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WC_CHECK_TYPE {
 
-        PERSON(10, "person", "人"),
+        PERSON(10, "people", "人"),
-        EQUIPMENT(20, "equipment", "机"),
+        EQUIPMENT(20, "equipments", "设备"),
-        MATERIAL(30, "material", "料"),
+        MATERIAL(30, "materials", "物料"),
-        ROUTE(40, "route", "法"),
+        ROUTE(40, "routes", "工艺"),
         ONLINE_SIGNAL(50, "onlineSignal", "开线信号");
 
         private int value;
@@ -423,6 +439,16 @@ public class MesPcnEnumUtil {
             }
             return tmp;
         }
+
+        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;
+        }
     }
 
     /**
@@ -498,4 +524,442 @@ public class MesPcnEnumUtil {
     }
 
 
+    /**
+     * 设备连接类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EQP_CONNECT_TYPE {
+
+        PLC(10, "PLC"),
+        DB(20, "DB"),
+        OTHER(30,"OTHER");
+
+        private int value;
+        private String description;
+
+        EQP_CONNECT_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;
+        }
+    }
+
+    /**
+     * MesPlanOrder实体对应的status值   计划状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLAN_ORDER_STATUS {
+
+        CREATE(10, "CREATED", "创建"),
+        DE_COMPOSE_ING(20, "DE_COMPOSE_ING", "分解中"),
+        DE_COMPOSE_ED(30, "DE_COMPOSE_ED", "分解完成"),
+        CLOSE(40, "CLOSE", "关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        PLAN_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;
+        }
+    }
+
+    /**
+     * MesWorkOrder实体对应的workOrderStatus值  工单状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_STATUS {
+
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        OPEN(30, "启动"),
+        PAUSE(40, "暂停"),
+        CANCEL(50, "取消"),
+        CLOSE(60, "关闭");
+
+        private int value;
+        private String description;
+
+        WORK_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String 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;
+        }
+    }
+
+    /**
+     * MesWorkOrder实体对应的workOrderType值  工单类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_TYPE {
+
+        STANDARD_ORDER(10, "标准工单"),
+        BTS_ORDER(20, "BTS工单"),
+        ATTEMPT_ORDER(30, "试制工单");
+
+        private int value;
+        private String description;
+
+        WORK_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;
+        }
+    }
+
+    /**
+     * MesPlanOrder实体对应的planType值  计划类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLAN_ORDER_TYPE {
+
+        STANDARD_ORDER(10, "标准");
+
+        private int value;
+        private String description;
+
+        PLAN_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;
+        }
+
+        public static Integer descriptionOfValue(String description) {
+            Integer tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(description)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * MesPlanOrder实体对应的source值  计划来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PALN_ORDER_SOURCE {
+
+        MES("MES", "来源于MES"),
+        SAP("SAP", "来源于SAP");
+
+        private String value;
+        private String description;
+
+        PALN_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;
+        }
+    }
+
+    /**
+     * MesWorkOrder实体对应的source值  计划来源
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_SOURCE {
+
+        MES("MES", "来源于MES"),
+        AMES("AMES", "来源于AMES"),
+        SAP("SAP", "来源于SAP"),
+        CREATE("CREATE", "手工新增"),
+        RESOLVE("RESOLVE", "计划分解");
+
+        private String value;
+        private String description;
+
+        WORK_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;
+        }
+    }
+
+    /**
+     * MesQueueOrder实体对应的status值  队列主表状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_STATUS {
+
+        NORMAL(10, "正常"),
+        ONLINE(20, "已上线"),
+        OFFLINE(30, "已下线"),
+        CLOSE(40, "已关闭"),
+        ;
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String 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;
+        }
+    }
+
+    /**
+     * MesQueueOrderDetail实体对应的status值  队列详情状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum QUEUE_ORDER_DETAIL_STATUS {
+
+        NORMAL(10, "正常"),
+        CLOSE(20, "关闭");
+
+        private int value;
+        private String description;
+
+        QUEUE_ORDER_DETAIL_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;
+        }
+    }
+
+    /**
+     * MesPartCategory实体对应的categoryType值  条码表条码质量状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_CATEGORY_TYPE {
+
+        CATEGORY_ONE("Category1", "类型1"),
+        CATEGORY_TWO("Category2", "类型2"),
+        CATEGORY_THREE("Category3", "类型3");
+
+        private String value;
+        private String description;
+
+        PART_CATEGORY_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 (val.equals(values()[i].value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * 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;
+        }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+
 }

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

@@ -598,7 +598,9 @@ public class WmsEnumUtil {
         ASN(200, "ASN", "ASN"),
         PO(210, "PO", "PO"),
         QC(220, "QC", "QC"),
-        AMPR(230, "AMPR", "AMPR");
+        AMPR(230, "AMPR", "AMPR"),
+        FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"),
+        VDA_REPORT(250, "VDA_REPORT", "VDA生产报工");
 
 
         private int value;

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

@@ -530,6 +530,19 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装not in List查询语句
+     *
+     * @param data
+     * @param columnName
+     * @param packBean
+     */
+    public static void getNotInPackList(List<?> data, String columnName, DdlPackBean packBean) {
+        if (data != null && data.size() > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + "not in (:m_" + columnName + ")", data);
+        }
+    }
+
+    /**
      * 封装in String查询语句
      *
      * @param data
@@ -572,9 +585,9 @@ public class DdlPreparedPack {
             data = "";
             for (int i = 0; i < dataArray.length; i++) {
                 if (i == dataArray.length - 1) {
-                    data += "" + dataArray[i] + "";
+                    data += "'" + dataArray[i] + "'";
                 } else {
-                    data += "" + dataArray[i] + ",";
+                    data += "'" + dataArray[i] + "',";
                 }
             }
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);

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

@@ -0,0 +1,42 @@
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_PART_CATEGORY")
+@Api("零件种类")
+public class MesPartCategory extends BaseBean {
+    @Column(name="CATEGORY_CODE")
+    @ApiParam("分类代码")
+    private String categoryCode;
+
+    @Column(name="CATEGORY_NAME")
+    @ApiParam("分类名称")
+    private String categoryName;
+
+    @Column(name="CATEGORY_TYPE")
+    @ApiParam("分类类型")
+    private String categoryType;
+}

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

@@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean {
     public String prodCfgName;
 
     @Transient
+    @ApiParam("区域代码名称")
+    private String areaCodeName;
+
+    @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
     public String startTimeStart;

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

@@ -0,0 +1,16 @@
+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.MesPartCategory;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface MesPartCategoryRepository extends BaseRepository<MesPartCategory, Long> {
+}

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

@@ -33,6 +33,20 @@ public class MesHqlPack {
     }
 
     /**
+     * 通用查询条件
+     *
+     * @param organizeCode
+     * @return
+     */
+    public static DdlPackBean getAllBaseDataByNormalPro(BaseBean baseBean, String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(baseBean.getIsValid(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+        return packBean;
+    }
+
+    /**
      * MES PCN系统配置信息条件查询
      *
      * @param mesConfig
@@ -153,4 +167,55 @@ public class MesHqlPack {
         return packBean;
     }
 
+    /**
+     * 物料信息查询条件封装
+     *
+     * @param mesPart
+     * @return
+     */
+    public static DdlPackBean getPartCondition(MesPart mesPart, String organizeCode) {
+        DdlPackBean packBean = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(organizeCode, "organizeCode", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", packBean);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(), "isDeleted", packBean);
+
+        if (StringUtils.isNotEmpty(mesPart.getPartNo())) {
+            DdlPreparedPack.getStringLikerPack(mesPart.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPart.getPartName())) {
+            DdlPreparedPack.getStringLikerPack(mesPart.getPartName(), "partName", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPart.getCategoryCode1())) {
+            DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode1(), "categoryCode1", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPart.getCategoryCode2())) {
+            DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode2(), "categoryCode2", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesPart.getCategoryCode3())) {
+            DdlPreparedPack.getStringEqualPack(mesPart.getCategoryCode3(), "categoryCode3", packBean);
+        }
+
+        DdlPreparedPack.getOrderDefault(mesPart);
+        DdlPreparedPack.getOrderByPack(new Object[]{"2"}, new String[]{mesPart.getOrderByParam()}, packBean);
+        return packBean;
+    }
+
+    /**
+     * MES 客户信息查询条件封装
+     *
+     * @param customer
+     * @return
+     */
+    public static DdlPackBean getMesCustomer(MesCustomer customer, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(customer, organizeCode);
+        if (StringUtils.isNotEmpty(customer.getCustomerCode())) {
+            DdlPreparedPack.getStringLikerPack(customer.getCustomerCode(), "customerCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(customer.getCustomerName())) {
+            DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
+        }
+
+        return packBean;
+    }
+
 }

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

@@ -163,6 +163,10 @@ public class MesWorkOrder extends BaseBean {
     public String prodCfgName;
 
     @Transient
+    @ApiParam("区域代码名称")
+    private String areaCodeName;
+
+    @Transient
 //    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @ApiParam(value="计划开始日期查询用，查询开始日期",example = "2018-12-31 23:59:59")
     public String startTimeStart;