From 854d063b5bfcadffe819456e0d4790a0579fa079 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 25 三月 2026 16:59:48 +0800
Subject: [PATCH] feat: 销售订单添加产品新增字段、产品加工参数选择
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 1bf9aa2..f984e38 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -13,6 +13,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
/**
* 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -111,22 +112,22 @@
/**
* 鏈鏉ョエ鏁�
*/
- private BigDecimal ticketsNum=BigDecimal.ZERO;
+ private BigDecimal ticketsNum = BigDecimal.ZERO;
/**
* 鏈鏉ョエ閲戦(鍏�)
*/
- private BigDecimal ticketsAmount=BigDecimal.ZERO;
+ private BigDecimal ticketsAmount = BigDecimal.ZERO;
/**
* 鏈潵绁ㄦ暟
*/
- private BigDecimal futureTickets=BigDecimal.ZERO;
+ private BigDecimal futureTickets = BigDecimal.ZERO;
/**
* 鏈潵绁ㄩ噾棰�(鍏�)
*/
- private BigDecimal futureTicketsAmount=BigDecimal.ZERO;
+ private BigDecimal futureTicketsAmount = BigDecimal.ZERO;
@ApiModelProperty(value = "寮�绁ㄦ暟")
private BigDecimal invoiceNum = BigDecimal.ZERO;
@@ -149,7 +150,7 @@
private BigDecimal currentInvoiceAmount;
/**
- * 浜у搧id
+ * 浜у搧id
*/
private Long productId;
@@ -233,6 +234,46 @@
@ApiModelProperty(value = "鏄惁璐ㄦ")
private Boolean isChecked;
+ @ApiModelProperty("瀹�")
+ private BigDecimal width;
+
+ @ApiModelProperty("楂�")
+ private BigDecimal height;
+
+ @ApiModelProperty("鍔犲伐瑕佹眰")
+ private String processRequirement;
+
+ @ApiModelProperty("澶囨敞")
+ private String remark;
+
+ /**
+ * 瀹為檯鍗曠墖闈㈢Н(銕�)
+ */
+ @ApiModelProperty("瀹為檯鍗曠墖闈㈢Н(銕�)")
+ private BigDecimal actualPieceArea;
+
+ /**
+ * 瀹為檯鎬婚潰绉�(銕�)
+ */
+ @ApiModelProperty("瀹為檯鎬婚潰绉�(銕�)")
+ private BigDecimal actualTotalArea;
+
+ /**
+ * 缁撶畻鍗曠墖闈㈢Н(銕�)
+ */
+ @ApiModelProperty("缁撶畻鍗曠墖闈㈢Н(銕�)")
+ private BigDecimal settlePieceArea;
+
+ /**
+ * 缁撶畻鎬婚潰绉�(銕�)
+ */
+ @ApiModelProperty("缁撶畻鎬婚潰绉�(銕�)")
+ private BigDecimal settleTotalArea;
+
+ @TableField(exist = false)
+ @ApiModelProperty("閿�鍞骇鍝侀澶栧姞宸�")
+ private List<SalesLedgerProductProcess> salesProductProcessList;
+
@TableField(exist = false)
private Integer hasSufficientStock;
--
Gitblit v1.9.3