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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.*;
+import java.util.List;
 
 /**
  * @Description : 安灯队列
@@ -236,6 +237,10 @@ public class AndonManageQueue extends BaseBean {
     private Long avgResolveTime;
 
     @Transient
+    @ApiParam(value = "查询条件：ANDON状态")
+    private List<Object> statusList;
+
+    @Transient
     @ApiParam(value = "比例", example = "0")
     private Double proportion;
 

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

@@ -172,6 +172,8 @@ public class AndonHqlPack {
         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.getInPackArray(obj, "statusCode", result);
 
         getStringBuilderPack(andonManageQueue, result);

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

@@ -32,17 +32,17 @@ public class MesPLCConfigure extends BaseBean {
     @ApiParam("设备ip")
     private String ipAddress;
 
-    @Column(name="AREA_CODE")
-    @ApiParam("区域代码")
-    private String channelName;
-
-    @Column(name="AREA_NAME")
-    @ApiParam("区域名称")
+    @Column(name="DEVICE_NAME")
+    @ApiParam("设备地址")
     private String deviceName;
 
+    @Column(name="TAG_NAME")
+    @ApiParam("标签地址")
+    private String tagName;
+
     @Column(name="AREA_CODE")
     @ApiParam("区域代码")
-    private String tagName;
+    private String areaCode;
 
     @Column(name="WORK_CELL_CODE")
     @ApiParam("工作单元")
@@ -52,8 +52,4 @@ public class MesPLCConfigure extends BaseBean {
     @ApiParam("工作中心")
     private String workCenterCode;
 
-    @Column(name="AREA_CODE")
-    @ApiParam("区域代码")
-    private String areaCode;
-
 }

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

@@ -1,7 +1,7 @@
 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.MesArea;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesPLCConfigure;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface MesPLCConfigureRepository extends BaseRepository<MesPLCConfigureRepository, Long> {
+public interface MesPLCConfigureRepository extends BaseRepository<MesPLCConfigure, Long> {
 }

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

@@ -30,25 +30,25 @@ import javax.persistence.Table;
 public class MesCustomer extends BaseBean {
     @Column(name="CUSTOMER_CODE")
     @ApiParam("客户代码")
-    private String CUSTOMER_CODE;
+    private String customerCode;
 
     @Column(name="CUSTOMER_NAME")
     @ApiParam("客户名称")
-    private String CUSTOMER_NAME;
+    private String customerName;
 
     @Column(name="BRIEF_TEXT")
     @ApiParam("客户简称")
-    private String BRIEF_TEXT;
+    private String briefText;
 
     @Column(name="ADDRESS")
     @ApiParam("客户地址")
-    private String ADDRESS;
+    private String address;
 
     @Column(name="CONTACT")
     @ApiParam("客户联系人")
-    private String CONTACT;
+    private String contact;
 
     @Column(name="TELEPHONE")
     @ApiParam("客户电话")
-    private String TELEPHONE;
+    private String telephone;
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.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;
+
+/**
+ * @Description :mes客户表
+ * @Reference :
+ * @Author : yiming.gu
+ * @CreateDate : 2019-05-20
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_CUSTOMER_PART")
+@Api("客户零件关系")
+public class MesCustomerPart extends BaseBean {
+    @Column(name="CUSTOMER_CODE")
+    @ApiParam("客户代码")
+    private String customerCode;
+
+    @Column(name="PART_NO")
+    @ApiParam("物料号")
+    private String partNo;
+
+    @Column(name="CUSTOMER_PART_NO")
+    @ApiParam("客户零件号")
+    private String customerPartNo;
+
+}

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesCustomerPartRepository.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.MesCustomerPart;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-05-20
+ * @Modify:
+ **/
+@Repository
+public interface MesCustomerPartRepository extends BaseRepository<MesCustomerPart, Long> {
+
+}

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

@@ -303,6 +303,7 @@ public class MesHqlPack {
         DdlPackBean packBean = getAllBaseDataByNormalPro(mesProdRouteCfg, organizeCode);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getPartNo(), "partNo", packBean);
         DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(mesProdRouteCfg.getRouteCode(), "routeCode", packBean);
         packBean.setOrderByStr(mesProdRouteCfg.orderBy());
         return packBean;
     }
@@ -357,6 +358,9 @@ public class MesHqlPack {
         if (StringUtils.isNotEmpty(step.getStepName())){
             DdlPreparedPack.getStringLikerPack(step.getStepName(), "stepName", packBean);
         }
+        if (StringUtils.isNotEmpty(step.getStepType())){
+            DdlPreparedPack.getStringLikerPack(step.getStepType(), "stepType", packBean);
+        }
 
         return packBean;
     }
@@ -403,4 +407,78 @@ public class MesHqlPack {
 
         return packBean;
     }
+
+    /**
+     * MES BOM信息查询条件封装
+     * @param bom
+     * @return
+     */
+    public static DdlPackBean getMesBom(MesBom bom, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(bom, organizeCode);
+        if (StringUtils.isNotEmpty(bom.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(bom.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(bom.getItemPartNo())){
+            DdlPreparedPack.getStringEqualPack(bom.getItemPartNo(), "itemPartNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(bom.getBomVersion())){
+            DdlPreparedPack.getStringEqualPack(bom.getBomVersion(), "bomVersion", 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.getStringEqualPack(customer.getCustomerCode(), "customerCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(customer.getCustomerName())){
+            DdlPreparedPack.getStringLikerPack(customer.getCustomerName(), "customerName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 客户产线信息查询条件封装
+     * @param custProdLine
+     * @return
+     */
+    public static DdlPackBean getMesCustProdLine(MesCustProdLine custProdLine, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(custProdLine, organizeCode);
+        if (StringUtils.isNotEmpty(custProdLine.getCustProdLineCode())){
+            DdlPreparedPack.getStringEqualPack(custProdLine.getCustProdLineCode(), "custProdLineCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(custProdLine.getCustProdLineName())){
+            DdlPreparedPack.getStringLikerPack(custProdLine.getCustProdLineName(), "custProdLineName", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES 客户零件关系信息查询条件封装
+     * @param customerPart
+     * @return
+     */
+    public static DdlPackBean getMesCustomerPart(MesCustomerPart customerPart, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(customerPart, organizeCode);
+        if (StringUtils.isNotEmpty(customerPart.getCustomerCode())){
+            DdlPreparedPack.getStringEqualPack(customerPart.getCustomerCode(), "customerCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(customerPart.getPartNo())){
+            DdlPreparedPack.getStringEqualPack(customerPart.getPartNo(), "partNo", packBean);
+        }
+        if (StringUtils.isNotEmpty(customerPart.getCustomerPartNo())){
+            DdlPreparedPack.getStringEqualPack(customerPart.getCustomerPartNo(), "customerPartNo", packBean);
+        }
+
+        return packBean;
+    }
 }

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

@@ -21,8 +21,6 @@ import java.util.List;
 public class MesRouteModel implements Serializable {
     @ApiParam("流程代码")
     public String routeCode;
-    @ApiParam("工厂代码")
-    public String organizeCode;
     @ApiParam("GOJS位置")
     public String position;
     @ApiParam("流程明细Model集合")

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

@@ -25,6 +25,6 @@ public class MesRouteProcessModel {
     public MesRouteProcess mesRouteProcess;
     @ApiParam("流程工步参数配置表(根据Seq分组)")
     public Map<String, List<MesRouteProcessStep>> mesRouteProcessStepMap;
-    @ApiParam("流程工步参数配置表(根据Seq分组)")
+    @ApiParam("产品流程参数配置表(根据Seq分组)")
     public Map<String, List<MesProdRouteOptParam>> mesProdRouteOptParamMap;
 }

modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMenu.java

@@ -26,7 +26,6 @@ import java.util.List;
 @DynamicInsert
 @DynamicUpdate
 @EqualsAndHashCode(callSuper = true)
-//@Table(name="SYS_MENU",indexes = {@Index(name="索引名称",columnList = "列名1,列名2")})
 @Table(name="SYS_MENU",indexes = {
         @Index(name="index_sys_menu_parent_id",columnList = "PARENT_ID"),
 })
@@ -46,7 +45,7 @@ public class SysMenu extends BaseBean {
     private String menuCode;
 
     @Column(name="MENU_TYPE")
-    @ApiParam(value ="功能类型（枚举：1.模块，2.菜单，3.按钮）" , example ="-1")
+    @ApiParam(value ="功能类型" , example ="-1" ,access = "枚举：1.模块，2.菜单，3.按钮")
     private Integer menuType;
 
     // 根节点-1
@@ -88,7 +87,7 @@ public class SysMenu extends BaseBean {
     private String menuDescription;
 
     @Column(name="MENU_STATUS")
-    @ApiParam(value ="功能状态（1.正常，2.禁用）" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1")
+    @ApiParam(value ="功能状态" , example ="1" , access ="功能状态（1.正常，2.禁用）",defaultValue="1")
     private Integer menuStatus;
 
     @Transient