From f67161d150eb5720b28fd3f9fbb40c4145d1146c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 10 六月 2026 11:42:37 +0800
Subject: [PATCH] feat:1.已审核只能编辑单价 2.添加完成按钮 3.添加标签打印和单据打印次数展示
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 138 +++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 131 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index b6eaf67..9728a53 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,12 +1,17 @@
package com.ruoyi.sales.pojo;
-import java.math.BigDecimal;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.List;
/**
* 閿�鍞彴璐﹀璞� sales_ledger
@@ -34,8 +39,9 @@
/**
* 瀹㈡埛鍚堝悓鍙�
*/
- @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+ @Excel(name = "瀹㈡埛鍚堝悓鍙�", type = Excel.Type.IMPORT)
private String customerContractNo;
+
/**
* 椤圭洰鍚嶇О
@@ -48,6 +54,7 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
/**
@@ -70,14 +77,24 @@
/**
* 褰曞叆浜�
*/
- @Excel(name = "褰曞叆浜�")
private String entryPerson;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "褰曞叆浜�")
+ @Excel(name = "褰曞叆浜�")
+ private String entryPersonName;
/**
* 澶囨敞
*/
@Excel(name = "澶囨敞")
private String remarks;
+
+ /**
+ * 瀹㈡埛澶囨敞
+ */
+ @Excel(name = "瀹㈡埛澶囨敞")
+ private String customerRemarks;
/**
* 闄勪欢鏉愭枡锛屽瓨鍌ㄦ枃浠跺悕绛夌浉鍏充俊鎭�
@@ -91,7 +108,114 @@
/**
* 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
*/
- @Excel(name = "绋庣巼")
+ @Excel(name = "鍚堝悓閲戦")
private BigDecimal contractAmount;
-}
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
+ @Excel(name = "鏈紑绁ㄩ噾棰�")
+ private BigDecimal noInvoiceAmountTotal = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "绛捐鏃ユ湡")
+ private LocalDate executionDate;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "宸插紑绁ㄩ噾棰�(鍏�)")
+ @Excel(name = "宸插紑绁ㄩ噾棰�")
+ private BigDecimal invoiceTotal = BigDecimal.ZERO;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍥炴閲戦")
+ private BigDecimal receiptPaymentAmountTotal = BigDecimal.ZERO;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "寰呭洖娆鹃噾棰�")
+ private BigDecimal noReceiptAmount = BigDecimal.ZERO;
+
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ private String paymentMethod;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐢熶骇鐘舵��")
+ private String productionStatus = "鏈紑濮�";
+
+ //浜よ揣鏃ユ湡
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ @TableField(value = "delivery_date")
+ private LocalDate deliveryDate;
+
+ /**
+ * 鍙戣揣鐘舵�侊細1-鏈彂璐э紝2-瀹℃壒涓紝3-瀹℃壒涓嶉�氳繃锛�4-瀹℃壒閫氳繃锛�5-宸插彂璐э紝6-閮ㄥ垎鍙戣揣锛堝鎵爜鍒嗘壒鍙戣揣鏈弧鍗曪級
+ */
+ @ApiModelProperty("鍙戣揣鐘舵�侊細1-鏈彂璐э紝2-瀹℃壒涓紝3-瀹℃壒涓嶉�氳繃锛�4-瀹℃壒閫氳繃锛�5-宸插彂璐э紝6-閮ㄥ垎鍙戣揣")
+ private Integer deliveryStatus;
+
+ /**
+ * 鍏ュ簱鐘舵�侊細0-鏈叆搴擄紝1-閮ㄥ垎鍏ュ簱锛�2-宸插叆搴�
+ */
+ @ApiModelProperty("鍏ュ簱鐘舵�侊細0-鏈叆搴擄紝1-閮ㄥ垎鍏ュ簱锛�2-宸插叆搴�")
+ private Integer stockStatus;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浜よ揣澶╂暟宸�")
+ private Integer deliveryDaysDiff;
+
+ @TableField(exist = false)
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
+ private Boolean isFh;
+
+ @TableField(exist = false)
+ //鏄惁鍙紪杈�
+ private Boolean isEdit;
+
+ @TableField(exist = false)
+ @ApiModelProperty("璁㈠崟浜у搧鎬绘暟閲�")
+ private BigDecimal productTotalQuantity = BigDecimal.ZERO;
+
+ @TableField(exist = false)
+ @ApiModelProperty("璁㈠崟浜у搧鎬婚潰绉�(銕�)")
+ private BigDecimal productTotalArea = BigDecimal.ZERO;
+
+ @TableField(exist = false)
+ @ApiModelProperty("鍛戒腑鐨勯攢鍞骇鍝佸垪琛�")
+ private List<SalesLedgerProduct> matchedProducts;
+
+ /**
+ * 瀹℃牳鐘舵�侊細0-鏈鏍革紝1-宸插鏍革紝2-鍙嶅
+ */
+ @ApiModelProperty("瀹℃牳鐘舵��")
+ private Integer reviewStatus;
+
+ @ApiModelProperty("鍙嶅鏃堕棿")
+ private LocalDateTime counterReviewTime;
+
+ @ApiModelProperty("鍙嶅浜�")
+ private String counterReviewPerson;
+
+ @ApiModelProperty("鍙嶅浜篒d")
+ private Long counterReviewPersonId;
+
+ @ApiModelProperty("鍙嶅鏍哥被鍨嬶細1=浣滃簾锛�2=閲嶆柊鐢熸垚")
+ private Integer counterReviewType;
+
+ @ApiModelProperty("鍙嶅鏍告弿杩�")
+ private String counterReviewDesc;
+
+ /**
+ * 璁㈠崟鐘舵�侊細0-杩涜涓紝1-宸插畬鎴�
+ */
+ @ApiModelProperty("璁㈠崟鐘舵�侊細0-杩涜涓紝1-宸插畬鎴�")
+ private Integer orderStatus;
+
+ /**
+ * 鏍囩鎵撳嵃娆℃暟
+ */
+ @ApiModelProperty("鏍囩鎵撳嵃娆℃暟")
+ private Integer labelPrintCount;
+
+ /**
+ * 鍗曟嵁鎵撳嵃娆℃暟
+ */
+ @ApiModelProperty("鍗曟嵁鎵撳嵃娆℃暟")
+ private Integer documentPrintCount;
+}
\ No newline at end of file
--
Gitblit v1.9.3