From 7b6741f6ccf11d0043ad94914d41a9bd23452d00 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 29 五月 2026 15:13:24 +0800
Subject: [PATCH] feat(sales): 添加销售台账审核反审功能 1.在销售台账下新增子级菜单:未审批订单和反审核数据。分别进行订单审 核和查看反审核的历史数据。 2.在销售台账页面，新增一个编辑按钮，可以对已审核的订单进行单价修 改。 3.新增反审核按钮，对已审核的订单进行反审核，反审核之后会保存当前订 单的数据快照，便于在反审核菜单进行查看。反审核的订单重新生成一条销 售订单数据进行编辑。
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java | 76 +++++++++++++++++--------------------
1 files changed, 35 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
index 2c95909..0a7b79f 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
@@ -18,61 +18,55 @@
@Excel(name = "閿�鍞崟鍙�")
private String salesContractNo;
-
- /**
- * 浜у搧澶х被
- */
@Excel(name = "浜у搧澶х被")
private String productCategory;
- /**
- * 瑙勬牸鍨嬪彿
- */
@Excel(name = "瑙勬牸鍨嬪彿")
private String specificationModel;
+
+ @Excel(name = "瀹�(mm)")
+ private BigDecimal width;
+
+ @Excel(name = "楂�(mm)")
+ private BigDecimal height;
+
+ @Excel(name = "绋庣巼")
+ private BigDecimal taxRate;
+
+ @Excel(name = "鍚◣鍗曚环")
+ private BigDecimal taxInclusiveUnitPrice;
+
+ @Excel(name = "鏁伴噺")
+ private BigDecimal quantity;
+
+ @Excel(name = "鍚◣鎬讳环", type = Excel.Type.EXPORT)
+ private BigDecimal taxInclusiveTotalPrice;
+
+ @Excel(name = "鍙戠エ绫诲瀷")
+ private String invoiceType;
+
+ @Excel(name = "妤煎眰缂栧彿")
+ private String floorNo;
+
+ @Excel(name = "鍔犲伐瑕佹眰")
+ private String processingRequirements;
+
+ @Excel(name = "澶囨敞")
+ private String remarks;
+
+ @Excel(name = "棰濆鍔犲伐")
+ private String extraProcessing;
/**
* 鍗曚綅
*/
- @Excel(name = "鍗曚綅")
+// @Excel(name = "鍗曚綅")
private String unit;
-
- /**
- * 鏁伴噺
- */
- @Excel(name = "鏁伴噺")
- private BigDecimal quantity;
-
- /**
- * 绋庣巼
- */
- @Excel(name = "绋庣巼")
- private BigDecimal taxRate;
-
- /**
- * 鍚◣鍗曚环
- */
- @Excel(name = "鍚◣鍗曚环")
- private BigDecimal taxInclusiveUnitPrice;
-
- /**
- * 鍚◣鎬讳环
- */
- @Excel(name = "鍚◣鎬讳环")
- private BigDecimal taxInclusiveTotalPrice;
-
- /**
- * 鍙戠エ绫诲瀷
- */
- @Excel(name = "鍙戠エ绫诲瀷")
- private String invoiceType;
/**
* 鏄惁璐ㄦ
*/
- @Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
+// @Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
private Boolean isChecked;
-
-
}
--
Gitblit v1.9.3