From 82ce59218139d9fefeae7b9e5fbc88b499ff023f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 08 十月 2026 13:35:06 +0800
Subject: [PATCH] feat(inspect): 新增新聚检验订单编辑功能并优化报告生成流程 - 新增 updateNewJuInsOrder 接口支持新聚检验订单修改 - 增加文件上传大小限制至200MB，请求大小限制至400MB - 在设备信息中新增出厂编号字段显示 - 优化温湿度处理逻辑，报告中仅显示温度信息 - 新增印章管理功能，支持MA标志章、报告章和骑缝章配置 - 完善检验报告生成流程，增加多种报告类型常量定义 - 优化附件上传功能，增加空值检查和返回值处理 - 调整委托编号生成逻辑，完善新聚订单可编辑性判断 - 更新CNAS流程中报告编号使用正式报告编号替代委托编号
---
inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
index 1f61c32..2113508 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/SampleOrderDto.java
@@ -3,6 +3,7 @@
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.inspect.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +17,9 @@
@ExcelIgnoreUnannotated
public class SampleOrderDto extends InsOrder {
+ @ApiModelProperty("鏄惁鍏佽缂栬緫")
+ private Boolean editable;
+
@ApiModelProperty("妫�楠屽璞�")
private String sampleType;
@@ -27,6 +31,7 @@
@ApiModelProperty("鏍峰搧鍨嬪彿")
private String sampleModel;
+ @ApiModelProperty("鎸囨淳妫�楠屼汉id")
private String assign;
@ExcelProperty(index = 4, value = "鏍峰搧鏁伴噺")
@@ -43,11 +48,14 @@
@ApiModelProperty("鎶ュ憡id")
private String reportId;
+ @ApiModelProperty("绯荤粺鐢熸垚鎶ュ憡鍦板潃")
@TableField("`url`")
private String url;
+ @ApiModelProperty("鎵嬪姩涓婁紶鎶ュ憡鍦板潃")
private String urlS;
+ @ApiModelProperty("涓嬪崟浜哄鍚�")
private String name;
@ExcelProperty(index = 5, value = "妫�楠屼汉")
@@ -85,9 +93,17 @@
@ApiModelProperty("瀛愬疄楠屽")
private String sonLaboratory;
+ @ApiModelProperty("鏍峰搧鍚嶇О锛堝師鏉愭枡鍙栨牱鍝佸瓧娈碉紝鎴愬搧鍙栨姤鍛婂睍绀哄瓧娈碉級")
+ private String sampleStr;
+ @ApiModelProperty("鎬讳环")
+ private String totalPrice;
+ @ApiModelProperty("璁㈠崟id(瀵煎嚭鐢�)")
+ private String ids;
+ @ApiModelProperty("鎷掓敹鍘熷洜")
+ private String sampleRejectRemark;
}
--
Gitblit v1.9.3