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 sysEquipDetailDtos;