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

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

@@ -1,11 +0,0 @@
-package cn.estsh.i3plus.pojo.andon.sqlpack;
-
-/**
- * @Description : 安灯对象查询封装
- * @Reference :
- * @Author : silliter.yuan
- * @CreateDate : 2019-05-10 10:45
- * @Modify:
- **/
-public class AndonHqlPack {
-}

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

@@ -39,4 +39,8 @@ public class AndonAlarmCause extends BaseBean {
     @Column(name = "PARENT_AC_CODE")
     @ApiParam(value = "父阶原因代码")
     private String parentAcCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
 }

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

@@ -39,4 +39,8 @@ public class AndonEventCause extends BaseBean {
     @Column(name = "PARENT_EC_CODE")
     @ApiParam(value = "父阶原因代码")
     private String parentEcCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
 }

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

@@ -0,0 +1,46 @@
+package cn.estsh.i3plus.pojo.andon.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 : ANDON_事件处理方法
+ * @Reference :
+ * @Author : hansen.ke
+ * @CreateDate : 2019-05-13 17:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name="ANDON_EVENT_METHOD")
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("ANDON_事件处理方法")
+public class AndonEventMethod extends BaseBean {
+
+    @Column(name = "EM_CODE")
+    @ApiParam(value = "事件方法代码")
+    private String emCode;
+
+    @Column(name = "EM_NAME")
+    @ApiParam(value = "事件方法描述")
+    private String emName;
+
+    @Column(name = "PARENT_EM_CODE")
+    @ApiParam(value = "父阶方法代码")
+    private String parentEmCode;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型")
+    private String alarmCode;
+}

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

@@ -181,7 +181,7 @@ public class AndonManageQueue extends BaseBean {
 
     @Column(name = "EC_DESC")
     @ApiParam(value = "事件具体原因")
-    private String ec_desc;
+    private String ecDesc;
 
     @Column(name = "EM_CODE")
     @ApiParam(value = "事件方法代码")

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

@@ -181,7 +181,7 @@ public class AndonManageRecord extends BaseBean {
 
     @Column(name = "EC_DESC")
     @ApiParam(value = "事件具体原因")
-    private String ec_desc;
+    private String ecDesc;
 
     @Column(name = "EM_CODE")
     @ApiParam(value = "事件方法代码")

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

@@ -71,4 +71,16 @@ public class AndonPLC extends BaseBean {
     @Column(name = "GROUP_NO")
     @ApiParam(value = "分组号")
     private String groupNo;
+
+    @Column(name = "ALARM_CODE")
+    @ApiParam(value = "安灯类型代码")
+    private String alarmCode;
+
+    @Column(name = "TAG_BUSINESS_TYPE")
+    @ApiParam(value = "标签业务类型")
+    private String tagBusinessType;
+
+    @Column(name = "IS_ALARM_STATUS")
+    @ApiParam(value = "是否按灯状态", example = "1")
+    private Integer isAlarmStatus;
 }

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

@@ -0,0 +1,57 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+import java.util.List;
+
+/**
+ * @Description :生产区域
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_AREA")
+@Api("生产区域")
+public class MesArea extends BaseBean {
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Column(name="AREA_NAME")
+    @ApiParam("区域名称")
+    private String areaName;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    private List<MesWorkCenter> childTreeList;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    // 默认值 -1
+    @Transient
+    @ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+
+}

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EQUIPMENT")
+@Api("生产设备")
+public class MesEquipment extends BaseBean {
+    @Column(name="EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name="EQUIPMENT_NAME")
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @Column(name="STATUS")
+    @ApiParam("设备状态")
+    private String status;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    // 默认值 -1
+    @Transient
+    @ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+}

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

@@ -0,0 +1,59 @@
+package cn.estsh.i3plus.pojo.andon.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 : crish
+ * @CreateDate : 2019-04-19
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_SHIFT")
+@Api("班次信息")
+public class MesShift extends BaseBean {
+
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心")
+    private String workCenterCode;
+
+    @Column(name="SHIFT_CODE")
+    @ApiParam("班次代码")
+    private String shiftCode;
+
+    @Column(name="SHIFT_NAME")
+    @ApiParam("班次名称")
+    private String shiftName;
+
+    @Column(name="START_TIME")
+    @ApiParam("开班时间")
+    private String startTime;
+
+    @Column(name="WORK_TIMES")
+    @ApiParam("作业时长")
+    private String workTimes;
+
+    public MesShift() {
+    }
+
+    public MesShift(String workCenterCode,String organizeCode) {
+        this.workCenterCode = workCenterCode;
+        this.organizeCode = organizeCode;
+    }
+}

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

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+import java.util.List;
+
+/**
+ * @Description :工作单元
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CELL")
+@Api("工作单元")
+public class MesWorkCell extends BaseBean {
+    @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;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    private List<MesEquipment> childTreeList;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    // 默认值 -1
+    @Transient
+    @ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+}

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

@@ -0,0 +1,74 @@
+package cn.estsh.i3plus.pojo.andon.bean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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;
+import java.util.List;
+
+/**
+ * @Description :工作中心
+ * @Reference :
+ * @Author : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name = "MES_WORK_CENTER")
+@Api("工作中心")
+public class MesWorkCenter extends BaseBean {
+    @Column(name = "WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name = "WORK_CENTER_NAME")
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @Column(name = "ERP_WORK_CENTER")
+    @ApiParam("ERP工作中心")
+    private String erpWorkCenter;
+
+    @Column(name = "WORK_VER")
+    @ApiParam("工作版本")
+    private String workVer;
+
+    @Column(name = "AREA_CODE")
+    @ApiParam("生产区域代码")
+    private String areaCode;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    private List<MesWorkCell> childTreeList;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    // 默认值 -1
+    @Transient
+    @ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+
+    public MesWorkCenter(String organizeCode) {
+        this.organizeCode = organizeCode;
+    }
+
+    public MesWorkCenter() {
+    }
+}

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

@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface IAndonManagetQueueRepository extends BaseRepository<AndonManageQueue,Long> {
+public interface IAndonManageQueueRepository extends BaseRepository<AndonManageQueue,Long> {
 }

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

@@ -12,5 +12,5 @@ import org.springframework.stereotype.Repository;
  * @Modify:
  **/
 @Repository
-public interface IAndonManagetRecordRepository extends BaseRepository<AndonManageRecord,Long> {
+public interface IAndonManageRecordRepository extends BaseRepository<AndonManageRecord,Long> {
 }

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.MesArea;
+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 MesAreaRepository extends BaseRepository<MesArea, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.MesEquipment;
+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 MesEquipmentRepository extends BaseRepository<MesEquipment, Long> {
+}

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

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

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.MesWorkCell;
+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 MesWorkCellRepository extends BaseRepository<MesWorkCell, Long> {
+}

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

@@ -0,0 +1,16 @@
+package cn.estsh.i3plus.pojo.andon.repository;
+
+import cn.estsh.i3plus.pojo.andon.bean.MesWorkCenter;
+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 MesWorkCenterRepository extends BaseRepository<MesWorkCenter, Long> {
+}

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

@@ -0,0 +1,169 @@
+package cn.estsh.i3plus.pojo.andon.sqlpack;
+
+import cn.estsh.i3plus.pojo.andon.bean.AndonPLC;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import org.apache.commons.lang3.StringUtils;
+
+import cn.estsh.i3plus.pojo.andon.bean.*;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
+import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @Description : 安灯对象查询封装
+ * @Reference :
+ * @Author : silliter.yuan
+ * @CreateDate : 2019-05-10 10:45
+ * @Modify:
+ **/
+public class AndonHqlPack {
+    /**
+     * 封装公用查询参数
+     *
+     * @param bean   实体对象
+     * @param hqlStr 查询语句
+     * @return 封装完成的查询语句
+     */
+    public static DdlPackBean getStringBuilderPack(BaseBean bean, DdlPackBean hqlStr) {
+
+        // 判断工厂代码是否为空
+        if (StringUtils.isNotBlank(bean.getOrganizeCode())) {
+            DdlPreparedPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr);
+        }
+
+        // 封装有效状态和删除状态
+        DdlPreparedPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr);
+        DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr);
+
+        return hqlStr;
+    }
+
+    /**
+     * 按灯PLC查询条件
+     *
+     * @param andonPLC plc实体
+     * @return
+     */
+    public static DdlPackBean packHqlAndonPLCInfo(AndonPLC andonPLC) {
+        DdlPackBean result = new DdlPackBean();
+
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(andonPLC.getWorkCellCode(), "workCellCode", result);
+        DdlPreparedPack.getStringEqualPack(andonPLC.getNodeIP(), "nodeIP", result);
+        DdlPreparedPack.getStringEqualPack(andonPLC.getChannelName(), "channelName", result);
+        DdlPreparedPack.getStringEqualPack(andonPLC.getTagName(), "tagName", result);
+        DdlPreparedPack.getStringEqualPack(andonPLC.getTagAddress(), "tagAddress", result);
+        DdlPreparedPack.getStringEqualPack(andonPLC.getTagType(), "tagType", result);
+        DdlPreparedPack.getStringEqualPack(andonPLC.getAlarmCode(), "alarmCode", result);
+
+        getStringBuilderPack(andonPLC, result);
+        return result;
+    }
+
+    /**
+     * 按条件查询工作中心
+     * @param mesWorkCenter
+     * @return
+     */
+    public static DdlPackBean packHqlMesWorkCenter(MesWorkCenter mesWorkCenter){
+        DdlPackBean result = new DdlPackBean();
+
+        getStringBuilderPack(mesWorkCenter, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询工作单元（工位）
+     * @param mesWorkCell
+     * @return
+     */
+    public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result);
+        getStringBuilderPack(mesWorkCell, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询设备
+     * @param mesEquipment
+     * @return
+     */
+    public static DdlPackBean packHqlMesEquipment(MesEquipment mesEquipment){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", result);
+        getStringBuilderPack(mesEquipment, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询班次
+     * @param mesShift
+     * @return
+     */
+    public static DdlPackBean packHqlMesShift(MesShift mesShift){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(mesShift.getWorkCenterCode(), "workCenterCode", result);
+        getStringBuilderPack(mesShift, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询ANDON呼叫原因
+     * @param andonAlarmCause
+     * @return
+     */
+    public static DdlPackBean packHqlAndonAlarmCause(AndonAlarmCause andonAlarmCause){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonAlarmCause.getAlarmCode(), "alarmCode", result);
+        getStringBuilderPack(andonAlarmCause, result);
+
+        return result;
+    }
+
+    /**
+     * 按条件查询ANDON事件原因
+     * @param andonEventCause
+     * @return
+     */
+    public static DdlPackBean packHqlAndonEventCause(AndonEventCause andonEventCause){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonEventCause.getAlarmCode(), "alarmCode", result);
+        getStringBuilderPack(andonEventCause, result);
+
+        return  result;
+    }
+
+    /**
+     * 按条件查询按灯队列信息
+     * @param andonManageQueue
+     * @return
+     */
+    public static DdlPackBean packHqlAndonManageQueue(AndonManageQueue andonManageQueue){
+        DdlPackBean result = new DdlPackBean();
+
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCellCode(), "workCellCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getWorkCenterCode(), "workCenterCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getEquipmentCode(), "equipmentCode", result);
+        DdlPreparedPack.getStringEqualPack(andonManageQueue.getAlarmCode(), "alarmCode", result);
+        getStringBuilderPack(andonManageQueue, result);
+
+        return result;
+    }
+}

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

@@ -0,0 +1,188 @@
+package cn.estsh.i3plus.pojo.base.enumutil;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+
+/**
+ * @Description :
+ * @Reference :
+ * @Author : silliter
+ * @CreateDate : 2019-05-13 15:53
+ * @Modify:
+ **/
+public class AndonEnumUtil {
+    /**
+     * 按灯状态
+     * 10-是，20-否
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum IS_ALARM_STATUS{
+
+        YES(10,"需要按灯"),
+        ON(20,"不需要按灯");
+
+        private int value;
+        private String description;
+
+        IS_ALARM_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;
+        }
+    }
+
+    /**
+     * 按灯业务状态
+     * 安灯状态=10，工号 =20 ，读取状态=30
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ALARM_BUSI_FLAG{
+
+        ALARM_FLAG("10","按灯状态"),
+        USER_CODE("20","工号"),
+        READ_FLAG("30", "读取状态");
+
+        private String value;
+        private String description;
+
+        ALARM_BUSI_FLAG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 按灯标识
+     * 1-呼叫，2-签到，3-解决
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ALARM_FLAG{
+
+        CALL(1,"10","呼叫"),
+        SIGN(2,"20","签到"),
+        RESOLVE(3,"30","解决"),
+        CANCEL(4,"40", "撤销");
+
+        private int value;
+        private String code;
+        private String description;
+
+        ALARM_FLAG(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;
+        }
+    }
+
+    /**
+     * 按灯动作标志
+     * 呼叫=10，签到 =20 ，撤销=30，40-解决，50-转呼
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ANDON_ACTION_FLAG{
+
+        CALL_ACTION("10","呼叫动作"),
+        SIGN_ACTION("20","签到动作"),
+        CANCEL_ACTION("30", "撤销动作"),
+        RESOLVE_ACTION("40", "解决动作"),
+        SHIFG_CALL_ACTION("50", "转呼动作");
+
+        private String value;
+        private String description;
+
+        ANDON_ACTION_FLAG(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+    }
+
+    /**
+     * 优先级别
+     * 10 - 一级，20 - 二级，30 - 三级
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ALARM_PRIORITY{
+
+        FIRST(10,"一级"),
+        SECOND(20,"二级"),
+        THIRD(30,"三级");
+
+        private int value;
+        private String description;
+
+        ALARM_PRIORITY(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;
+        }
+    }
+}

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

@@ -571,4 +571,42 @@ public class MesEnumUtil {
         }
     }
 
+    /**
+     * 组织模型树形菜单level
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PROD_ORG_LEVEL{
+
+        LEVEL_ONE(1,"一级目录"),
+        LEVEL_TWO(2,"二级目录"),
+        LEVEL_THREE(3,"三级目录"),
+        LEVEL_FOUR(4,"四级目录");
+
+        private int value;
+        private String description;
+
+        PROD_ORG_LEVEL(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;
+        }
+    }
+
 }

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

@@ -33,7 +33,7 @@ public class MesQueueOrder extends BaseBean {
 
     @Column(name="VIN_CODE")
     @ApiParam("Vin")
-    private Integer vinCode;
+    private String vinCode;
 
     @Column(name="CUST_FLAG_NO")
     @ApiParam("客户标识号")

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

@@ -28,12 +28,16 @@ import javax.persistence.Table;
 @Api("生产队列明细")
 public class MesQueueOrderDetail extends BaseBean {
     @Column(name="ORDER_NO")
-    @ApiParam("工单号")
+    @ApiParam("主队列编号")
     private String orderNo;
 
     @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/MesArea.java

@@ -2,6 +2,8 @@ package cn.estsh.i3plus.pojo.mes.bean;
 
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -12,6 +14,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description :生产区域
@@ -35,4 +39,19 @@ public class MesArea extends BaseBean {
     @Column(name="AREA_NAME")
     @ApiParam("区域名称")
     private String areaName;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    private List<MesWorkCenter> childTreeList;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    // 默认值 -1
+    @Transient
+    @ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+
 }

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

@@ -0,0 +1,67 @@
+package cn.estsh.i3plus.pojo.mes.bean;
+
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+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 : jack.jia
+ * @CreateDate : 2019-04-02
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Table(name="MES_EQUIPMENT")
+@Api("生产设备")
+public class MesEquipment extends BaseBean {
+    @Column(name="EQUIPMENT_CODE")
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @Column(name="EQUIPMENT_NAME")
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @Column(name="STATUS")
+    @ApiParam("设备状态")
+    private String status;
+
+    @Column(name="WORK_CELL_CODE")
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @Column(name="WORK_CENTER_CODE")
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @Column(name="AREA_CODE")
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    // 默认值 -1
+    @Transient
+    @ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
+}

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description :工作单元
@@ -42,4 +46,18 @@ public class MesWorkCell extends BaseBean {
     @Column(name = "AREA_CODE")
     @ApiParam("生产区域代码")
     private String areaCode;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    private List<MesEquipment> childTreeList;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    // 默认值 -1
+    @Transient
+    @ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
 }

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

@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.mes.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,6 +13,8 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
 
 /**
  * @Description :工作中心
@@ -46,4 +50,18 @@ public class MesWorkCenter extends BaseBean {
     @Column(name = "AREA_CODE")
     @ApiParam("生产区域代码")
     private String areaCode;
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    private List<MesWorkCell> childTreeList;
+
+    @Transient
+    @ApiParam(value ="名称")
+    private String name;
+
+    // 默认值 -1
+    @Transient
+    @ApiParam(value ="父节点" , access ="父节点" ,example = "-1")
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long parentId;
 }

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

@@ -0,0 +1,63 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+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.Entity;
+
+/**
+ * @Description:
+ * @Reference:
+ * @Author: yiming.gu
+ * @CreateDate:2019-04-18-14:16
+ * @Modify:
+ **/
+@Data
+@Entity
+@DynamicInsert
+@DynamicUpdate
+@EqualsAndHashCode(callSuper = true)
+@Api("生产区域")
+public class ProdOrgModel extends BaseBean {
+
+    @ApiParam("区域名称")
+    private String areaName;
+
+    @ApiParam("区域代码")
+    private String areaCode;
+
+    @ApiParam("工作中心代码")
+    private String workCenterCode;
+
+    @ApiParam("工作中心名称")
+    private String workCenterName;
+
+    @ApiParam("ERP工作中心")
+    private String erpWorkCenter;
+
+    @ApiParam("工作版本")
+    private String workVer;
+
+    @ApiParam("工作单元代码")
+    private String workCellCode;
+
+    @ApiParam("工作单元名称")
+    private String workCellName;
+
+    @ApiParam("设备代码")
+    private String equipmentCode;
+
+    @ApiParam("设备名称")
+    private String equipmentName;
+
+    @ApiParam("设备状态")
+    private String status;
+
+    @ApiParam("当前级")
+    private Integer level;
+}

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

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

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

@@ -5,10 +5,7 @@ import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
 import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import cn.estsh.i3plus.pojo.base.enumutil.MesEnumUtil;
 import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
-import cn.estsh.i3plus.pojo.mes.bean.MesPart;
+import cn.estsh.i3plus.pojo.mes.bean.*;
-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;
 
 /**
@@ -187,4 +184,85 @@ public class MesHqlPack {
         DdlPreparedPack.getOrderByPack(new Object[]{"2"},new String[]{"seq"} , packBean);
         return packBean;
     }
+
+    /**
+     * 通用查询条件
+     * @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区域信息查询条件封装
+     * @param mesArea
+     * @return
+     */
+    public static DdlPackBean getMesArea(MesArea mesArea, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesArea, organizeCode);
+        if (StringUtils.isNotEmpty(mesArea.getAreaCode())) {
+            DdlPreparedPack.getStringEqualPack(mesArea.getAreaCode(), "areaCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES工作中心信息查询条件封装
+     * @param mesWorkCenter
+     * @return
+     */
+    public static DdlPackBean getMesWorkCenter(MesWorkCenter mesWorkCenter, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCenter, organizeCode);
+        if (StringUtils.isNotEmpty(mesWorkCenter.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesWorkCenter.getAreaCode())){
+            DdlPreparedPack.getStringEqualPack(mesWorkCenter.getAreaCode(), "areaCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES工作单元信息查询条件封装
+     * @param mesWorkCell
+     * @return
+     */
+    public static DdlPackBean getMesWorkCell(MesWorkCell mesWorkCell, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesWorkCell, organizeCode);
+        if (StringUtils.isNotEmpty(mesWorkCell.getWorkCenterCode())) {
+            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesWorkCell.getAreaCode())){
+            DdlPreparedPack.getStringEqualPack(mesWorkCell.getAreaCode(), "areaCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesWorkCell.getWorkCellCode())){
+            DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", packBean);
+        }
+
+        return packBean;
+    }
+
+    /**
+     * MES设备信息查询条件封装
+     * @param mesEquipment
+     * @return
+     */
+    public static DdlPackBean getMesEquipment(MesEquipment mesEquipment, String organizeCode) {
+        DdlPackBean packBean = getAllBaseDataByNormalPro(mesEquipment, organizeCode);
+        if (StringUtils.isNotEmpty(mesEquipment.getWorkCellCode())){
+            DdlPreparedPack.getStringEqualPack(mesEquipment.getWorkCellCode(), "workCellCode", packBean);
+        }
+        if (StringUtils.isNotEmpty(mesEquipment.getEquipmentCode())){
+            DdlPreparedPack.getStringEqualPack(mesEquipment.getEquipmentCode(), "equipmentCode", packBean);
+        }
+
+        return packBean;
+    }
 }

modules/i3plus-pojo-model/pom.xml

@@ -42,6 +42,10 @@
             <groupId>i3plus.pojo</groupId>
             <artifactId>i3plus-pojo-form</artifactId>
         </dependency>
+        <dependency>
+            <groupId>i3plus.pojo</groupId>
+            <artifactId>i3plus-pojo-mes</artifactId>
+        </dependency>
 
     </dependencies>
 

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

@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.model.andon;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class AndonOpcModel {
+
+	/**
+	 * 通常为localhost
+	 */
+	@ApiParam("opcserver地址-ip")
+	private String host;
+
+	/**
+	 * opcserver的名称
+	 */
+	@ApiParam("opcserver名称")
+	private String serverProgId;
+
+	/**
+	 * 一般为channel
+	 */
+	@ApiParam("第一层路径")
+	private String accessPath;
+
+	/**
+	 * 一般为device.tag
+	 */
+	@ApiParam("剩余路径名称")
+	private String itemName;
+}

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

@@ -0,0 +1,30 @@
+package cn.estsh.i3plus.pojo.model.andon;
+
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+@Data
+public class AndonResultBean {
+
+	@ApiParam("是否成功")
+	private boolean success;
+
+	@ApiParam("处理信息")
+	private String msg;
+
+	@ApiParam("处理结果")
+	private String result;
+
+	public AndonResultBean(boolean success, String msg) {
+		super();
+		this.success = success;
+		this.msg = msg;
+	}
+
+	public AndonResultBean(boolean success, String msg, String result) {
+		super();
+		this.success = success;
+		this.msg = msg;
+		this.result = result;
+	}
+}

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

@@ -0,0 +1,23 @@
+package cn.estsh.i3plus.pojo.model.mes;
+
+import cn.estsh.i3plus.pojo.mes.bean.MesArea;
+import cn.estsh.i3plus.pojo.platform.bean.SysOrganize;
+import io.swagger.annotations.ApiParam;
+
+import javax.persistence.Transient;
+import java.util.List;
+
+public class SysOrganizeModel extends SysOrganize{
+
+    @Transient
+    @ApiParam(value ="子集列表")
+    private List<MesArea> childTreeList;
+
+    public List<MesArea> getChildTreeList() {
+        return childTreeList;
+    }
+
+    public void setChildTreeList(List<MesArea> childTreeList) {
+        this.childTreeList = childTreeList;
+    }
+}

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderDetails.java

@@ -66,8 +66,11 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @Column(name = "UNIT")
     private String unit;
 
+    /**
+     * 不冗余主表数据
+     */
     @ApiParam(value = "行项目状态", example = "1")
-    @Column(name = "ITEM_STATUS")
+    @Transient
     private Integer itemStatus;
 
     @Column(name = "BOX_QTY")
@@ -131,7 +134,10 @@ public class SwebPurchaseOrderDetails extends BaseBean {
     @ApiParam("是否为钢卷料")
     private Integer isSteel;
 
-    @Column(name = "EXPECTED_TIME")
+    /**
+     * 不冗余主表数据
+     */
+    @Transient
     @ApiParam(value = "预计到货日期")
     public String expectedTime;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java

@@ -34,6 +34,14 @@ public class SwebPurchaseOrderSn extends BaseBean {
     @ApiParam("单据明细编号")
     private String orderNo;
 
+    @ApiParam("供应商编号")
+    @Column(name = "VENDOR_CODE")
+    private String vendorCode;
+
+    @ApiParam("供应商名称")
+    @Column(name = "VENDOR_NAME")
+    private String vendorName;
+
     @Column(name = "PART_NO")
     @ApiParam(value = "零件号")
     private String partNo;

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebLoginUserModel.java

@@ -20,6 +20,9 @@ public class SwebLoginUserModel implements Serializable {
     @ApiParam(value = "用户ID")
     private Long id;
 
+    @ApiParam(value = "用户code（供应商编号）")
+    private String code;
+
     @ApiParam(value = "用户名")
     private String userName;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOForPubListEnterModel.java

@@ -23,6 +23,9 @@ public class SwebPOForPubListEnterModel extends BaseBean {
     @ApiParam(value = "订单类型", example = "1")
     public Integer orderType;
 
+    @ApiParam(value = "订单状态", example = "10")
+    public Integer orderStatus;
+
     @ApiParam(value = "预计到货日期开始日期")
     public String expectedTimeStart;
 

modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebPOUpdatePublishForPublishModel.java

@@ -0,0 +1,25 @@
+package cn.estsh.i3plus.pojo.sweb.modelbean;
+
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.bean.ListPager;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description : 待发布订单列表发布输入模型
+ * @Reference :
+ * @Author : jack.lv
+ * @CreateDate : 2019-05-13 13:13
+ * @Modify:
+ **/
+@Data
+public class SwebPOUpdatePublishForPublishModel extends BaseBean {
+
+    @ApiParam(value = "拆分请求时间数量列表", example = "1")
+    private List<String> reqTimeList;
+
+    @ApiParam(value = "列表项", example = "1")
+    private SwebPOForPubListResultItemModel item;
+}