From 256f758a45c9b00a9248b02345ee1d6f52869e08 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 05 十一月 2025 09:36:58 +0800
Subject: [PATCH] yys 1.导出接口开发 2.营销管理-回款登记-回款状态(回款完成,未完成) 3.采购管理-付款登记-加一个付款进度 4.采购管理-付款流水-采购合同号筛选 5.仓储物流-所有-查询条件加一个日期 6.仓储物流-入库管理-加一个库存预警数量字段 7.生产管控-生产订单-加一个订单状态-已完成、未完成 8.协同办公-通知公告-加一个时间限制,过时后状态改为已过期

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 3949cd7..a135fa3 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -4,11 +4,13 @@
 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.math.BigDecimal;
+import java.time.LocalDateTime;
 
 /**
  * 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -34,6 +36,11 @@
     private Long salesLedgerId;
 
     /**
+     * 棰勮鏁伴噺
+     */
+    private BigDecimal warnNum;
+
+    /**
      * 浜у搧澶х被
      */
     @Excel(name = "浜у搧澶х被")
@@ -56,7 +63,8 @@
      */
     @Excel(name = "鏁伴噺")
     private BigDecimal quantity;
-
+    @Excel(name = "鏈�浣庡簱瀛樻暟閲�")
+    private BigDecimal minStock;
     /**
      * 绋庣巼
      */
@@ -95,7 +103,7 @@
     /**
      * 鏈鏉ョエ鏁�
      */
-    private Long ticketsNum;
+    private BigDecimal ticketsNum;
 
     /**
      * 鏈鏉ョエ閲戦(鍏�)
@@ -105,7 +113,7 @@
     /**
      * 鏈潵绁ㄦ暟
      */
-    private Long futureTickets;
+    private BigDecimal futureTickets;
 
     /**
      * 鏈潵绁ㄩ噾棰�(鍏�)
@@ -153,4 +161,20 @@
     @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