Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test
wei.peng
6 years ago
commit
5ba134126a
@ -0,0 +1,56 @@
|
||||
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.Index;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description : 安灯停线配置数据
|
||||
* @Reference :
|
||||
* @Author : silliter.yuan
|
||||
* @CreateDate : 2019-05-29 17:16
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="ANDON_STOP_LINE_CFG", indexes = {
|
||||
@Index(columnList = "WORK_CENTER_CODE", name = "ANDON_INDEX_WORK_CENTER_CODE"),
|
||||
@Index(columnList = "WORK_CELL_CODE", name = "ANDON_INDEX_WORK_CELL_CODE"),
|
||||
@Index(columnList = "ORGANIZE_CODE", name = "ANDON_INDEX_ORGANIZE_CODE"),
|
||||
@Index(columnList = "ALARM_CODE", name = "ANDON_INDEX_ALARM_CODE")
|
||||
})
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("安灯队列")
|
||||
public class AndonStopLineConfig extends BaseBean {
|
||||
|
||||
@Column(name = "ALARM_CODE")
|
||||
@ApiParam(value = "安灯类型")
|
||||
private String alarmCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam(value = "工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_NAME_RDD")
|
||||
@ApiParam(value = "工作中心名称")
|
||||
private String workCenterNameRdd;
|
||||
|
||||
@Column(name = "WORK_CELL_NAME_RDD")
|
||||
@ApiParam(value = "工作单元名称")
|
||||
private String workCellNameRdd;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam(value = "工作单元代码")
|
||||
private String workCellCode;
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
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_ROUTE_PROCESS")
|
||||
@Api("流程工序关系")
|
||||
public class MesRouteProcess extends BaseBean {
|
||||
@Column(name = "ROUTE_CODE")
|
||||
@ApiParam("流程代码")
|
||||
private String routeCode;
|
||||
|
||||
@Column(name = "PROCESS_CODE")
|
||||
@ApiParam("工序代码")
|
||||
private String processCode;
|
||||
|
||||
@Column(name = "NEXT_PROCESS")
|
||||
@ApiParam("下一工序")
|
||||
private String nextProcess;
|
||||
|
||||
@Column(name = "REPAIR_PROCESS")
|
||||
@ApiParam("维修工序")
|
||||
private String repairProcess;
|
||||
|
||||
@Column(name = "SEQ")
|
||||
@ApiParam("顺序")
|
||||
private Integer seq;
|
||||
|
||||
@Column(name = "IS_NECESSARY")
|
||||
@ApiParam("是否必须")
|
||||
private Integer isNecessary;
|
||||
|
||||
public int getSeqVal() {
|
||||
return this.seq == null ? 0 : this.seq;
|
||||
}
|
||||
|
||||
public int getIsNecessaryVal() {
|
||||
return this.isNecessary == null ? 0 : this.isNecessary;
|
||||
}
|
||||
}
|
||||
@ -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.MesRouteProcess;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesRouteProcessRepository extends BaseRepository<MesRouteProcess, Long> {
|
||||
}
|
||||
@ -0,0 +1,29 @@
|
||||
package cn.estsh.i3plus.pojo.mes.pcn.sqlpack;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.bean.DdlPackBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
|
||||
import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack;
|
||||
|
||||
/**
|
||||
* @Description:
|
||||
* @Reference: Mes 条件封装
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-04-22-14:58
|
||||
* @Modify:
|
||||
**/
|
||||
public class MesHqlPack {
|
||||
|
||||
/**
|
||||
* 通用查询条件
|
||||
*
|
||||
* @param organizeCode
|
||||
* @return
|
||||
*/
|
||||
public static DdlPackBean getAllBaseData(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);
|
||||
return packBean;
|
||||
}
|
||||
}
|
||||
@ -1,23 +0,0 @@
|
||||
package cn.estsh.i3plus.pojo.model.andon;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.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;
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue