Merge branch 'test' into ext-dev

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+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.*;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :安灯区域
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name="ANDON_AREA")
+@Api("安灯区域")
+public class AndonArea extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 3435045294077955581L;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="AREA_NAME")
+    @ApiParam("区域名称")
+    private String areaName;
+
+}

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

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+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.*;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :安灯工作单元
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "ANDON_WORK_CELL")
+@Api("安灯工作单元")
+public class AndonWorkCell extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -6782295209026659848L;
+
+    @Column(name = "WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name = "WORK_CELL_NAME")
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("生产区域代码")
+    private String areaCode;
+
+}

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

@@ -0,0 +1,47 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+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.*;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :安灯工作中心
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Inheritance(strategy = InheritanceType.JOINED)
+@Table(name = "ANDON_WORK_CENTER")
+@Api("安灯工作中心")
+public class AndonWorkCenter extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -34850085202020333L;
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("生产区域代码")
+    private String areaCode;
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonAreaModel.java

@@ -0,0 +1,51 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :安灯区域
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("安灯区域model")
+public class AndonAreaModel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = 1406838542079597374L;
+
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @ApiParam("区域名称")
+    private String areaName;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    @AnnoOutputColumn(hidden = true)
+    private List<AndonWorkCenterModel> childTreeList;
+
+    @Transient
+    @ApiParam(value ="名称")
+    @AnnoOutputColumn(hidden = true)
+    private String name;
+
+    public String getName(){
+        return areaName;
+    }
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCellModel.java

@@ -0,0 +1,49 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Description :安灯工作单元
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("安灯工作单元model")
+public class AndonWorkCellModel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -4513957019405532048L;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @ApiParam("生产区域代码")
+    private String areaCode;
+
+    @Transient
+    @ApiParam(value ="名称")
+    @AnnoOutputColumn(hidden = true)
+    private String name;
+
+    public String getName(){
+        return this.workCellCode;
+    }
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/AndonWorkCenterModel.java

@@ -0,0 +1,58 @@
+package cn.estsh.i3plus.pojo.andon.model;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonWorkCell;
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.*;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description :安灯工作中心
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@ApiModel("安灯工作中心model")
+public class AndonWorkCenterModel extends BaseBean implements Serializable {
+
+    private static final long serialVersionUID = -2737182509323706933L;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam("生产区域代码")
+    private String areaCode;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    @AnnoOutputColumn(hidden = true)
+    private List<AndonWorkCell> childTreeList;
+
+    @Transient
+    @ApiParam(value ="名称")
+    @AnnoOutputColumn(hidden = true)
+    private String name;
+
+    public String getName(){
+        return this.workCenterName;
+    }
+
+    public AndonWorkCenterModel(String organizeCode) {
+        this.organizeCode = organizeCode;
+    }
+
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonAreaRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonArea;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonAreaRepository extends BaseRepository<AndonArea, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonWorkCellRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonWorkCell;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonWorkCellRepository extends BaseRepository<AndonWorkCell, Long> {
+}

modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonWorkCenterRepository.java

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonWorkCenter;
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Repository
+public interface IAndonWorkCenterRepository extends BaseRepository<AndonWorkCenter, Long> {
+}

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

@@ -523,6 +523,19 @@ public class AndonHqlPack {
     }
 
     /**
+     * 安灯区域信息查询条件封装
+     * @param andonArea
+     * @return
+     */
+    public static DdlPackBean getAndonArea(AndonArea andonArea, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(andonArea, organizeCode);
+        DdlPreparedPack.getStringEqualPack(andonArea.getAreaCode(), "areaCode", packBean);
+        packBean.setOrderByStr(andonArea.orderBy());
+
+        return packBean;
+    }
+
+    /**
      * MES工作中心信息查询条件封装
      * @param mesWorkCenter
      * @return
@@ -538,6 +551,21 @@ public class AndonHqlPack {
     }
 
     /**
+     * Andon工作中心信息查询条件封装
+     * @param andonWorkCenter
+     * @return
+     */
+    public static DdlPackBean getAndonWorkCenter(AndonWorkCenter andonWorkCenter, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(andonWorkCenter, organizeCode);
+
+        DdlPreparedPack.getStringEqualPack(andonWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonWorkCenter.getAreaCode(), "areaCode", packBean);
+        packBean.setOrderByStr(andonWorkCenter.orderBy());
+
+        return packBean;
+    }
+
+    /**
      * MES工作单元信息查询条件封装
      * @param mesWorkCell
      * @return
@@ -555,6 +583,23 @@ public class AndonHqlPack {
     }
 
     /**
+     * andon工作单元信息查询条件封装
+     * @param andonWorkCell
+     * @return
+     */
+    public static DdlPackBean getAndonWorkCell(AndonWorkCell andonWorkCell, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(andonWorkCell, organizeCode);
+
+        DdlPreparedPack.getStringEqualPack(andonWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonWorkCell.getAreaCode(), "areaCode", packBean);
+        DdlPreparedPack.getStringEqualPack(andonWorkCell.getWorkCellCode(), "workCellCode", packBean);
+
+        packBean.setOrderByStr(andonWorkCell.orderBy());
+
+        return packBean;
+    }
+
+    /**
      * MES设备信息查询条件封装
      * @param mesEquipment
      * @return
@@ -809,6 +854,25 @@ public class AndonHqlPack {
     }
 
     /**
+     * 安灯区域唯一校验
+     * @param andonArea
+     * @return
+     */
+    public static DdlPackBean packHqlCheckAndonAreaOnlyByAreaCode(AndonArea andonArea){
+        DdlPackBean result = new DdlPackBean();
+        if (andonArea != null && andonArea.getId() != null && andonArea.getId().longValue() > 0) {
+            DdlPreparedPack.getNumNOEqualPack(andonArea.getId(),"id",result);
+        }
+
+        if (andonArea != null) {
+            DdlPreparedPack.getStringEqualPack(andonArea.getAreaCode(), "areaCode", result);
+        }
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
+
+        return result;
+    }
+
+    /**
      * 工作中心唯一校验
      * @param mesWorkCenter
      * @return
@@ -828,6 +892,25 @@ public class AndonHqlPack {
     }
 
     /**
+     * 安灯工作中心唯一校验
+     * @param andonWorkCenter
+     * @return
+     */
+    public static DdlPackBean packHqlCheckAndonWorkCenterOnlyByWorkCenterCode(AndonWorkCenter andonWorkCenter){
+        DdlPackBean result = new DdlPackBean();
+        if (andonWorkCenter != null && andonWorkCenter.getId() != null && andonWorkCenter.getId().longValue() > 0) {
+            DdlPreparedPack.getNumNOEqualPack(andonWorkCenter.getId(),"id",result);
+        }
+
+        if (andonWorkCenter != null) {
+            DdlPreparedPack.getStringEqualPack(andonWorkCenter.getWorkCenterCode(), "workCenterCode", result);
+        }
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
+
+        return result;
+    }
+
+    /**
      * 工作单元唯一校验
      * @param mesWorkCell
      * @return
@@ -847,6 +930,25 @@ public class AndonHqlPack {
     }
 
     /**
+     * 工作单元唯一校验
+     * @param andonWorkCell
+     * @return
+     */
+    public static DdlPackBean packHqlCheckAndonWorkCellOnlyByWorkCellCode(AndonWorkCell andonWorkCell){
+        DdlPackBean result = new DdlPackBean();
+        if (andonWorkCell != null && andonWorkCell.getId() != null && andonWorkCell.getId().longValue() > 0) {
+            DdlPreparedPack.getNumNOEqualPack(andonWorkCell.getId(),"id",result);
+        }
+
+        if (andonWorkCell != null) {
+            DdlPreparedPack.getStringEqualPack(andonWorkCell.getWorkCellCode(), "workCellCode", result);
+        }
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.IS_DEAL.NO.getValue(),"isDeleted",result);
+
+        return result;
+    }
+
+    /**
      * 设备唯一校验
      * @param mesEquipment
      * @return
@@ -1144,4 +1246,6 @@ public class AndonHqlPack {
         DdlPreparedPack.getStringEqualPack(config.getConfigValueType(), "configValueType", packBean);
         return packBean;
     }
+
+
 }