From c19bcccbe4f091b4286a3ff40ee4a97c4e9848d6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 19 三月 2026 10:22:37 +0800
Subject: [PATCH] 修改bom产品信息，如果有关联生成订单完成数量>0，则不许改；否则修改关联的产品结构，订单产品信息，工艺路线产品信息
---
src/main/java/com/ruoyi/device/pojo/DeviceRepair.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
index b493cd4..330b3a9 100644
--- a/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
+++ b/src/main/java/com/ruoyi/device/pojo/DeviceRepair.java
@@ -4,16 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.Api;
+import com.ruoyi.other.pojo.TempFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import nonapi.io.github.classgraph.json.Id;
import org.springframework.format.annotation.DateTimeFormat;
-import java.math.BigDecimal;
-import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
@Data
@TableName("device_repair")
@@ -23,7 +21,11 @@
private Long id;
@ApiModelProperty("璁惧鍙拌处id")
- private String deviceLedgerId;
+ private Long deviceLedgerId;
+
+ private String deviceName;
+
+ private String deviceModel;
@ApiModelProperty("鎶ヤ慨鏃堕棿")
private Date repairTime;
@@ -38,12 +40,14 @@
private String maintenanceName;
@ApiModelProperty("缁翠慨鏃堕棿")
- private Date maintenanceTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime maintenanceTime;
@ApiModelProperty("缁翠慨缁撴灉")
private String maintenanceResult;
- @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨")
+ @ApiModelProperty("鐘舵�� 0 寰呯淮淇� 1瀹岀粨 2 澶辫触")
private Integer status;
@ApiModelProperty("鍒涘缓鏃堕棿")
@@ -71,4 +75,10 @@
private Long tenantId;
+ @ApiModelProperty("棰嗙敤澶囦欢ids")
+ private String sparePartsIds;
+
+ @ApiModelProperty("鏂囦欢鍒楄〃")
+ @TableField(exist = false)
+ private List<TempFile> fileList;
}
--
Gitblit v1.9.3