Merge branch 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest
jun
4 years ago
commit
a7b6cd22d3
@ -0,0 +1,55 @@
|
||||
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.base.enumutil.ApsEnumUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
|
||||
/**
|
||||
* @Description :资源甘特图资源表格
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2021-07-27
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Entity
|
||||
@Table(name = "APS_RES_GANTT_TABLE")
|
||||
@Api("资源甘特图资源表格")
|
||||
public class ResGanttTable extends BaseAPS {
|
||||
private static final long serialVersionUID = -8818717728985340196L;
|
||||
|
||||
@Column(name="CODE")
|
||||
@ApiParam(value ="编码")
|
||||
@FieldAnnotation(popSearch = true, mainkey = true)
|
||||
private String code;
|
||||
|
||||
@Column(name="NAME")
|
||||
@ApiParam(value ="名称")
|
||||
@FieldAnnotation(popSearch = true)
|
||||
private String name;
|
||||
|
||||
@Column(name="DISPLAY")
|
||||
@ApiParam(value ="是否在界面显示")
|
||||
@FieldAnnotation(defaultValue = "true")
|
||||
private Boolean display = true;
|
||||
|
||||
@Column(name="ORDER_NUMBER")
|
||||
@ApiParam(value ="序号")
|
||||
private Integer orderNumber;
|
||||
|
||||
private transient ApsEnumUtil.FIELD_TYPE type;
|
||||
|
||||
private transient ApsEnumUtil.EDIT_TYPE editType;
|
||||
|
||||
@ApiParam(value ="枚举项内容")
|
||||
private transient Enum<?>[] enumItems;
|
||||
}
|
||||
@ -1,14 +1,34 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer;
|
||||
import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
|
||||
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class GanttOrderModel {
|
||||
private Long id;
|
||||
private String id;
|
||||
private String code;
|
||||
private String name;
|
||||
private String operationName;
|
||||
@JsonSerialize(using = CustomDateSerializer.class)
|
||||
@JsonDeserialize(using = CustomDateDeserializer.class)
|
||||
private Date startDate;
|
||||
@JsonSerialize(using = CustomDateSerializer.class)
|
||||
@JsonDeserialize(using = CustomDateDeserializer.class)
|
||||
private Date endDate;
|
||||
private String color;
|
||||
private Double percentDone;//完成百分比
|
||||
private Boolean expanded;//是否展开树
|
||||
private Boolean rollup;//自动把数据相加 在children的上层 当前
|
||||
private String duration;//持续时间 天/小时/分钟
|
||||
// private String durationUnit;
|
||||
private Boolean manuallyScheduled;
|
||||
private List<GanttOrderModel> children = new ArrayList<>();
|
||||
private List<GanttLineModel> lineModels = new ArrayList<>();
|
||||
}
|
||||
|
||||
@ -0,0 +1,23 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.SalesOrder;
|
||||
import lombok.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description : GanttTopOrderModel
|
||||
* @Author :gsz
|
||||
* @Date 2021/8/9 15:39
|
||||
* @Modify
|
||||
**/
|
||||
@Data
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@AllArgsConstructor
|
||||
public class GanttTopOrderModel {
|
||||
private String topOrder;
|
||||
private List<SalesOrder> salesOrders = new ArrayList<>();
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
package cn.estsh.i3plus.pojo.aps.model;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.Work;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* @Description : 排程结果信息
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2020-06-22
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
public class ScheduleResultModel {
|
||||
@ApiParam(value ="排程开始时间")
|
||||
private Date beginTime;
|
||||
|
||||
@ApiParam(value ="排程结束时间")
|
||||
private Date endTime;
|
||||
|
||||
@ApiParam(value ="参与排程的工作")
|
||||
private Set<Work> works = new HashSet<>();
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.ResGanttTable;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface ResGanttTableRepository extends CrudRepository<ResGanttTable, Long> {
|
||||
}
|
||||
@ -0,0 +1,45 @@
|
||||
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.*;
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description :解锁密码
|
||||
* @Reference :
|
||||
* @Author : dominic
|
||||
* @CreateDate : 2021-10-08
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Inheritance(strategy = InheritanceType.JOINED)
|
||||
@Table(name = "MES_UNLOCK_PASSWORD")
|
||||
@Api("mes解锁密码表")
|
||||
public class MesUnlockPassword extends BaseBean implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -3534232746289126115L;
|
||||
|
||||
@Column(name = "EMPLOYEE_NUMBER")
|
||||
@ApiParam("员工编号")
|
||||
private String employeeNumber;
|
||||
|
||||
@Column(name = "EMPLOYEE_NAME")
|
||||
@ApiParam("员工姓名")
|
||||
private String employeeName;
|
||||
|
||||
@Column(name = "UNLOCK_PASSWORD")
|
||||
@ApiParam("解锁密码")
|
||||
private String unlockPassword;
|
||||
}
|
||||
@ -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.MesUnlockPassword;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesUnlockPasswordRepository extends BaseRepository<MesUnlockPassword, Long> {
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package cn.estsh.i3plus.pojo.platform.job.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import cn.estsh.i3plus.pojo.platform.platbean.SysLogTaskTime;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @author ns
|
||||
* @create 2021/10/12 0012 下午 16:21
|
||||
*/
|
||||
@Repository
|
||||
public interface SysLogTaskTimeRepository extends BaseRepository<SysLogTaskTime,Long> {
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue