open模块修改引用device的类

master
Yangwl 2 months ago
parent 1ebe3e9854
commit 05c5bec45d

@ -0,0 +1,619 @@
package com.op.open.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
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.Date;
/**
* base_equipment
*
* @author Open Platform
* @date 2023-10-17
*/
public class EquEquipmentBo extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* ID
*/
private Long equipmentId;
/**
*
*/
@Excel(name = "设备编码")
private String equipmentCode;
/**
*
*/
@Excel(name = "设备名称")
private String equipmentName;
/**
*
*/
@Excel(name = "品牌")
private String equipmentBrand;
/**
*
*/
@Excel(name = "规格型号")
private String equipmentSpec;
/**
* ID
*/
@Excel(name = "设备类型ID")
private Long equipmentTypeId;
/**
*
*/
@Excel(name = "设备类型编码")
private String equipmentTypeCode;
/**
*
*/
@Excel(name = "设备类型名称")
private String equipmentTypeName;
/**
* ID
*/
@Excel(name = "所属车间ID")
private Long workshopId;
/**
*
*/
@Excel(name = "所属工作中心编码")
private String workshopCode;
/**
*
*/
@Excel(name = "所属工作中心名称")
private String workshopName;
/**
* ,0
*/
@Excel(name = "设备状态,0异常")
private String status;
/**
* 1
*/
@Excel(name = "预留字段1")
private String attr1;
/**
* 2
*/
@Excel(name = "预留字段2")
private String attr2;
/**
* 3
*/
@Excel(name = "预留字段3")
private String attr3;
/**
* 4
*/
@Excel(name = "预留字段4")
private String attr4;
/**
*
*/
@Excel(name = "工段")
private String workshopSection;
/**
*
*/
@Excel(name = "设备位置")
private String equipmentLocation;
/**
*
*/
@Excel(name = "工时单价")
private Long hourlyUnitPrice;
/**
*
*/
@Excel(name = "设备条码")
private String equipmentBarcode;
/**
*
*/
@Excel(name = "设备条码图片")
private String equipmentBarcodeImage;
/**
*
*/
@Excel(name = "生产厂商")
private String manufacturer;
/**
*
*/
@Excel(name = "供应商")
private String supplier;
/**
* 使寿
*/
@Excel(name = "使用寿命")
private String useLife;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "购买时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date buyTime;
/**
*
*/
@Excel(name = "资产原值")
private String assetOriginalValue;
/**
*
*/
@Excel(name = "资产净值")
private String netAssetValue;
/**
*
*/
@Excel(name = "资产负责人")
private String assetHead;
/**
*
*/
@Excel(name = "固定资产编码")
private String fixedAssetCode;
/**
*
*/
@Excel(name = "部门")
private String department;
/**
*
*/
@Excel(name = "单台能力工时")
private String unitWorkingHours;
/**
* PLCIP
*/
@Excel(name = "PLCIP")
private String plcIp;
/**
* PLC
*/
@Excel(name = "PLC端口")
private Long plcPort;
/**
* 1,0
*/
private String delFlag;
/**
* SAP
*/
@Excel(name = "SAP资产号")
private String sapAsset;
/**
*
*/
@Excel(name = "设备状态")
private String equipmentStatus;
// 设备组线/辅助设备标识
private String equipmentCategory;
// 组线编码
private String groupLine;
// 组线名称
private String groupLineName;
//虚拟字段
private String itemCode;
private String itemName;
public String getItemCode() {
return itemCode;
}
public void setItemCode(String itemCode) {
this.itemCode = itemCode;
}
public String getItemName() {
return itemName;
}
public void setItemName(String itemName) {
this.itemName = itemName;
}
public String getGroupLineName() {
return groupLineName;
}
public void setGroupLineName(String groupLineName) {
this.groupLineName = groupLineName;
}
public String getGroupLine() {
return groupLine;
}
public void setGroupLine(String groupLine) {
this.groupLine = groupLine;
}
public String getEquipmentCategory() {
return equipmentCategory;
}
public void setEquipmentCategory(String equipmentCategory) {
this.equipmentCategory = equipmentCategory;
}
public void setEquipmentId(Long equipmentId) {
this.equipmentId = equipmentId;
}
public Long getEquipmentId() {
return equipmentId;
}
public void setEquipmentCode(String equipmentCode) {
this.equipmentCode = equipmentCode;
}
public String getEquipmentCode() {
return equipmentCode;
}
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentBrand(String equipmentBrand) {
this.equipmentBrand = equipmentBrand;
}
public String getEquipmentBrand() {
return equipmentBrand;
}
public void setEquipmentSpec(String equipmentSpec) {
this.equipmentSpec = equipmentSpec;
}
public String getEquipmentSpec() {
return equipmentSpec;
}
public void setEquipmentTypeId(Long equipmentTypeId) {
this.equipmentTypeId = equipmentTypeId;
}
public Long getEquipmentTypeId() {
return equipmentTypeId;
}
public void setEquipmentTypeCode(String equipmentTypeCode) {
this.equipmentTypeCode = equipmentTypeCode;
}
public String getEquipmentTypeCode() {
return equipmentTypeCode;
}
public void setEquipmentTypeName(String equipmentTypeName) {
this.equipmentTypeName = equipmentTypeName;
}
public String getEquipmentTypeName() {
return equipmentTypeName;
}
public void setWorkshopId(Long workshopId) {
this.workshopId = workshopId;
}
public Long getWorkshopId() {
return workshopId;
}
public void setWorkshopCode(String workshopCode) {
this.workshopCode = workshopCode;
}
public String getWorkshopCode() {
return workshopCode;
}
public void setWorkshopName(String workshopName) {
this.workshopName = workshopName;
}
public String getWorkshopName() {
return workshopName;
}
public void setStatus(String status) {
this.status = status;
}
public String getStatus() {
return status;
}
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 setAttr4(String attr4) {
this.attr4 = attr4;
}
public String getAttr4() {
return attr4;
}
public void setWorkshopSection(String workshopSection) {
this.workshopSection = workshopSection;
}
public String getWorkshopSection() {
return workshopSection;
}
public void setEquipmentLocation(String equipmentLocation) {
this.equipmentLocation = equipmentLocation;
}
public String getEquipmentLocation() {
return equipmentLocation;
}
public void setHourlyUnitPrice(Long hourlyUnitPrice) {
this.hourlyUnitPrice = hourlyUnitPrice;
}
public Long getHourlyUnitPrice() {
return hourlyUnitPrice;
}
public void setEquipmentBarcode(String equipmentBarcode) {
this.equipmentBarcode = equipmentBarcode;
}
public String getEquipmentBarcode() {
return equipmentBarcode;
}
public void setEquipmentBarcodeImage(String equipmentBarcodeImage) {
this.equipmentBarcodeImage = equipmentBarcodeImage;
}
public String getEquipmentBarcodeImage() {
return equipmentBarcodeImage;
}
public void setManufacturer(String manufacturer) {
this.manufacturer = manufacturer;
}
public String getManufacturer() {
return manufacturer;
}
public void setSupplier(String supplier) {
this.supplier = supplier;
}
public String getSupplier() {
return supplier;
}
public void setUseLife(String useLife) {
this.useLife = useLife;
}
public String getUseLife() {
return useLife;
}
public void setBuyTime(Date buyTime) {
this.buyTime = buyTime;
}
public Date getBuyTime() {
return buyTime;
}
public void setAssetOriginalValue(String assetOriginalValue) {
this.assetOriginalValue = assetOriginalValue;
}
public String getAssetOriginalValue() {
return assetOriginalValue;
}
public void setNetAssetValue(String netAssetValue) {
this.netAssetValue = netAssetValue;
}
public String getNetAssetValue() {
return netAssetValue;
}
public void setAssetHead(String assetHead) {
this.assetHead = assetHead;
}
public String getAssetHead() {
return assetHead;
}
public void setFixedAssetCode(String fixedAssetCode) {
this.fixedAssetCode = fixedAssetCode;
}
public String getFixedAssetCode() {
return fixedAssetCode;
}
public void setDepartment(String department) {
this.department = department;
}
public String getDepartment() {
return department;
}
public void setUnitWorkingHours(String unitWorkingHours) {
this.unitWorkingHours = unitWorkingHours;
}
public String getUnitWorkingHours() {
return unitWorkingHours;
}
public void setPlcIp(String plcIp) {
this.plcIp = plcIp;
}
public String getPlcIp() {
return plcIp;
}
public void setPlcPort(Long plcPort) {
this.plcPort = plcPort;
}
public Long getPlcPort() {
return plcPort;
}
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
}
public void setSapAsset(String sapAsset) {
this.sapAsset = sapAsset;
}
public String getSapAsset() {
return sapAsset;
}
//设备状态
public void setEquipmentStatus(String equipmentStatus) {
this.equipmentStatus = equipmentStatus;
}
public String getEquipmentStatus() {
return equipmentStatus;
}
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("equipmentId", getEquipmentId())
.append("equipmentCode", getEquipmentCode())
.append("equipmentName", getEquipmentName())
.append("equipmentBrand", getEquipmentBrand())
.append("equipmentSpec", getEquipmentSpec())
.append("equipmentTypeId", getEquipmentTypeId())
.append("equipmentTypeCode", getEquipmentTypeCode())
.append("equipmentTypeName", getEquipmentTypeName())
.append("workshopId", getWorkshopId())
.append("workshopCode", getWorkshopCode())
.append("workshopName", getWorkshopName())
.append("status", getStatus())
.append("remark", getRemark())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("attr4", getAttr4())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
.append("workshopSection", getWorkshopSection())
.append("equipmentLocation", getEquipmentLocation())
.append("hourlyUnitPrice", getHourlyUnitPrice())
.append("equipmentBarcode", getEquipmentBarcode())
.append("equipmentBarcodeImage", getEquipmentBarcodeImage())
.append("manufacturer", getManufacturer())
.append("supplier", getSupplier())
.append("useLife", getUseLife())
.append("buyTime", getBuyTime())
.append("assetOriginalValue", getAssetOriginalValue())
.append("netAssetValue", getNetAssetValue())
.append("assetHead", getAssetHead())
.append("fixedAssetCode", getFixedAssetCode())
.append("department", getDepartment())
.append("unitWorkingHours", getUnitWorkingHours())
.append("plcIp", getPlcIp())
.append("plcPort", getPlcPort())
.append("delFlag", getDelFlag())
.append("sapAsset", getSapAsset())
.toString();
}
}

@ -0,0 +1,712 @@
package com.op.open.domain;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.op.common.core.annotation.Excel;
import com.op.common.core.domain.BaseFileData;
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.Date;
import java.util.List;
/**
* equ_repair_work_order
*
* @author
* @date 2023-10-19
*/
public class EquRepairWorkOrderBo extends BaseEntity {
private static final long serialVersionUID = 1L;
@Excel(name = "维修主键")
private String workId;
@Excel(name = "报修主键")
private String orderId;
@Excel(name = "维修单号")
private String workCode;
@Excel(name = "报修单号")
private String orderCode;
@Excel(name = "是否立即处理")
private String workHandle;
@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 orderRelevance;
@Excel(name = "维修人员工号")
private String workPerson;
@Excel(name = "维修人员姓名")
private String workPersonName;
@Excel(name = "维修组")
private String workTeam;
@Excel(name = "是否委外")
private String workOutsource;
@Excel(name = "是否停机维修")
private String workDownMachine;
@Excel(name = "设备编码")
private String equipmentCode;
@Excel(name = "原因分析")
private String workReason;
@Excel(name = "故障描述")
private String workFaultDesc;
@Excel(name = "维修用时")
private String workCostTime;
@Excel(name = "维修费用")
private String workCost;
@Excel(name = "委外工单id")
private String outWorkId;
@Excel(name = "委外工单编码")
private String outWorkCode;
@Excel(name = "备用字段1")
private String attr1;
@Excel(name = "备用字段2")
private String attr2;
@Excel(name = "备用字段3")
private String attr3;
@Excel(name = "删除标志")
private String delFlag;
@Excel(name = "工厂编码")
private String factoryCode;
@Excel(name = "维修状态")
private String workStatus;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "维修开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date workStartTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "维修结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date workEndTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "维修实际开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date actualDownStartTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "维修实际结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date actualDownEndTime;
@Excel(name = "联系方式")
private String workConnection;
@Excel(name = "故障类型")
private String faultType;
@Excel(name = "设备状态描述")
private String equipmentStatusDescription;
@Excel(name = "维修措施")
private String repairMeasures;
@Excel(name = "故障停机时间")
private String faultDownTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "故障开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date faultStartTime;
@Excel(name = "结果检验")//也就是审核
private String resultInspect;
@Excel(name = "备注")
private String remark;
@Excel(name = "审核意见")
private String auditOpinion;
/////////////////////////////////////////////////////////设备表字段
@Excel(name = "设备名称")
private String equipmentName;//设备名称
private String bindEquipmentName;
private String equipmentSpec;//规格型号
private String equipmentTypeName;//设备类型名称
private String equipmentLocation;//设备位置
private String department;//部门
private String workshopCode;//所属工作中心编码
private String workshopName;//所属工作中心名称
/////////////////////////////////////////////////////////////报修表
private String orderDesc;//故障描述
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date orderBreakdownTime;//故障时间
private String orderSource;//报修来源
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date orderTime;//报修时间
private String orderRepairmanCode;//报修人
private String orderConnection;//报修人联系方式
//////////////////////////////////////////////////////////////班组表
@Excel(name = "班组名称")
private String teamName;//班组名称
@Excel(name = "班组人员")
private String teamPerson;//班组人员
/////////////////////////////////////////////////////////////时间列表 虚拟字段
private List<Date> workPlanTimeArray;
private List<Date> workPlanDownTimeArray;
private String workPlanTimeStart;//计划开始时间、结束时间
private String workPlanTimeEnd;
private String workPlanDownTimeStart; //计划停机开始时间、结束时间
private String workPlanDownTimeEnd;
///////////////////////////////////////////////////////////委外
private String outSourcePerson;//委外人员
private String outSourceReason;//委外维修原因
private String workOutsourcingUnit;//委外单位
private String outSourceConnection;//联系方式
//手持
private String userId;//用户id
//维修前照片
private String beforeRepairFile;
private List<BaseFileData> beforeRepairFiles;
//维修后照片
private String afterRepairFile;
private List<BaseFileData> afterRepairFiles;
//图片文件
private String fileList;
private List<BaseFileData> files;
public String getBindEquipmentName() {
return bindEquipmentName;
}
public void setBindEquipmentName(String bindEquipmentName) {
this.bindEquipmentName = bindEquipmentName;
}
//维修前 维修后
public String getAfterRepairFile() {
return afterRepairFile;
}
public void setAfterRepairFile(String afterRepairFile) {
this.afterRepairFile = afterRepairFile;
}
public List<BaseFileData> getAfterRepairFiles() {
return afterRepairFiles;
}
public void setAfterRepairFiles(List<BaseFileData> afterRepairFiles) {
this.afterRepairFiles = afterRepairFiles;
}
public String getBeforeRepairFile() {
return beforeRepairFile;
}
public void setBeforeRepairFile(String beforeRepairFile) {
this.beforeRepairFile = beforeRepairFile;
}
public List<BaseFileData> getBeforeRepairFiles() {
return beforeRepairFiles;
}
public void setBeforeRepairFiles(List<BaseFileData> beforeRepairFiles) { this.beforeRepairFiles = beforeRepairFiles; }
//报修
public void setOrderDesc(String orderDesc) {
this.orderDesc = orderDesc;
}
public String getOrderDesc() {
return orderDesc;
}
public void setOrderBreakdownTime(Date orderBreakdownTime) {
this.orderBreakdownTime = orderBreakdownTime;
}
public Date getOrderBreakdownTime() {
return orderBreakdownTime;
}
public void setOrderSource(String orderSource) {
this.orderSource = orderSource;
}
public String getOrderSource() {
return orderSource;
}
public void setOrderTime(Date orderTime) {
this.orderTime = orderTime;
}
public Date getOrderTime() {
return orderTime;
}
public void setOrderRepairmanCode(String orderRepairmanCode) {
this.orderRepairmanCode = orderRepairmanCode;
}
public String getOrderRepairmanCode() {
return orderRepairmanCode;
}
public void setOrderConnection(String orderConnection) {
this.orderConnection = orderConnection;
}
public String getOrderConnection() {
return orderConnection;
}
//设备
public void setEquipmentName(String equipmentName) {
this.equipmentName = equipmentName;
}
public String getEquipmentName() {
return equipmentName;
}
public void setEquipmentSpec(String equipmentSpec) {
this.equipmentSpec = equipmentSpec;
}
public String getEquipmentSpec() {
return equipmentSpec;
}
public void setEquipmentTypeName(String equipmentTypeName) {
this.equipmentTypeName = equipmentTypeName;
}
public String getEquipmentTypeName() {
return equipmentTypeName;
}
public void setEquipmentLocation(String equipmentLocation) {
this.equipmentLocation = equipmentLocation;
}
public String getEquipmentLocation() {
return equipmentLocation;
}
public void setDepartment(String department) {
this.department = department;
}
public String getDepartment() {
return department;
}
public void setWorkshopCode(String workshopCode) {
this.workshopCode = workshopCode;
}
public String getWorkshopCode() {
return workshopCode;
}
public void setWorkshopName(String workshopName) {
this.workshopName = workshopName;
}
public String getWorkshopName() {
return workshopName;
}
//维修工单
public void setWorkId(String workId) {
this.workId = workId;
}
public String getWorkId() {
return workId;
}
public void setOrderId(String orderId) {
this.orderId = orderId;
}
public String getOrderId() {
return orderId;
}
public void setWorkCode(String workCode) {
this.workCode = workCode;
}
public String getWorkCode() {
return workCode;
}
public void setOrderCode(String orderCode) {
this.orderCode = orderCode;
}
public String getOrderCode() {
return orderCode;
}
public void setWorkHandle(String workHandle) {
this.workHandle = workHandle;
}
public String getWorkHandle() {
return workHandle;
}
public void setWorkPlanTime(Date workPlanTime) {
this.workPlanTime = workPlanTime;
}
public Date getWorkPlanTime() {
return workPlanTime;
}
public void setWorkPlanDownTime(Date workPlanDownTime) {
this.workPlanDownTime = workPlanDownTime;
}
public Date getWorkPlanDownTime() {
return workPlanDownTime;
}
public void setOrderRelevance(String orderRelevance) {
this.orderRelevance = orderRelevance;
}
public String getOrderRelevance() {
return orderRelevance;
}
public void setWorkPerson(String workPerson) {
this.workPerson = workPerson;
}
public String getWorkPerson() {
return workPerson;
}
public void setWorkPersonName(String workPersonName) {
this.workPersonName = workPersonName;
}
public String getWorkPersonName() {
return workPersonName;
}
public void setWorkTeam(String workTeam) {
this.workTeam = workTeam;
}
public String getWorkTeam() {
return workTeam;
}
public void setWorkOutsource(String workOutsource) {
this.workOutsource = workOutsource;
}
public String getWorkOutsource() {
return workOutsource;
}
public void setWorkDownMachine(String workDownMachine) {
this.workDownMachine = workDownMachine;
}
public String getWorkDownMachine() {
return workDownMachine;
}
public void setEquipmentCode(String equipmentCode) {
this.equipmentCode = equipmentCode;
}
public String getEquipmentCode() {
return equipmentCode;
}
public void setWorkReason(String workReason) {
this.workReason = workReason;
}
public String getWorkReason() {
return workReason;
}
public void setWorkFaultDesc(String workFaultDesc) {
this.workFaultDesc = workFaultDesc;
}
public String getWorkFaultDesc() {
return workFaultDesc;
}
public void setWorkCostTime(String workCostTime) {
this.workCostTime = workCostTime;
}
public String getWorkCostTime() {
return workCostTime;
}
public void setWorkCost(String workCost) {
this.workCost = workCost;
}
public String getWorkCost() {
return workCost;
}
public void setOutWorkId(String outWorkId) {
this.outWorkId = outWorkId;
}
public String getOutWorkId() {
return outWorkId;
}
public void setOutWorkCode(String outWorkCode) {
this.outWorkCode = outWorkCode;
}
public String getOutWorkCode() {
return outWorkCode;
}
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;
}
public void setWorkStatus(String workStatus) {
this.workStatus = workStatus;
}
public String getWorkStatus() {
return workStatus;
}
public void setWorkStartTime(Date workStartTime) {
this.workStartTime = workStartTime;
}
public Date getWorkStartTime() {
return workStartTime;
}
public void setWorkEndTime(Date workEndTime) {
this.workEndTime = workEndTime;
}
public Date getWorkEndTime() {
return workEndTime;
}
public void setWorkConnection(String workConnection) {
this.workConnection = workConnection;
}
public String getWorkConnection() {
return workConnection;
}
//班组
public void setTeamName(String teamName) {
this.teamName = teamName;
}
public String getTeamName() {
return teamName;
}
public void setTeamPerson(String teamPerson) {
this.teamPerson = teamPerson;
}
public String getTeamPerson() {
return teamPerson;
}
//时间列表
public List<Date> getWorkPlanTimeArray() {
return workPlanTimeArray;
}
public void setWorkPlanTimeArray(List<Date> workPlanTimeArray) {
this.workPlanTimeArray = workPlanTimeArray;
}
public List<Date> getWorkPlanDownTimeArray() {
return workPlanDownTimeArray;
}
public void setWorkPlanDownTimeArray(List<Date> workPlanDownTimeArray) { this.workPlanDownTimeArray = workPlanDownTimeArray; }
//计划开始时间、结束时间
public String getWorkPlanDownTimeStart() {
return workPlanDownTimeStart;
}
public void setWorkPlanDownTimeStart(String workPlanDownTimeStart) { this.workPlanDownTimeStart = workPlanDownTimeStart; }
public String getWorkPlanDownTimeEnd() {
return workPlanDownTimeEnd;
}
public void setWorkPlanDownTimeEnd(String workPlanDownTimeEnd) {
this.workPlanDownTimeEnd = workPlanDownTimeEnd;
}
//实际停机开始时间、结束时间
public Date getActualDownStartTime() {
return actualDownStartTime;
}
public void setActualDownStartTime(Date actualDownStartTime) {
this.actualDownStartTime = actualDownStartTime;
}
public Date getActualDownEndTime() {
return actualDownEndTime;
}
public void setActualDownEndTime(Date actualDownEndTime) {
this.actualDownEndTime = actualDownEndTime;
}
//停机开始时间、结束时间
public String getWorkPlanTimeStart() { return workPlanTimeStart; }
public void setWorkPlanTimeStart(String workPlanTimeStart) { this.workPlanTimeStart = workPlanTimeStart; }
public String getWorkPlanTimeEnd() { return workPlanTimeEnd; }
public void setWorkPlanTimeEnd(String workPlanTimeEnd) { this.workPlanTimeEnd = workPlanTimeEnd; }
public String getFaultType() { return faultType; }
public void setFaultType(String faultType) { this.faultType = faultType; }
public String getEquipmentStatusDescription() { return equipmentStatusDescription; }
public void setEquipmentStatusDescription(String equipmentStatusDescription) { this.equipmentStatusDescription = equipmentStatusDescription; }
public String getRepairMeasures() { return repairMeasures; }
public void setRepairMeasures(String repairMeasures) { this.repairMeasures = repairMeasures; }
public String getFaultDownTime() { return faultDownTime; }
public void setFaultDownTime(String faultDownTime) { this.faultDownTime = faultDownTime; }
public Date getFaultStartTime() { return faultStartTime; }
public void setFaultStartTime(Date faultStartTime) { this.faultStartTime = faultStartTime; }
public String getResultInspect() { return resultInspect; }
public void setResultInspect(String resultInspect) { this.resultInspect = resultInspect; }
//新增 审核意见
public String getAuditOpinion() {
return auditOpinion;
}
public void setAuditOpinion(String auditOpinion) {
this.auditOpinion = auditOpinion;
}
//委外
public void setOutSourceReason(String outSourceReason) {
this.outSourceReason = outSourceReason;
}
public String getOutSourceReason() {
return outSourceReason;
}
public void setOutSourcePerson(String outSourcePerson) {
this.outSourcePerson = outSourcePerson;
}
public String getOutSourcePerson() {
return outSourcePerson;
}
public void setWorkOutsourcingUnit(String workOutsourcingUnit) {
this.workOutsourcingUnit = workOutsourcingUnit;
}
public String getWorkOutsourcingUnit() {
return workOutsourcingUnit;
}
public void setOutSourceConnection(String outSourceConnection) {
this.outSourceConnection = outSourceConnection;
}
public String getOutSourceConnection() {
return outSourceConnection;
}
//手持 用户userId
public void setUserId(String userId) {
this.userId = userId;
}
public String getUserId() {
return userId;
}
//图片文件
public String getFileList() { return fileList; }
public void setFileList(String fileList) { this.fileList = fileList; }
public List<BaseFileData> getFiles() { return files; }
public void setFiles(List<BaseFileData> files) { this.files = files; }
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
.append("workId", getWorkId())
.append("orderId", getOrderId())
.append("workCode", getWorkCode())
.append("orderCode", getOrderCode())
.append("workHandle", getWorkHandle())
.append("workPlanTime", getWorkPlanTime())
.append("workPlanDownTime", getWorkPlanDownTime())
.append("orderRelevance", getOrderRelevance())
.append("workPerson", getWorkPerson())
.append("workTeam", getWorkTeam())
.append("workOutsource", getWorkOutsource())
.append("workDownMachine", getWorkDownMachine())
.append("equipmentCode", getEquipmentCode())
.append("workReason", getWorkReason())
.append("workFaultDesc", getWorkFaultDesc())
.append("workCostTime", getWorkCostTime())
.append("workCost", getWorkCost())
.append("outWorkId", getOutWorkId())
.append("outWorkCode", getOutWorkCode())
.append("attr1", getAttr1())
.append("attr2", getAttr2())
.append("attr3", getAttr3())
.append("createBy", getCreateBy())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.append("updateBy", getUpdateBy())
.append("delFlag", getDelFlag())
.append("factoryCode", getFactoryCode())
.toString();
}
}

@ -1,7 +1,9 @@
package com.op.open.mapper;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.open.domain.EquEquipmentBo;
import com.op.open.domain.EquRepairWorkOrderBo;
import com.op.system.api.domain.SysNoticeGroup;
import com.op.system.api.domain.SysSapLog;
import com.op.system.api.domain.device.DeviceRepairOrder;
@ -102,11 +104,11 @@ public interface OpenMapper {
String getProductGroup(String materialCode);
void insertEquRepairWorkOrders(EquRepairWorkOrder equRepairWorkOrder);
void insertEquRepairWorkOrders(EquRepairWorkOrderBo equRepairWorkOrderBo);
void updateEquipmentStatuss(EquEquipment equEquipment);
void updateEquipmentStatuss(EquEquipmentBo equEquipment);
EquEquipment selectEquEquipmentByEquEquipmentCode(String equipmentCode);
EquEquipmentBo selectEquEquipmentByEquEquipmentCode(String equipmentCode);
//
// int updateEquBatchs(@Param("list") List<EquEquipmentDTO> updates);
//

@ -8,19 +8,18 @@ import com.alibaba.fastjson2.JSONWriter;
import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
import com.op.common.core.constant.Constants;
import com.op.common.core.utils.DateUtils;
import com.op.common.core.utils.StringUtils;
import com.op.common.core.utils.bean.BeanUtils;
import com.op.common.core.utils.http.HttpUtils;
import com.op.common.core.utils.uuid.IdUtils;
import com.op.common.core.web.domain.AjaxResult;
import com.op.common.security.utils.SecurityUtils;
import com.op.device.domain.EquEquipment;
import com.op.device.domain.EquRepairWorkOrder;
import com.op.device.mapper.EquEquipmentMapper;
import com.op.device.mapper.EquRepairOrderMapper;
import com.op.device.mapper.EquRepairWorkOrderMapper;
import com.op.open.domain.EquEquipmentBo;
import com.op.open.domain.EquRepairWorkOrderBo;
import com.op.open.mapper.OpenMapper;
import com.op.open.service.OpenService;
import com.op.system.api.RemoteDeviceService;
import com.op.system.api.RemoteOpenService;
import com.op.system.api.domain.SysNoticeGroup;
import com.op.system.api.domain.device.DeviceRepairOrder;
@ -32,9 +31,8 @@ import com.op.system.api.domain.dto.WechartDTO;
import com.op.system.api.domain.mes.BaseProductDTO;
import com.op.system.api.domain.mes.ProRfidProcessDetail;
import com.op.system.api.domain.quality.*;
import com.op.system.api.domain.sap.SapCustom;
import com.op.system.api.domain.sap.SapSupplier;
import org.apache.commons.lang.StringUtils;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
@ -49,11 +47,10 @@ import org.springframework.web.context.request.RequestContextHolder;
import org.springframework.web.context.request.ServletRequestAttributes;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.*;
import java.util.concurrent.CompletableFuture;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@ -95,13 +92,6 @@ public class OpenServiceImpl implements OpenService {
private OpenMapper openMapper;
@Autowired
private EquRepairOrderMapper equRepairOrderMapper;
@Autowired
private EquEquipmentMapper equEquipmentMapper;
@Autowired
private RemoteOpenService remoteOpenService;
@ -345,43 +335,43 @@ public class OpenServiceImpl implements OpenService {
//自动审核生成维修单
String code = equRepairOrder.getOrderCode().substring(10);
String workCode = DateUtils.dateTimeNow(DateUtils.YYYYMMDD) + code;
EquRepairWorkOrder equRepairWorkOrder = new EquRepairWorkOrder();
equRepairWorkOrder.setWorkId(IdUtils.fastSimpleUUID()); //维修工单id
equRepairWorkOrder.setOrderId(equRepairOrder.getOrderId()); //报修Id
equRepairWorkOrder.setOrderCode(equRepairOrder.getOrderCode()); //报修单号
equRepairWorkOrder.setWorkCode("WX" + workCode); //维修单号
equRepairWorkOrder.setEquipmentCode(equRepairOrder.getEquipmentCode()); //设备编码
equRepairWorkOrder.setWorkTeam(equRepairOrder.getWorkTeam()); //维修组
equRepairWorkOrder.setWorkOutsource("0"); //不委外
equRepairWorkOrder.setOutWorkCode("无"); //无委外工单号
equRepairWorkOrder.setWorkHandle("1"); //是否立即维修 1是 0 否
equRepairWorkOrder.setWorkPlanTime(equRepairOrder.getWorkPlanTime()); //计划维修时间
equRepairWorkOrder.setWorkPlanDownTime(DateUtils.getNowDate());
EquRepairWorkOrderBo equRepairWorkOrderBo = new EquRepairWorkOrderBo();
equRepairWorkOrderBo.setWorkId(IdUtils.fastSimpleUUID()); //维修工单id
equRepairWorkOrderBo.setOrderId(equRepairOrder.getOrderId()); //报修Id
equRepairWorkOrderBo.setOrderCode(equRepairOrder.getOrderCode()); //报修单号
equRepairWorkOrderBo.setWorkCode("WX" + workCode); //维修单号
equRepairWorkOrderBo.setEquipmentCode(equRepairOrder.getEquipmentCode()); //设备编码
equRepairWorkOrderBo.setWorkTeam(equRepairOrder.getWorkTeam()); //维修组
equRepairWorkOrderBo.setWorkOutsource("0"); //不委外
equRepairWorkOrderBo.setOutWorkCode("无"); //无委外工单号
equRepairWorkOrderBo.setWorkHandle("1"); //是否立即维修 1是 0 否
equRepairWorkOrderBo.setWorkPlanTime(equRepairOrder.getWorkPlanTime()); //计划维修时间
equRepairWorkOrderBo.setWorkPlanDownTime(DateUtils.getNowDate());
if (equRepairOrder.getWorkPlanDownTime() != null) { //是否停机维修 停机维修时间
equRepairWorkOrder.setWorkDownMachine("1");
equRepairWorkOrder.setWorkPlanDownTime(equRepairOrder.getWorkPlanDownTime());
equRepairWorkOrderBo.setWorkDownMachine("1");
equRepairWorkOrderBo.setWorkPlanDownTime(equRepairOrder.getWorkPlanDownTime());
} else {
equRepairWorkOrder.setWorkDownMachine("0");
equRepairWorkOrderBo.setWorkDownMachine("0");
}
equRepairWorkOrder.setWorkFaultDesc(equRepairOrder.getOrderDesc());
equRepairWorkOrder.setWorkStatus("0"); //工单状态 待维修
equRepairWorkOrder.setCreateTime(DateUtils.getNowDate());
equRepairWorkOrder.setCreateBy(SecurityUtils.getUsername());
equRepairWorkOrderBo.setWorkFaultDesc(equRepairOrder.getOrderDesc());
equRepairWorkOrderBo.setWorkStatus("0"); //工单状态 待维修
equRepairWorkOrderBo.setCreateTime(DateUtils.getNowDate());
equRepairWorkOrderBo.setCreateBy(SecurityUtils.getUsername());
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
String key = "#header.poolName";
equRepairWorkOrder.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
openMapper.insertEquRepairWorkOrders(equRepairWorkOrder);
equRepairWorkOrderBo.setFactoryCode(request.getHeader(key.substring(8)).replace("ds_", ""));
openMapper.insertEquRepairWorkOrders(equRepairWorkOrderBo);
////审核结果
equRepairOrder.setOrderStatus("1");
////更新设备状态
EquEquipment equEquipment = new EquEquipment();
EquEquipmentBo equEquipment = new EquEquipmentBo();
equEquipment.setEquipmentCode(equRepairOrder.getEquipmentCode());
equEquipment.setEquipmentStatus("0"); //0故障
openMapper.updateEquipmentStatuss(equEquipment);
AjaxResult repairSendWeChatResult = repairSendWeChat(equRepairWorkOrder);
AjaxResult repairSendWeChatResult = repairSendWeChat(equRepairWorkOrderBo);
@ -470,7 +460,7 @@ public class OpenServiceImpl implements OpenService {
/**
*
*/
public AjaxResult repairSendWeChat(EquRepairWorkOrder equRepairWorkOrder) {
public AjaxResult repairSendWeChat(EquRepairWorkOrderBo equRepairWorkOrder) {
////企业微信维修提醒
//发企业微信--------------------开始(跟班组有关)
SimpleDateFormat myFmt=new SimpleDateFormat("yyyy年MM月dd日 HH时mm分ss秒"); //规范时间格式
@ -543,7 +533,7 @@ public class OpenServiceImpl implements OpenService {
//查询设备相关信息
//设备名称
EquEquipment equ = openMapper.selectEquEquipmentByEquEquipmentCode(equRepairWorkOrder.getEquipmentCode());
EquEquipmentBo equ = openMapper.selectEquEquipmentByEquEquipmentCode(equRepairWorkOrder.getEquipmentCode());
if(com.op.common.core.utils.StringUtils.isNotEmpty(equ.getEquipmentName())){
contentInfo = contentInfo.replace("${equipmentName}", equ.getEquipmentName()+"\n");
}else{

@ -49,7 +49,7 @@
product_code = #{item.productCode}
</foreach>
</update>
<update id="updateEquipmentStatuss" parameterType="com.op.device.domain.EquEquipment">
<update id="updateEquipmentStatuss" parameterType="com.op.open.domain.EquEquipmentBo">
update base_equipment
set equipment_status = #{equipmentStatus}
where equipment_code = #{equipmentCode}
@ -436,7 +436,7 @@
)
</foreach>
</insert>
<insert id="insertEquRepairWorkOrders" parameterType="EquRepairWorkOrder">
<insert id="insertEquRepairWorkOrders" parameterType="EquRepairWorkOrderBo">
insert into equ_repair_work_order
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="workId != null">work_id,</if>
@ -572,7 +572,7 @@
</select>
<resultMap type="EquEquipment" id="EquEquipmentResult">
<resultMap type="EquEquipmentBo" id="EquEquipmentResult">
<result property="equipmentId" column="equipment_id"/>
<result property="equipmentCode" column="equipment_code"/>
<result property="equipmentName" column="equipment_name"/>

Loading…
Cancel
Save