From 3764fac5de7dc91c530091ef86bef7e85476dccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com>
Date: Thu, 7 Nov 2024 09:21:29 +0800
Subject: [PATCH] =?UTF-8?q?[feat]=20=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=20=E8=AE=BE=E5=A4=87=E5=B1=A5=E5=8E=86=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=B1=A5=E5=8E=86=E5=92=8C=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E5=B1=A5=E5=8E=86=E8=AF=A6=E6=83=85=E5=AE=9E=E4=BD=93=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=E7=94=9F=E4=BA=A7=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E3=80=81=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E3=80=81=E5=93=81?=
 =?UTF-8?q?=E8=B4=A8=E7=8A=B6=E6=80=81=E7=AD=89=E5=AD=97=E6=AE=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/dto/SysEquipDetailDto.java  | 16 +++++++++++++++-
 .../ruoyi/system/dto/SysEquipMaterialDto.java    |  1 +
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipDetailDto.java b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipDetailDto.java
index c861bbd3..e3301af4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipDetailDto.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipDetailDto.java
@@ -1,8 +1,10 @@
 package com.ruoyi.system.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author 刘晓旭
@@ -18,10 +20,22 @@ public class SysEquipDetailDto implements Serializable {
     //设备型号
     private String equipmentModel;
 
-    //流水号
+    //追踪码(流水号)
     private String serialNo;
 
     //生产图片
     private String producePic;
 
+    //生产开始时间
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date startMakeTime;
+
+    //生产结束时间
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date endMakeTime;
+
+    /** 是否添加工序问题记录（0代表是 1代表否） */
+    private String addProcessIssueRecordFlag;
+
+
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipMaterialDto.java b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipMaterialDto.java
index fa128aae..ec38427e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipMaterialDto.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/dto/SysEquipMaterialDto.java
@@ -26,6 +26,7 @@ public class SysEquipMaterialDto implements Serializable {
     private String makeNo;
     private Integer curIndex;
     private String inboundOrderNo;
+    private String qualifyStatus;
 
     //出货设备详情集合
     private List<SysEquipDetailDto> sysEquipDetailDtos;