From 33d93225f790ff72f8ba5e86f8cf2c3e2db94d0d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 26 三月 2026 10:43:55 +0800
Subject: [PATCH] feat: 新增宽、高、面积，产品加工绑定

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java |  115 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 101 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 7af592b..5af2457 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,34 +112,34 @@
     /**
      * 鏈鏉ョエ鏁�
      */
-    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;
+    private BigDecimal invoiceNum = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "鏈紑绁ㄦ暟")
-    private BigDecimal noInvoiceNum;
+    private BigDecimal noInvoiceNum = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
-    private BigDecimal invoiceAmount;
+    private BigDecimal invoiceAmount = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
-    private BigDecimal noInvoiceAmount;
+    private BigDecimal noInvoiceAmount = BigDecimal.ZERO;
 
     @ApiModelProperty(value = "鏈寮�绁ㄦ暟")
     @TableField(exist = false)
@@ -149,7 +150,7 @@
     private BigDecimal currentInvoiceAmount;
 
     /**
-     *  浜у搧id
+     * 浜у搧id
      */
     private Long productId;
 
@@ -192,6 +193,14 @@
     @TableField(exist = false)
     private String shippingCarNumber;
 
+    @ApiModelProperty("蹇�掑叕鍙�")
+    @TableField(exist = false)
+    private String expressCompany;
+
+    @ApiModelProperty("蹇�掑崟鍙�")
+    @TableField(exist = false)
+    private String expressNumber;
+
     /**
      * 鍙戣揣鏃ユ湡
      */
@@ -200,13 +209,91 @@
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date shippingDate;
 
-//    @TableField(exist = false)
-//    @ApiModelProperty(value = "鐢熶骇鐘舵��")
-//    private String productionStatus = "鏈紑濮�";
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鍙戣揣鐘舵��")
+    private String shippingStatus = "寰呭彂璐�";
     /**
-     * 鍙戣揣瀹℃壒鐘舵��
+     * 浜у搧鐘舵��
      */
 //    @TableField(exist = false)
-    @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0鏈敓浜�,1宸茬敓浜�,2寰呭鏍�(瀹℃牳涓�),3瀹℃牳瀹屾垚,4瀹℃牳澶辫触")
+    @ApiModelProperty(value = "浜у搧鐘舵�侊細1-鍏呰冻")
     private Integer approveStatus;
+
+    @ApiModelProperty(value = "寰呭洖娆炬�婚噾棰�")
+    private BigDecimal pendingInvoiceTotal;
+
+    @ApiModelProperty(value = "鍥炴鎬婚噾棰�")
+    private BigDecimal invoiceTotal = BigDecimal.ZERO;
+
+    @ApiModelProperty(value = "寰呬粯娆炬�婚噾棰�")
+    private BigDecimal pendingTicketsTotal;
+
+    @ApiModelProperty(value = "浠樻鎬婚噾棰�")
+    private BigDecimal ticketsTotal = BigDecimal.ZERO;
+
+    @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;
+
+    /**
+     * 鍛ㄩ暱
+     */
+    @ApiModelProperty("鍛ㄩ暱(cm)")
+    private BigDecimal perimeter;
+
+    /**
+     * 鍛ㄩ暱
+     */
+    @ApiModelProperty("閲嶇")
+    private BigDecimal heavyBox;
+
+    @TableField(exist = false)
+    @ApiModelProperty("閿�鍞骇鍝侀澶栧姞宸�")
+    private List<SalesLedgerProductProcess> salesProductProcessList;
+
+    @TableField(exist = false)
+    private Integer hasSufficientStock;
+
+    // 閫�璐ф暟閲�
+    @TableField(exist = false)
+    private BigDecimal returnQuality;
+
+    // 鍙敤鏁伴噺  quantity - returnQuality
+    @TableField(exist = false)
+    private BigDecimal availableQuality;
 }

--
Gitblit v1.9.3