From 31ccc9cd47f96cea6e4e13b078187fd3201c4666 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 04 九月 2026 16:35:24 +0800
Subject: [PATCH] feat(report): 更新检测报告模板并优化报告生成功能 - 优化设备信息展示格式，支持多设备列表显示 - 统一检测报告和检验报告使用新版模板格式
---
basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
index 71bfddb..280e79e 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/dto/IfsInventoryQuantitySupplierDto.java
@@ -40,6 +40,9 @@
@ApiModelProperty("鏍峰搧缂栧彿")
private String sampleCode;
+ @ApiModelProperty("閿�鍞鍗曞垎绫诲悕绉�")
+ private String orderTypeName;
+
// 杩涘巶
@ApiModelProperty("杩涘巶璁㈠崟id")
private Integer enterOrderId;
@@ -53,6 +56,9 @@
@ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
private String enterUrlS;
+ @ApiModelProperty("杩涘巶鎶ュ憡瀹℃壒鐘舵��(1:鎵瑰噯閫氳繃锛�0锛氭壒鍑嗕笉閫氳繃)")
+ private Integer enterRatifyStatus;
+
// 瀛ｅ害
@ApiModelProperty("瀛ｅ害璁㈠崟id")
private Integer quarterOrderId;
@@ -65,6 +71,9 @@
@ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
private String quarterUrlS;
+
+ @ApiModelProperty("瀛ｅ害妫�楠屾姤鍛婂鎵圭姸鎬�(1:鎵瑰噯閫氳繃锛�0锛氭壒鍑嗕笉閫氳繃)")
+ private Integer quarterRatifyStatus;
private Integer orderState;
@@ -121,4 +130,7 @@
@ApiModelProperty("鍏嶆")
private Integer isExemption;
+
+ @ApiModelProperty("鍘熸潗鏂檌d(瀵煎嚭鐢�)")
+ private String ids;
}
--
Gitblit v1.9.3