From 5a90ac8955f198f21954a3dca0443d1c5892bf0b Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期二, 03 十一月 2026 18:08:29 +0800
Subject: [PATCH] 成品下单批量下单接口与检验委托单批次合并(batch_no),含数据库加列脚本
---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
index a74b48b..40e2356 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
@@ -9,6 +9,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -29,6 +30,9 @@
@ExcelProperty(index = 0, value = "濮旀墭缂栧彿")
@Schema(description = "濮旀墭缂栧彿")
private String entrustCode;
+
+ @Schema(description = "鎵归噺涓嬪崟鎵规鍙�")
+ private String batchNo;
@Schema(description = "澶栭儴濮旀墭缂栧彿")
private String outEntrustCode;
@@ -86,6 +90,15 @@
@Schema(description = "澶囨敞鑻辨枃")
private String remarkEn;
+ @Schema(description = "鏄惁浼樻儬 0鏃� 1鏈�")
+ private Integer isDiscount;
+
+ @Schema(description = "浼樻儬鍚庨噾棰�")
+ private BigDecimal discountAmount;
+
+ @Schema(description = "璐圭敤澶囨敞")
+ private String feeRemark;
+
@Schema(description = "OTC璁㈠崟鍙�")
private String otcCode;
--
Gitblit v1.9.3