Merge remote-tracking branch 'origin/master'
mengjiao
1 year ago
commit
4c7b2aae74
@ -0,0 +1,461 @@
|
||||
package com.op.system.api.domain.device;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
public class DeviceRepairOrder extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
/** 主键 */
|
||||
private String orderId;
|
||||
|
||||
/** 报修单号 */
|
||||
@Excel(name = "报修单号")
|
||||
private String orderCode;
|
||||
|
||||
/** 设备编码 */
|
||||
@Excel(name = "设备编码")
|
||||
private String equipmentCode;
|
||||
|
||||
/** 故障描述 */
|
||||
@Excel(name = "故障描述")
|
||||
private String orderDesc;
|
||||
|
||||
/** 故障时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "故障时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date orderBreakdownTime;
|
||||
|
||||
/** 报修来源 */
|
||||
@Excel(name = "报修来源")
|
||||
private String orderSource;
|
||||
|
||||
/** 报修时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "报修时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date orderTime;
|
||||
|
||||
/** 是否立即处理 */
|
||||
@Excel(name = "是否立即处理")
|
||||
private String orderHandle;
|
||||
|
||||
/** 报修人编号 */
|
||||
@Excel(name = "报修人编号")
|
||||
private String orderRepairmanCode;
|
||||
|
||||
/** 报修人名字 */
|
||||
@Excel(name = "报修人名字")
|
||||
private String orderRepairmanName;
|
||||
|
||||
/** 联系方式 */
|
||||
@Excel(name = "联系方式")
|
||||
private String orderConnection;
|
||||
|
||||
/** 处理状态 */
|
||||
@Excel(name = "处理状态")
|
||||
private String orderStatus;
|
||||
|
||||
/** 关联计划 */
|
||||
@Excel(name = "关联计划")
|
||||
private String orderRelevance;
|
||||
|
||||
/** 故障图片 */
|
||||
@Excel(name = "故障图片")
|
||||
private String orderPicture;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String attr1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String attr2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String attr3;
|
||||
|
||||
/** 删除标志 */
|
||||
private String delFlag;
|
||||
|
||||
/** 工厂编码 */
|
||||
@Excel(name = "工厂编码")
|
||||
private String factoryCode;
|
||||
|
||||
//设备
|
||||
/** 设备类型名称 */
|
||||
@Excel(name = "设备类型名称")
|
||||
private String equipmentTypeName;
|
||||
|
||||
/** 设备位置 */
|
||||
@Excel(name = "设备位置")
|
||||
private String equipmentLocation;
|
||||
|
||||
/** 部门 */
|
||||
@Excel(name = "部门")
|
||||
private String department;
|
||||
|
||||
/** 规格型号 */
|
||||
@Excel(name = "规格型号")
|
||||
private String equipmentSpec;
|
||||
|
||||
/** 设备名称 */
|
||||
@Excel(name = "设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
/** 创建人 */
|
||||
@Excel(name = "创建人")
|
||||
private String createBy;
|
||||
|
||||
/** 报修后去向 */
|
||||
@Excel(name = "报修去向")
|
||||
private String repairDestination;
|
||||
|
||||
/** 计划维修时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "计划维修时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date workPlanTime;
|
||||
|
||||
/** 计划停机时间 */
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||
@Excel(name = "计划停机时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date workPlanDownTime;
|
||||
|
||||
/** 是否停机维修 */
|
||||
@Excel(name = "是否停机维修")
|
||||
private String workDownMachine;
|
||||
|
||||
/** 维修人员 */
|
||||
@Excel(name = "维修人员")
|
||||
private String workPerson;
|
||||
|
||||
/** 维修组 */
|
||||
@Excel(name = "维修组")
|
||||
private String workTeam;
|
||||
|
||||
|
||||
//委外
|
||||
/** 主键 */
|
||||
private String workId;
|
||||
|
||||
/** 委外工单编码 */
|
||||
@Excel(name = "委外工单编码")
|
||||
private String workCode;
|
||||
|
||||
/** 维修人员 */
|
||||
@Excel(name = "委外维修人员")
|
||||
private String outSourcePerson;
|
||||
|
||||
/** 委外单位 */
|
||||
@Excel(name = "委外单位")
|
||||
private String workOutsourcingUnit;
|
||||
|
||||
/** 联系方式 */
|
||||
@Excel(name = "联系方式")
|
||||
private String workConnection;
|
||||
|
||||
/** 原因 */
|
||||
@Excel(name = "原因")
|
||||
private String outSourceReason;
|
||||
|
||||
public String getOrderId() {
|
||||
return orderId;
|
||||
}
|
||||
|
||||
public void setOrderId(String orderId) {
|
||||
this.orderId = orderId;
|
||||
}
|
||||
|
||||
public String getOrderCode() {
|
||||
return orderCode;
|
||||
}
|
||||
|
||||
public void setOrderCode(String orderCode) {
|
||||
this.orderCode = orderCode;
|
||||
}
|
||||
|
||||
public String getEquipmentCode() {
|
||||
return equipmentCode;
|
||||
}
|
||||
|
||||
public void setEquipmentCode(String equipmentCode) {
|
||||
this.equipmentCode = equipmentCode;
|
||||
}
|
||||
|
||||
public String getOrderDesc() {
|
||||
return orderDesc;
|
||||
}
|
||||
|
||||
public void setOrderDesc(String orderDesc) {
|
||||
this.orderDesc = orderDesc;
|
||||
}
|
||||
|
||||
public Date getOrderBreakdownTime() {
|
||||
return orderBreakdownTime;
|
||||
}
|
||||
|
||||
public void setOrderBreakdownTime(Date orderBreakdownTime) {
|
||||
this.orderBreakdownTime = orderBreakdownTime;
|
||||
}
|
||||
|
||||
public String getOrderSource() {
|
||||
return orderSource;
|
||||
}
|
||||
|
||||
public void setOrderSource(String orderSource) {
|
||||
this.orderSource = orderSource;
|
||||
}
|
||||
|
||||
public Date getOrderTime() {
|
||||
return orderTime;
|
||||
}
|
||||
|
||||
public void setOrderTime(Date orderTime) {
|
||||
this.orderTime = orderTime;
|
||||
}
|
||||
|
||||
public String getOrderHandle() {
|
||||
return orderHandle;
|
||||
}
|
||||
|
||||
public void setOrderHandle(String orderHandle) {
|
||||
this.orderHandle = orderHandle;
|
||||
}
|
||||
|
||||
public String getOrderRepairmanCode() {
|
||||
return orderRepairmanCode;
|
||||
}
|
||||
|
||||
public void setOrderRepairmanCode(String orderRepairmanCode) {
|
||||
this.orderRepairmanCode = orderRepairmanCode;
|
||||
}
|
||||
|
||||
public String getOrderRepairmanName() {
|
||||
return orderRepairmanName;
|
||||
}
|
||||
|
||||
public void setOrderRepairmanName(String orderRepairmanName) {
|
||||
this.orderRepairmanName = orderRepairmanName;
|
||||
}
|
||||
|
||||
public String getOrderConnection() {
|
||||
return orderConnection;
|
||||
}
|
||||
|
||||
public void setOrderConnection(String orderConnection) {
|
||||
this.orderConnection = orderConnection;
|
||||
}
|
||||
|
||||
public String getOrderStatus() {
|
||||
return orderStatus;
|
||||
}
|
||||
|
||||
public void setOrderStatus(String orderStatus) {
|
||||
this.orderStatus = orderStatus;
|
||||
}
|
||||
|
||||
public String getOrderRelevance() {
|
||||
return orderRelevance;
|
||||
}
|
||||
|
||||
public void setOrderRelevance(String orderRelevance) {
|
||||
this.orderRelevance = orderRelevance;
|
||||
}
|
||||
|
||||
public String getOrderPicture() {
|
||||
return orderPicture;
|
||||
}
|
||||
|
||||
public void setOrderPicture(String orderPicture) {
|
||||
this.orderPicture = orderPicture;
|
||||
}
|
||||
|
||||
public String getAttr1() {
|
||||
return attr1;
|
||||
}
|
||||
|
||||
public void setAttr1(String attr1) {
|
||||
this.attr1 = attr1;
|
||||
}
|
||||
|
||||
public String getAttr2() {
|
||||
return attr2;
|
||||
}
|
||||
|
||||
public void setAttr2(String attr2) {
|
||||
this.attr2 = attr2;
|
||||
}
|
||||
|
||||
public String getAttr3() {
|
||||
return attr3;
|
||||
}
|
||||
|
||||
public void setAttr3(String attr3) {
|
||||
this.attr3 = attr3;
|
||||
}
|
||||
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
|
||||
public void setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getEquipmentTypeName() {
|
||||
return equipmentTypeName;
|
||||
}
|
||||
|
||||
public void setEquipmentTypeName(String equipmentTypeName) {
|
||||
this.equipmentTypeName = equipmentTypeName;
|
||||
}
|
||||
|
||||
public String getEquipmentLocation() {
|
||||
return equipmentLocation;
|
||||
}
|
||||
|
||||
public void setEquipmentLocation(String equipmentLocation) {
|
||||
this.equipmentLocation = equipmentLocation;
|
||||
}
|
||||
|
||||
public String getDepartment() {
|
||||
return department;
|
||||
}
|
||||
|
||||
public void setDepartment(String department) {
|
||||
this.department = department;
|
||||
}
|
||||
|
||||
public String getEquipmentSpec() {
|
||||
return equipmentSpec;
|
||||
}
|
||||
|
||||
public void setEquipmentSpec(String equipmentSpec) {
|
||||
this.equipmentSpec = equipmentSpec;
|
||||
}
|
||||
|
||||
public String getEquipmentName() {
|
||||
return equipmentName;
|
||||
}
|
||||
|
||||
public void setEquipmentName(String equipmentName) {
|
||||
this.equipmentName = equipmentName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCreateBy() {
|
||||
return createBy;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setCreateBy(String createBy) {
|
||||
this.createBy = createBy;
|
||||
}
|
||||
|
||||
public String getRepairDestination() {
|
||||
return repairDestination;
|
||||
}
|
||||
|
||||
public void setRepairDestination(String repairDestination) {
|
||||
this.repairDestination = repairDestination;
|
||||
}
|
||||
|
||||
public Date getWorkPlanTime() {
|
||||
return workPlanTime;
|
||||
}
|
||||
|
||||
public void setWorkPlanTime(Date workPlanTime) {
|
||||
this.workPlanTime = workPlanTime;
|
||||
}
|
||||
|
||||
public Date getWorkPlanDownTime() {
|
||||
return workPlanDownTime;
|
||||
}
|
||||
|
||||
public void setWorkPlanDownTime(Date workPlanDownTime) {
|
||||
this.workPlanDownTime = workPlanDownTime;
|
||||
}
|
||||
|
||||
public String getWorkDownMachine() {
|
||||
return workDownMachine;
|
||||
}
|
||||
|
||||
public void setWorkDownMachine(String workDownMachine) {
|
||||
this.workDownMachine = workDownMachine;
|
||||
}
|
||||
|
||||
public String getWorkPerson() {
|
||||
return workPerson;
|
||||
}
|
||||
|
||||
public void setWorkPerson(String workPerson) {
|
||||
this.workPerson = workPerson;
|
||||
}
|
||||
|
||||
public String getWorkTeam() {
|
||||
return workTeam;
|
||||
}
|
||||
|
||||
public void setWorkTeam(String workTeam) {
|
||||
this.workTeam = workTeam;
|
||||
}
|
||||
|
||||
public String getWorkId() {
|
||||
return workId;
|
||||
}
|
||||
|
||||
public void setWorkId(String workId) {
|
||||
this.workId = workId;
|
||||
}
|
||||
|
||||
public String getWorkCode() {
|
||||
return workCode;
|
||||
}
|
||||
|
||||
public void setWorkCode(String workCode) {
|
||||
this.workCode = workCode;
|
||||
}
|
||||
|
||||
public String getOutSourcePerson() {
|
||||
return outSourcePerson;
|
||||
}
|
||||
|
||||
public void setOutSourcePerson(String outSourcePerson) {
|
||||
this.outSourcePerson = outSourcePerson;
|
||||
}
|
||||
|
||||
public String getWorkOutsourcingUnit() {
|
||||
return workOutsourcingUnit;
|
||||
}
|
||||
|
||||
public void setWorkOutsourcingUnit(String workOutsourcingUnit) {
|
||||
this.workOutsourcingUnit = workOutsourcingUnit;
|
||||
}
|
||||
|
||||
public String getWorkConnection() {
|
||||
return workConnection;
|
||||
}
|
||||
|
||||
public void setWorkConnection(String workConnection) {
|
||||
this.workConnection = workConnection;
|
||||
}
|
||||
|
||||
public String getOutSourceReason() {
|
||||
return outSourceReason;
|
||||
}
|
||||
|
||||
public void setOutSourceReason(String outSourceReason) {
|
||||
this.outSourceReason = outSourceReason;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
package com.op.system.api.domain.device;
|
||||
|
||||
// 上位机报修DTO
|
||||
public class EquRepairOrderDTO {
|
||||
// 设备编码
|
||||
private String equipmentCode;
|
||||
// 工厂数据源
|
||||
private String factory;
|
||||
// 用户账号
|
||||
private String userName;
|
||||
// 用户名称
|
||||
private String userNickName;
|
||||
// 联系方式
|
||||
private String phoneNumber;
|
||||
|
||||
public String getUserNickName() {
|
||||
return userNickName;
|
||||
}
|
||||
|
||||
public void setUserNickName(String userNickName) {
|
||||
this.userNickName = userNickName;
|
||||
}
|
||||
|
||||
public String getUserName() {
|
||||
return userName;
|
||||
}
|
||||
|
||||
public void setUserName(String userName) {
|
||||
this.userName = userName;
|
||||
}
|
||||
|
||||
public String getPhoneNumber() {
|
||||
return phoneNumber;
|
||||
}
|
||||
|
||||
public void setPhoneNumber(String phoneNumber) {
|
||||
this.phoneNumber = phoneNumber;
|
||||
}
|
||||
|
||||
public String getFactory() {
|
||||
return factory;
|
||||
}
|
||||
|
||||
public void setFactory(String factory) {
|
||||
this.factory = factory;
|
||||
}
|
||||
|
||||
public String getEquipmentCode() {
|
||||
return equipmentCode;
|
||||
}
|
||||
|
||||
public void setEquipmentCode(String equipmentCode) {
|
||||
this.equipmentCode = equipmentCode;
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,170 @@
|
||||
package com.op.wms.domain;
|
||||
|
||||
import com.op.common.core.annotation.Excel;
|
||||
import com.op.common.core.web.domain.BaseEntity;
|
||||
import org.apache.commons.lang3.builder.ToStringBuilder;
|
||||
import org.apache.commons.lang3.builder.ToStringStyle;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* 备件设备关联对象 equ_auxiliaryEquipment_equipment
|
||||
*
|
||||
* @author Open Platform
|
||||
* @date 2023-10-24
|
||||
*/
|
||||
public class EquBindAuxiliaryEquipment extends BaseEntity {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
//主键
|
||||
private String id;
|
||||
|
||||
/** 备件编码 */
|
||||
@Excel(name = "备件编码")
|
||||
private String auxiliaryEquipmentCode;
|
||||
|
||||
/** 备件类型 */
|
||||
@Excel(name = "备件类型")
|
||||
private String auxiliaryEquipmentType;
|
||||
|
||||
/** 备件名称 */
|
||||
@Excel(name = "备件名称")
|
||||
private String auxiliaryEquipmentName;
|
||||
|
||||
/** 设备名称 */
|
||||
@Excel(name = "设备名称")
|
||||
private String equipmentName;
|
||||
|
||||
/** 设备编码 */
|
||||
@Excel(name = "设备编码")
|
||||
private String equipmentCode;
|
||||
|
||||
/** 备用字段1 */
|
||||
@Excel(name = "备用字段1")
|
||||
private String attr1;
|
||||
|
||||
/** 备用字段2 */
|
||||
@Excel(name = "备用字段2")
|
||||
private String attr2;
|
||||
|
||||
/** 备用字段3 */
|
||||
@Excel(name = "备用字段3")
|
||||
private String attr3;
|
||||
|
||||
/** 删除字段 */
|
||||
private String delFlag;
|
||||
|
||||
/** 工厂号 */
|
||||
@Excel(name = "工厂号")
|
||||
private String factoryCode;
|
||||
|
||||
private List<String> rightData;
|
||||
|
||||
public void setRightData(List<String> rightData) {
|
||||
this.rightData = rightData;
|
||||
}
|
||||
|
||||
public List<String> getRightData() {
|
||||
return rightData;
|
||||
}
|
||||
|
||||
public void setId(String id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public String getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public void setAuxiliaryEquipmentCode(String auxiliaryEquipmentCode) {
|
||||
this.auxiliaryEquipmentCode = auxiliaryEquipmentCode;
|
||||
}
|
||||
|
||||
public String getAuxiliaryEquipmentCode() {
|
||||
return auxiliaryEquipmentCode;
|
||||
}
|
||||
public void setAuxiliaryEquipmentType(String auxiliaryEquipmentType) {
|
||||
this.auxiliaryEquipmentType = auxiliaryEquipmentType;
|
||||
}
|
||||
|
||||
public String getAuxiliaryEquipmentType() {
|
||||
return auxiliaryEquipmentType;
|
||||
}
|
||||
public void setAuxiliaryEquipmentName(String auxiliaryEquipmentName) {
|
||||
this.auxiliaryEquipmentName = auxiliaryEquipmentName;
|
||||
}
|
||||
|
||||
public String getAuxiliaryEquipmentName() {
|
||||
return auxiliaryEquipmentName;
|
||||
}
|
||||
public void setEquipmentName(String equipmentName) {
|
||||
this.equipmentName = equipmentName;
|
||||
}
|
||||
|
||||
public String getEquipmentName() {
|
||||
return equipmentName;
|
||||
}
|
||||
public void setEquipmentCode(String equipmentCode) {
|
||||
this.equipmentCode = equipmentCode;
|
||||
}
|
||||
|
||||
public String getEquipmentCode() {
|
||||
return equipmentCode;
|
||||
}
|
||||
public void setAttr1(String attr1) {
|
||||
this.attr1 = attr1;
|
||||
}
|
||||
|
||||
public String getAttr1() {
|
||||
return attr1;
|
||||
}
|
||||
public void setAttr2(String attr2) {
|
||||
this.attr2 = attr2;
|
||||
}
|
||||
|
||||
public String getAttr2() {
|
||||
return attr2;
|
||||
}
|
||||
public void setAttr3(String attr3) {
|
||||
this.attr3 = attr3;
|
||||
}
|
||||
|
||||
public String getAttr3() {
|
||||
return attr3;
|
||||
}
|
||||
public void setDelFlag(String delFlag) {
|
||||
this.delFlag = delFlag;
|
||||
}
|
||||
|
||||
public String getDelFlag() {
|
||||
return delFlag;
|
||||
}
|
||||
public void setFactoryCode(String factoryCode) {
|
||||
this.factoryCode = factoryCode;
|
||||
}
|
||||
|
||||
public String getFactoryCode() {
|
||||
return factoryCode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
.append("id", getId())
|
||||
.append("auxiliaryEquipmentCode", getAuxiliaryEquipmentCode())
|
||||
.append("auxiliaryEquipmentType", getAuxiliaryEquipmentType())
|
||||
.append("auxiliaryEquipmentName", getAuxiliaryEquipmentName())
|
||||
.append("equipmentName", getEquipmentName())
|
||||
.append("equipmentCode", getEquipmentCode())
|
||||
.append("attr1", getAttr1())
|
||||
.append("attr2", getAttr2())
|
||||
.append("attr3", getAttr3())
|
||||
.append("delFlag", getDelFlag())
|
||||
.append("createBy", getCreateBy())
|
||||
.append("createTime", getCreateTime())
|
||||
.append("updateBy", getUpdateBy())
|
||||
.append("updateTime", getUpdateTime())
|
||||
.append("factoryCode", getFactoryCode())
|
||||
.toString();
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue