解决冲突
jokelone
6 years ago
commit
9e4930968f
@ -0,0 +1,65 @@
|
||||
package cn.estsh.i3plus.pojo.andon.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseBean;
|
||||
import cn.estsh.i3plus.pojo.base.bean.BaseModelBean;
|
||||
import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil;
|
||||
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: Crish
|
||||
* @CreateDate:2019-10-19-14:56
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="ANDON_DISPOSAL_MAINTEN_CFG")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("Andon自处理维护配置")
|
||||
public class AndonDisposalMaintenCfg extends BaseBean {
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam(value = "工作中心代码")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam(value = "工作单元代码")
|
||||
private String workCellCode;
|
||||
|
||||
@AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description")
|
||||
@Column(name = "ALARM_CODE")
|
||||
@ApiParam(value = "安灯类型代码")
|
||||
private String alarmCode;
|
||||
|
||||
@Column(name = "AC_CODE")
|
||||
@ApiParam(value = "呼叫原因代码")
|
||||
private String acCode;
|
||||
|
||||
@Column(name = "EM_CODE")
|
||||
@ApiParam(value = "处理措施代码")
|
||||
private String emCode;
|
||||
|
||||
@Column(name = "RP_WHERE")
|
||||
@ApiParam(value = "有效时长")
|
||||
private Integer rpWhere;
|
||||
|
||||
@Column(name = "FAIL_TIME")
|
||||
@ApiParam(value = "失败次数")
|
||||
private Integer failTime;
|
||||
|
||||
@Column(name = "SUCCESS_TIME")
|
||||
@ApiParam(value = "成功次数")
|
||||
private Integer successTime;
|
||||
}
|
||||
@ -0,0 +1,38 @@
|
||||
package cn.estsh.i3plus.pojo.andon.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue;
|
||||
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: Crish
|
||||
* @CreateDate:2019-10-18-9:13
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@Table(name="ANDON_KNOWLEDGE_BASE")
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Api("ANDON知识库")
|
||||
public class AndonKnowledgeBase extends BaseManageQueue {
|
||||
@Column(name = "FLOW_STATUS")
|
||||
@ApiParam(value = "审批状态")
|
||||
private Integer flowStatus;
|
||||
|
||||
@Column(name = "FLOW_MEMO")
|
||||
@ApiParam(value = "审批意见")
|
||||
private String flowMemo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
|
||||
/**
|
||||
* @Description: 自处理维护配置
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-10-19-15:02
|
||||
* @Modify:
|
||||
**/
|
||||
public interface IAndonDisposalMaintenCfgRepository extends BaseRepository<AndonDisposalMaintenCfg, Long> {
|
||||
}
|
||||
@ -0,0 +1,16 @@
|
||||
package cn.estsh.i3plus.pojo.andon.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase;
|
||||
import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description: 知识库管理
|
||||
* @Reference:
|
||||
* @Author: Crish
|
||||
* @CreateDate:2019-10-18-9:16
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface IAndonKnowledgeBaseRepository extends BaseRepository<AndonKnowledgeBase, Long> {
|
||||
}
|
||||
@ -0,0 +1,63 @@
|
||||
package cn.estsh.i3plus.pojo.aps.bean;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
|
||||
import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
|
||||
import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import org.hibernate.annotations.DynamicInsert;
|
||||
import org.hibernate.annotations.DynamicUpdate;
|
||||
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Table;
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
* @Description :工作计划
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-10-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="APS_WORK_PLAN")
|
||||
@Api("工作计划")
|
||||
public class WorkPlan extends BaseAPS {
|
||||
private Date prevSetStart;
|
||||
private Date prevSetEnd;
|
||||
private String prevSetTime;
|
||||
private Date produceStart;
|
||||
private Date produceEnd;
|
||||
private String produceTime;
|
||||
private Date postSetStart;
|
||||
private Date postSetEnd;
|
||||
private String postSetTime;
|
||||
private Date lockStart;
|
||||
private Date lockEnd;
|
||||
private String lockTime;
|
||||
|
||||
private Date edgeTime;
|
||||
|
||||
private Long workId;
|
||||
private Long resourceId;
|
||||
|
||||
public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
|
||||
|
||||
public void setWork(Work work) {
|
||||
this.workId = work != null ? work.getId() : 0l;
|
||||
BeanRelation.set(this, EWorkPlan.Work, work);
|
||||
}
|
||||
|
||||
public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); }
|
||||
|
||||
public void setResource(Resource resource) {
|
||||
this.resourceId = resource != null ? resource.getId() : 0l;
|
||||
BeanRelation.set(this, EWorkPlan.Resource, resource);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* 物料分配限制
|
||||
* 主要考虑输出订的最晚计算时间不能晚于输入的最晚计算时间
|
||||
*/
|
||||
public enum MATERIAL_ASSIGN_LIMIT {
|
||||
NONE(0), // 不进行任何制约
|
||||
INVENTORY(1), // 库存制约
|
||||
PURCHASE(2), // 采购制约
|
||||
PRODUCT(4); // 制造制约
|
||||
|
||||
private int _value;
|
||||
|
||||
MATERIAL_ASSIGN_LIMIT(int value) {
|
||||
_value = value;
|
||||
}
|
||||
|
||||
public int value() {
|
||||
return this._value;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :预置的资源选择规则
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum RESOURCE_CHOISE_RULE {
|
||||
PREV_SET_TIME, // 前设置时间
|
||||
PRODUCE_TIME, // 生产时间
|
||||
POST_SET_TIME, // 后设置时间
|
||||
WORK_WAIT_TIME, // 工作等待时间
|
||||
RES_BALANCE, // 资源均衡度
|
||||
SAME_MATERIAL, // 相同物料
|
||||
SAME_ORDER, // 相同订单
|
||||
NEARLY_WORK, // 前后工作
|
||||
POST_RESOURCE, // 后资源制约
|
||||
SAME_ASS_RESOURCE, // 相同副资源
|
||||
RESOURCE_PRIORITY; // 资源优先级
|
||||
}
|
||||
@ -0,0 +1,32 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
/**
|
||||
* @Description :预置的工作排序规则
|
||||
* @Reference :
|
||||
* @Author : jason.niu
|
||||
* @CreateDate : 2019-09-17
|
||||
* @Modify:
|
||||
**/
|
||||
public enum WORK_SORT_RULE {
|
||||
NONE,
|
||||
ORDER_LET, // 订单交货期
|
||||
ORDER_PRIORITY, // 订单优先级
|
||||
ORDER_EST, // 订单最早开始时刻
|
||||
ORDER_COUNT, // 订单数量
|
||||
ORDER_RECEIVE_DATE,// 订单接单日期
|
||||
ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差
|
||||
ORDER_PRESSURE, // 订单紧迫程度
|
||||
ORDER_SURPLUS, // 订单余裕度
|
||||
NOPLAN_OPERATION_SIZE,// 残留工序数
|
||||
REMAIN_PRODUCE_TIME, // 残留生产时间
|
||||
MIN_OPERATION_REMAIN_TIME,// 最小工序宽裕时间
|
||||
WORK_LET, // 工作最晚结束时刻
|
||||
WORK_EST, // 工作最早开始时刻
|
||||
INVENTORY_RELA, // 订单物品库存量相对值
|
||||
FIRST_WORK_BEGIN,// 订单首工作上次开始时刻
|
||||
HAVE_HIGH_WORK, // 订单中含有高级别工作
|
||||
WORK_RESOURCE_SIZE, // 工作的可用资源数
|
||||
TOP_ORDER_LET,// 顶层订单的交货期
|
||||
TOP_ORDER_CODE, // 顶层订单代码
|
||||
TOP_ORDER_PRIORITY; // 顶层订单优先级
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
package cn.estsh.i3plus.pojo.aps.enums;
|
||||
|
||||
public enum WORK_SPLIT_TYPE {
|
||||
NONE, // 不分割
|
||||
RATIO, // 按比例分割
|
||||
COUNT, // 按数量分割
|
||||
BATCH // 按批量分割
|
||||
}
|
||||
@ -1,4 +1,6 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EResCalendar {
|
||||
DayShifts,
|
||||
Resources
|
||||
}
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EWork {
|
||||
Order,
|
||||
ParentWork,
|
||||
WorkResources,
|
||||
WorkInputs,
|
||||
WorkOutputs,
|
||||
PrevRelations,
|
||||
PostRelations,
|
||||
Operation,
|
||||
PlanFeedbacks
|
||||
Order, // 订单
|
||||
ParentWork, // 父工作
|
||||
WorkResources, // 工作资源
|
||||
WorkInputs, // 工作输入
|
||||
WorkOutputs, // 工作输出
|
||||
PrevRelations, // 前关联
|
||||
PostRelations, // 后关联
|
||||
Operation, // 工序
|
||||
PlanFeedbacks, // 工作计划反馈
|
||||
WorkPlan // 关联的为主资源的计划
|
||||
}
|
||||
|
||||
@ -0,0 +1,7 @@
|
||||
package cn.estsh.i3plus.pojo.aps.holders;
|
||||
|
||||
public enum EWorkPlan {
|
||||
Work,
|
||||
Resource,
|
||||
AssPlans // 关联的为副资源的工作计划
|
||||
}
|
||||
@ -0,0 +1,9 @@
|
||||
package cn.estsh.i3plus.pojo.aps.repository;
|
||||
|
||||
import cn.estsh.i3plus.pojo.aps.bean.WorkPlan;
|
||||
import org.springframework.data.repository.CrudRepository;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
@Repository
|
||||
public interface IWorkPlanRepository extends CrudRepository<WorkPlan, Long> {
|
||||
}
|
||||
@ -1,3 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="ResCalendar">
|
||||
<Relation field="DayShifts" name="DayShift" type="MULTI_TO_MULTI">
|
||||
</Relation>
|
||||
<Relation field="Resources" name="Resource" type="MULTI_TO_MULTI">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="WorkInput">
|
||||
<Relation field="WorkRelations" name="WorkRelation" reverse="WorkInput" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
<Relation field="Material" name="Material" reverse="WorkInputs" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="OperInput" name="OperInput" reverse="WorkInputs" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="WorkRelations" name="WorkRelation" reverse="WorkInput" type="ONE_TO_MULTI" owner="true">
|
||||
</Relation>
|
||||
<Relation field="Material" name="Material" reverse="WorkInputs" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="OperInput" name="OperInput" reverse="WorkInputs" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -0,0 +1,9 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="WorkPlan">
|
||||
<Relation field="Work" name="Work" reverse="WorkPlan" type="ONE_TO_ONE" owner="true">
|
||||
</Relation>
|
||||
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="AssPlans" name="WorkPlan" type="ONE_TO_MULTI" owner="false">
|
||||
</Relation>
|
||||
</Class>
|
||||
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Class name="WorkResource">
|
||||
<Relation field="Resource" name="Resource" reverse="WorkResources" type="MULTI_TO_ONE" owner="false">
|
||||
<Relation field="Resource" name="Resource" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
<Relation field="OperResource" name="OperResource" reverse="WorkResources" type="MULTI_TO_ONE" owner="false">
|
||||
</Relation>
|
||||
|
||||
@ -0,0 +1,95 @@
|
||||
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 : Wynne.Lu
|
||||
* @CreateDate : 2019-10-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PRODUCT_DATA")
|
||||
@Api("生产数据")
|
||||
public class MesProductData extends BaseBean {
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_NAME")
|
||||
@ApiParam("工作中心名称")
|
||||
private String workCenterName;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "WORK_CELL_NAME")
|
||||
@ApiParam("工作单元名称")
|
||||
private String workCellName;
|
||||
|
||||
@Column(name="SERIAL_NUMBER")
|
||||
@ApiParam("产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_DESC")
|
||||
@ApiParam("物料名称")
|
||||
private String partDesc;
|
||||
|
||||
@Column(name = "EQU_CODE")
|
||||
@ApiParam("设备代码")
|
||||
private String equCode;
|
||||
|
||||
@Column(name = "EQU_NAME")
|
||||
@ApiParam("设备名称")
|
||||
private String equName;
|
||||
|
||||
@Column(name = "OBJECT_CODE")
|
||||
@ApiParam("对象代码")
|
||||
private String objectCode;
|
||||
|
||||
@Column(name = "OBJECT_NAME")
|
||||
@ApiParam("对象名称")
|
||||
private String objectName;
|
||||
|
||||
@Column(name = "FIELD_CODE")
|
||||
@ApiParam("字段代码")
|
||||
private String fieldCode;
|
||||
|
||||
@Column(name = "FIELD_NAME")
|
||||
@ApiParam("字段名称")
|
||||
private String fieldName;
|
||||
|
||||
@Column(name = "FIELD_VALUE")
|
||||
@ApiParam("字段值")
|
||||
private String fieldValue;
|
||||
|
||||
@Column(name = "ROW_NO")
|
||||
@ApiParam("数据行号")
|
||||
private String rowNo;
|
||||
|
||||
@Column(name = "GROUP_NO")
|
||||
@ApiParam("数据组号")
|
||||
private String groupNo;
|
||||
|
||||
}
|
||||
@ -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;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/10/16 2:42 PM
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_WORK_CELL_MONITOR_LOG")
|
||||
@Api("工位监控异常信息")
|
||||
public class MesWorkCellMonitorLog extends BaseBean {
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "WORK_ORDER_NO")
|
||||
@ApiParam("工单")
|
||||
private String workOrderNo;
|
||||
|
||||
@Column(name = "STEP_CODE")
|
||||
@ApiParam("工步")
|
||||
private String stepCode;
|
||||
|
||||
@Column(name = "PROCESS_CODE")
|
||||
@ApiParam("工序")
|
||||
private String processCode;
|
||||
|
||||
@Column(name = "ROUTE_CODE")
|
||||
@ApiParam("流程")
|
||||
private String routeCOde;
|
||||
|
||||
@Column(name="MESSAGE")
|
||||
@ApiParam("异常信息")
|
||||
private String message;
|
||||
}
|
||||
@ -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.MesProductData;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProductDataRepository extends BaseRepository<MesProductData, Long> {
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
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.MesWorkCellMonitorLog;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/9/27 1:58 PM
|
||||
* @Description:
|
||||
**/
|
||||
public interface MesWorkCellMonitorLogRepository extends BaseRepository<MesWorkCellMonitorLog, Long> {
|
||||
}
|
||||
@ -0,0 +1,86 @@
|
||||
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;
|
||||
import javax.persistence.Transient;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @Description :设备作业任务
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_EQU_TASK")
|
||||
@Api("设备作业任务")
|
||||
public class MesEquTask extends BaseBean {
|
||||
|
||||
@Column(name="TASK_NO")
|
||||
@ApiParam("作业任务编号")
|
||||
private String taskNo;
|
||||
|
||||
@Column(name="TASK_TYPE")
|
||||
@ApiParam("作业类型")
|
||||
private Integer taskType;
|
||||
|
||||
@Column(name="TASK_STATUS")
|
||||
@ApiParam("作业状态")
|
||||
private Integer taskStatus;
|
||||
|
||||
@Column(name="WORK_CENTER_CODE")
|
||||
@ApiParam(value="生产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name="PLAN_TIME")
|
||||
@ApiParam("计划日期")
|
||||
private String planTime;
|
||||
|
||||
@Column(name="TASK_SOURCE")
|
||||
@ApiParam("任务来源")
|
||||
private Integer taskSource;
|
||||
|
||||
@Column(name="MEMO")
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
@Column(name="NOTIFY_FLAG")
|
||||
@ApiParam("通知标识")
|
||||
private Integer notifyFlag;
|
||||
|
||||
@Column(name="RELATE_TASK")
|
||||
@ApiParam("关联任务")
|
||||
private String relateTask;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "计划日期起始时间")
|
||||
private String planTimeStart;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value = "计划日期结束时间")
|
||||
private String planTimeEnd;
|
||||
|
||||
@Transient
|
||||
@ApiParam(value ="明细列表")
|
||||
private List<MesEquTaskDetail> mesEquTaskDetailList;
|
||||
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
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 :设备作业任务明细
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name="MES_EQU_TASK_DETAIL")
|
||||
@Api("设备作业任务明细")
|
||||
public class MesEquTaskDetail extends BaseBean {
|
||||
|
||||
@Column(name="TASK_NO")
|
||||
@ApiParam("作业任务编号")
|
||||
private String taskNo;
|
||||
|
||||
@Column(name="EQUIPMENT_CODE")
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@Column(name="EQUIPMENT_NAME")
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@Column(name="ACTION_STATUS")
|
||||
@ApiParam("执行状态")
|
||||
private Integer actionStatus;
|
||||
|
||||
@Column(name="FINAL_RESULT")
|
||||
@ApiParam("整体结果")
|
||||
private Integer finalResult;
|
||||
|
||||
@Column(name="MEMO")
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
@Column(name="REPAIR_FLAG")
|
||||
@ApiParam("维修标识")
|
||||
private Integer repairFlag;
|
||||
|
||||
|
||||
}
|
||||
@ -0,0 +1,95 @@
|
||||
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 :生产数据
|
||||
* @Reference :
|
||||
* @Author : Wynne.Lu
|
||||
* @CreateDate : 2019-10-17
|
||||
* @Modify:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_PRODUCT_DATA")
|
||||
@Api("生产数据")
|
||||
public class MesProductData extends BaseBean {
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CENTER_NAME")
|
||||
@ApiParam("工作中心名称")
|
||||
private String workCenterName;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "WORK_CELL_NAME")
|
||||
@ApiParam("工作单元名称")
|
||||
private String workCellName;
|
||||
|
||||
@Column(name="SERIAL_NUMBER")
|
||||
@ApiParam("产品条码")
|
||||
private String serialNumber;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "PART_DESC")
|
||||
@ApiParam("物料名称")
|
||||
private String partDesc;
|
||||
|
||||
@Column(name = "EQU_CODE")
|
||||
@ApiParam("设备代码")
|
||||
private String equCode;
|
||||
|
||||
@Column(name = "EQU_NAME")
|
||||
@ApiParam("设备名称")
|
||||
private String equName;
|
||||
|
||||
@Column(name = "OBJECT_CODE")
|
||||
@ApiParam("对象代码")
|
||||
private String objectCode;
|
||||
|
||||
@Column(name = "OBJECT_NAME")
|
||||
@ApiParam("对象名称")
|
||||
private String objectName;
|
||||
|
||||
@Column(name = "FIELD_CODE")
|
||||
@ApiParam("字段代码")
|
||||
private String fieldCode;
|
||||
|
||||
@Column(name = "FIELD_NAME")
|
||||
@ApiParam("字段名称")
|
||||
private String fieldName;
|
||||
|
||||
@Column(name = "FIELD_VALUE")
|
||||
@ApiParam("字段值")
|
||||
private String fieldValue;
|
||||
|
||||
@Column(name = "ROW_NO")
|
||||
@ApiParam("数据行号")
|
||||
private String rowNo;
|
||||
|
||||
@Column(name = "GROUP_NO")
|
||||
@ApiParam("数据组号")
|
||||
private String groupNo;
|
||||
|
||||
}
|
||||
@ -0,0 +1,61 @@
|
||||
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;
|
||||
|
||||
/**
|
||||
* @Author: Wynne.Lu
|
||||
* @CreateDate: 2019/10/16 2:42 PM
|
||||
* @Description:
|
||||
**/
|
||||
@Data
|
||||
@Entity
|
||||
@DynamicInsert
|
||||
@DynamicUpdate
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
@Table(name = "MES_WORK_CELL_MONITOR_LOG")
|
||||
@Api("工位监控异常信息")
|
||||
public class MesWorkCellMonitorLog extends BaseBean {
|
||||
|
||||
@Column(name = "WORK_CENTER_CODE")
|
||||
@ApiParam("工作中心")
|
||||
private String workCenterCode;
|
||||
|
||||
@Column(name = "WORK_CELL_CODE")
|
||||
@ApiParam("工作单元")
|
||||
private String workCellCode;
|
||||
|
||||
@Column(name = "PART_NO")
|
||||
@ApiParam("物料号")
|
||||
private String partNo;
|
||||
|
||||
@Column(name = "workOrderNo")
|
||||
@ApiParam("工单")
|
||||
private String workOrderNo;
|
||||
|
||||
@Column(name = "STEP_CODE")
|
||||
@ApiParam("工步")
|
||||
private String stepCode;
|
||||
|
||||
@Column(name = "PROCESS_CODE")
|
||||
@ApiParam("工序")
|
||||
private String processCode;
|
||||
|
||||
@Column(name = "ROUTE_CODE")
|
||||
@ApiParam("流程")
|
||||
private String routeCOde;
|
||||
|
||||
@Column(name="MESSAGE")
|
||||
@ApiParam("异常信息")
|
||||
private String message;
|
||||
}
|
||||
@ -0,0 +1,105 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class MesEquTaskDetailModel implements Serializable {
|
||||
@ApiParam("id")
|
||||
private Long id;
|
||||
|
||||
@ApiParam("作业任务编号")
|
||||
private String taskNo;
|
||||
|
||||
@ApiParam("设备代码")
|
||||
private String equipmentCode;
|
||||
|
||||
@ApiParam("设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
@ApiParam("执行状态")
|
||||
private Integer actionStatus;
|
||||
|
||||
@ApiParam("整体结果")
|
||||
private Integer finalResult;
|
||||
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
@ApiParam("维修标识")
|
||||
private Integer repairFlag;
|
||||
|
||||
@ApiParam("作业类型")
|
||||
private Integer taskType;
|
||||
|
||||
@ApiParam(value="生产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("组织代码")
|
||||
public String organizeCode;
|
||||
|
||||
@ApiParam("有效性")
|
||||
public Integer isValid;
|
||||
|
||||
@ApiParam("是否已删除")
|
||||
public Integer isDeleted;
|
||||
|
||||
@ApiParam("创建用户")
|
||||
public String createUser;
|
||||
|
||||
@ApiParam("创建日期")
|
||||
public String createDatetime;
|
||||
|
||||
@ApiParam("修改人")
|
||||
public String modifyUser;
|
||||
|
||||
@ApiParam("修改日期")
|
||||
public String modifyDatetime;
|
||||
|
||||
@ApiParam("执行状态")
|
||||
private String actionStatusName;
|
||||
|
||||
@ApiParam("整体结果")
|
||||
private String finalResultName;
|
||||
|
||||
@ApiParam("维修标识")
|
||||
private String repairFlagName;
|
||||
|
||||
@ApiParam("作业类型")
|
||||
private String taskTypeName;
|
||||
|
||||
|
||||
public MesEquTaskDetailModel() {
|
||||
|
||||
}
|
||||
|
||||
public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, String workCenterCode) {
|
||||
this.id = id;
|
||||
this.taskNo = taskNo;
|
||||
this.equipmentCode = equipmentCode;
|
||||
this.equipmentName = equipmentName;
|
||||
this.workCenterCode = workCenterCode;
|
||||
}
|
||||
|
||||
public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, Integer actionStatus, Integer finalResult, String memo, Integer repairFlag, Integer taskType, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
|
||||
this.id = id;
|
||||
this.taskNo = taskNo;
|
||||
this.equipmentCode = equipmentCode;
|
||||
this.equipmentName = equipmentName;
|
||||
this.actionStatus = actionStatus;
|
||||
this.finalResult = finalResult;
|
||||
this.memo = memo;
|
||||
this.repairFlag = repairFlag;
|
||||
this.taskType = taskType;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.organizeCode = organizeCode;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
this.modifyUser = modifyUser;
|
||||
this.modifyDatetime = modifyDatetime;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,100 @@
|
||||
package cn.estsh.i3plus.pojo.mes.model;
|
||||
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class MesEquTaskModel implements Serializable {
|
||||
@ApiParam("id")
|
||||
private Long id;
|
||||
|
||||
@ApiParam("作业任务编号")
|
||||
private String taskNo;
|
||||
|
||||
@ApiParam("作业类型")
|
||||
private Integer taskType;
|
||||
|
||||
@ApiParam("作业状态")
|
||||
private Integer taskStatus;
|
||||
|
||||
@ApiParam(value="生产线")
|
||||
private String workCenterCode;
|
||||
|
||||
@ApiParam("计划日期")
|
||||
private String planTime;
|
||||
|
||||
@ApiParam("任务来源")
|
||||
private Integer taskSource;
|
||||
|
||||
@ApiParam("备注")
|
||||
private String memo;
|
||||
|
||||
@ApiParam("通知标识")
|
||||
private Integer notifyFlag;
|
||||
|
||||
@ApiParam("关联任务")
|
||||
private String relateTask;
|
||||
|
||||
@ApiParam("组织代码")
|
||||
public String organizeCode;
|
||||
|
||||
@ApiParam("有效性")
|
||||
public Integer isValid;
|
||||
|
||||
@ApiParam("是否已删除")
|
||||
public Integer isDeleted;
|
||||
|
||||
@ApiParam("创建用户")
|
||||
public String createUser;
|
||||
|
||||
@ApiParam("创建日期")
|
||||
public String createDatetime;
|
||||
|
||||
@ApiParam("修改人")
|
||||
public String modifyUser;
|
||||
|
||||
@ApiParam("修改日期")
|
||||
public String modifyDatetime;
|
||||
|
||||
@ApiParam("作业类型")
|
||||
private String taskTypeName;
|
||||
|
||||
@ApiParam("作业状态")
|
||||
private String taskStatusName;
|
||||
|
||||
@ApiParam("任务来源")
|
||||
private String taskSourceName;
|
||||
|
||||
@ApiParam("通知标识")
|
||||
private String notifyFlagName;
|
||||
|
||||
@ApiParam("mes设备作业任务页面按钮控制")
|
||||
private MesButtonFlagModel equTaskButtonFlagModel;
|
||||
|
||||
|
||||
public MesEquTaskModel() {
|
||||
|
||||
}
|
||||
|
||||
public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) {
|
||||
this.id = id;
|
||||
this.taskNo = taskNo;
|
||||
this.taskType = taskType;
|
||||
this.taskStatus = taskStatus;
|
||||
this.workCenterCode = workCenterCode;
|
||||
this.planTime = planTime;
|
||||
this.taskSource = taskSource;
|
||||
this.memo = memo;
|
||||
this.notifyFlag = notifyFlag;
|
||||
this.relateTask = relateTask;
|
||||
this.organizeCode = organizeCode;
|
||||
this.isValid = isValid;
|
||||
this.isDeleted = isDeleted;
|
||||
this.createUser = createUser;
|
||||
this.createDatetime = createDatetime;
|
||||
this.modifyUser = modifyUser;
|
||||
this.modifyDatetime = modifyDatetime;
|
||||
}
|
||||
}
|
||||
@ -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.MesEquTaskDetail;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesEquTaskDetailRepository extends BaseRepository<MesEquTaskDetail, Long> {
|
||||
}
|
||||
@ -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.MesEquTask;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : wangjie
|
||||
* @CreateDate : 2019-10-11
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesEquTaskRepository extends BaseRepository<MesEquTask, Long> {
|
||||
}
|
||||
@ -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.MesProductData;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
/**
|
||||
* @Description :
|
||||
* @Reference :
|
||||
* @Author : jack.jia
|
||||
* @CreateDate : 2019-04-02
|
||||
* @Modify:
|
||||
**/
|
||||
@Repository
|
||||
public interface MesProductDataRepository extends BaseRepository<MesProductData, Long> {
|
||||
}
|
||||
@ -0,0 +1,11 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class FindWriteModel {
|
||||
private List<String> snList;
|
||||
private String organizeCode;
|
||||
}
|
||||
@ -0,0 +1,22 @@
|
||||
package cn.estsh.i3plus.pojo.model.wms;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @Description 冲销Model
|
||||
* @Reference
|
||||
* @Author dragon
|
||||
* @CreateDate 2019/10/18 1:18
|
||||
* @Modify
|
||||
*/
|
||||
@Data
|
||||
public class WmsWriteOffModel implements Serializable {
|
||||
private static final long serialVersionUID = -5490167040159056107L;
|
||||
private String locateNo;
|
||||
private List<String> snList;
|
||||
private List<Map<String, Object>> summaryList;
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
package cn.estsh.i3plus.pojo.wms.modelbean;
|
||||
|
||||
import io.swagger.annotations.Api;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
@Api("盘点条码差异返回Model")
|
||||
public class SnDifferModel {
|
||||
|
||||
//盘点单号
|
||||
private String orderNo;
|
||||
//条码
|
||||
private String sn;
|
||||
//源库位编码
|
||||
private String locateNo;
|
||||
//物料代码
|
||||
private String partNo;
|
||||
//物料名称
|
||||
private String partNameRdd;
|
||||
//应盘数量
|
||||
private String qty;
|
||||
//实盘数量
|
||||
private String factQty;
|
||||
//
|
||||
private String whNo;
|
||||
//仓库编码
|
||||
private String zoneNo ;
|
||||
//差异状态
|
||||
private String wmStatus;
|
||||
}
|
||||
Loading…
Reference in New Issue