From 325fd0ffa2f0a1a517d09da559ff11439318f979 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Sat, 11 May 2024 11:26:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=A3=80=E9=AA=8C=E6=96=B9?=
 =?UTF-8?q?=E6=A1=88=E6=8A=A5=E5=91=8A+=E7=83=98=E6=88=BF=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/system/api/domain/dto/BoardDTO.java    | 46 +++++++++++++++++++
 .../op/mes/domain/dto/BaseEquipmentDto.java   | 14 +++++-
 2 files changed, 58 insertions(+), 2 deletions(-)

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<QcCheckTaskDTO> 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<QcCheckTaskDTO> 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;
     }