diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java index 0a5645b0..5e2fe22a 100644 --- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java +++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/dto/BoardDTO.java @@ -2,6 +2,7 @@ package com.op.system.api.domain.dto; import com.op.system.api.domain.quality.QcCheckTaskDTO; +import java.util.Date; import java.util.List; public class BoardDTO { @@ -10,6 +11,7 @@ public class BoardDTO { private String equCode; private String equName; private Integer totalNum; + private Integer totalNum0;//烘房入 private String equTypeCode; private String equTypeName; private String shiftId; @@ -29,6 +31,50 @@ public class BoardDTO { private String taskSampleNum; private String taskNum; private List checkList; + private String unitPro; + private String rfid; + private Date createTime; + private String isqua; + + public Integer getTotalNum0() { + return totalNum0; + } + + public void setTotalNum0(Integer totalNum0) { + this.totalNum0 = totalNum0; + } + + public String getIsqua() { + return isqua; + } + + public void setIsqua(String isqua) { + this.isqua = isqua; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getRfid() { + return rfid; + } + + public void setRfid(String rfid) { + this.rfid = rfid; + } + + public String getUnitPro() { + return unitPro; + } + + public void setUnitPro(String unitPro) { + this.unitPro = unitPro; + } public List getCheckList() { return checkList; diff --git a/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java b/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java index 33fa4ecb..50ca6c75 100644 --- a/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java +++ b/op-modules/op-mes/src/main/java/com/op/mes/domain/dto/BaseEquipmentDto.java @@ -22,7 +22,7 @@ public class BaseEquipmentDto extends BaseEntity { /** * 设备类型编码 */ - @Excel(name = "设备类型编码") + @Excel(name = "设备编码") private String equipmentCode; private String nextMachineCode; @@ -33,7 +33,7 @@ public class BaseEquipmentDto extends BaseEntity { /** * 设备类型名称 */ - @Excel(name = "设备类型名称") + @Excel(name = "设备名称") private String equipmentName; /** @@ -217,6 +217,16 @@ public class BaseEquipmentDto extends BaseEntity { @Excel(name = "端口号") private String plcPort; + private String ymd; + + public String getYmd() { + return ymd; + } + + public void setYmd(String ymd) { + this.ymd = ymd; + } + public String getNextMachineCode() { return nextMachineCode; }