From fbd4ecb70baf2e671876ca809a81f6e6fe7342ee Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:52:50 +0800
Subject: [PATCH] feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性，避免审核时重复 - 新增标准模板价格字段及对应的数据模型和数据库映射 - 订单费用详情查询逻辑重构为基于模板价格计算方式 - 新增标准模板与设备绑定关系的数据结构和管理功能 - 委托编号唯一性校验逻辑增强
---
basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java b/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
index 3984802..a391788 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/pojo/IfsInventoryQuantity.java
@@ -18,7 +18,7 @@
@ExcelIgnoreUnannotated
public class IfsInventoryQuantity implements Serializable {
@TableId(type = IdType.AUTO)
- private Integer id;
+ private Long id;
@ApiModelProperty("鍩�")
@@ -36,6 +36,12 @@
@ApiModelProperty("鎺ユ敹鍙�")
private Integer receiptNo;
+
+ @ApiModelProperty("璁㈠崟绫诲瀷(01raw:鍘熸潗鏂欙紝02wg:澶栬喘鎴愬搧)")
+ private String orderType;
+
+ @ApiModelProperty("鐗╂枡灞炴�э紝鐢ㄤ簬鍖哄垎閾溿�侀摑瀵间綋绛夐浂浠�")
+ private String materialProp;
@ExcelProperty(index = 3, value = "闆朵欢鍙�")
@ApiModelProperty("闆朵欢鍙�")
@@ -207,4 +213,7 @@
// 鏄惁鏄繃鏈熸潗鏂�: 0鍚�, 1:鏄�"
@ApiModelProperty("鐗╂枡绫诲瀷")
private Integer isExpire;
+
+ @ApiModelProperty("鏄惁涓烘媶鍒嗚鍗�(1:鏄紝0:鍚�)")
+ private Integer isSplitOrder;
}
--
Gitblit v1.9.3