From 52e4610b008f7643f84c5f37a110c081123caf69 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 08 一月 2026 09:29:01 +0800
Subject: [PATCH] 报工后新增/修改生产核算；删除报工后，删除关联的核算数据

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 50 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 7c73d97..8eacb60 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -4,11 +4,14 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -18,7 +21,7 @@
  */
 @TableName("sales_ledger_product")
 @Data
-public class SalesLedgerProduct {
+public class SalesLedgerProduct implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
@@ -32,6 +35,11 @@
      */
     @Excel(name = "鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�")
     private Long salesLedgerId;
+
+    /**
+     * 棰勮鏁伴噺
+     */
+    private BigDecimal warnNum;
 
     /**
      * 浜у搧澶х被
@@ -52,11 +60,18 @@
     private String unit;
 
     /**
+     * 鐢熶骇鐐掓満
+     */
+    @Excel(name = "鐢熶骇鐐掓満")
+    private String speculativeTradingName;
+
+    /**
      * 鏁伴噺
      */
     @Excel(name = "鏁伴噺")
     private BigDecimal quantity;
-
+    @Excel(name = "鏈�浣庡簱瀛樻暟閲�")
+    private BigDecimal minStock;
     /**
      * 绋庣巼
      */
@@ -95,7 +110,7 @@
     /**
      * 鏈鏉ョエ鏁�
      */
-    private Long ticketsNum;
+    private BigDecimal ticketsNum;
 
     /**
      * 鏈鏉ョエ閲戦(鍏�)
@@ -105,7 +120,7 @@
     /**
      * 鏈潵绁ㄦ暟
      */
-    private Long futureTickets;
+    private BigDecimal futureTickets;
 
     /**
      * 鏈潵绁ㄩ噾棰�(鍏�)
@@ -113,10 +128,10 @@
     private BigDecimal futureTicketsAmount;
 
     @ApiModelProperty(value = "寮�绁ㄦ暟")
-    private Integer invoiceNum;
+    private BigDecimal invoiceNum;
 
     @ApiModelProperty(value = "鏈紑绁ㄦ暟")
-    private Integer noInvoiceNum;
+    private BigDecimal noInvoiceNum;
 
     @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
     private BigDecimal invoiceAmount;
@@ -126,7 +141,7 @@
 
     @ApiModelProperty(value = "鏈寮�绁ㄦ暟")
     @TableField(exist = false)
-    private Integer currentInvoiceNum;
+    private BigDecimal currentInvoiceNum;
 
     @TableField(exist = false)
     @ApiModelProperty(value = "鏈寮�绁ㄩ噾棰�")
@@ -141,4 +156,32 @@
      * 浜у搧瑙勬牸id
      */
     private Long productModelId;
+
+    @ApiModelProperty(value = "鍒濆鏈紑绁ㄦ暟")
+    @TableField(exist = false)
+    private BigDecimal originalNoInvoiceNum;
+
+    @ApiModelProperty(value = "涓存椂鏈紑绁ㄦ暟")
+    @TableField(exist = false)
+    private BigDecimal tempNoInvoiceNum;
+
+    @ApiModelProperty(value = "涓存椂鏈紑绁ㄩ噾棰�")
+    @TableField(exist = false)
+    private BigDecimal tempnoInvoiceAmount;
+
+    @ApiModelProperty(value = "涓存椂鏈潵绁ㄦ暟")
+    @TableField(exist = false)
+    private BigDecimal tempFutureTickets;
+
+    @ApiModelProperty(value = "涓存椂鏈潵绁ㄩ噾棰�")
+    @TableField(exist = false)
+    private BigDecimal tempFutureTicketsAmount;
+
+    @ApiModelProperty("鐧昏浜�")
+    private String register;
+
+    @ApiModelProperty("鐧昏鏃ユ湡")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime registerDate;
 }

--
Gitblit v1.9.3