From bd63dcea170b3ceb86851f56a7a53b85b77027c2 Mon Sep 17 00:00:00 2001
From: yinrw <2030349650@qq.com>
Date: 星期四, 23 七月 2026 15:03:25 +0800
Subject: [PATCH] 修改销售台账和生产订单绑定逻辑，修复销售台账和生产订单页面展示数据bug

---
 src/main/java/com/ruoyi/sales/pojo/SalesLedger.java |   82 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index def5e39..5a9c90a 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -1,13 +1,17 @@
 package com.ruoyi.sales.pojo;
 
 import java.math.BigDecimal;
+import java.time.LocalDate;
 import java.util.Date;
+import java.util.List;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.production.dto.ProductOrderDto;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 閿�鍞彴璐﹀璞� sales_ledger
@@ -35,8 +39,9 @@
     /**
      * 瀹㈡埛鍚堝悓鍙�
      */
-    @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+    @Excel(name = "瀹㈡埛鍚堝悓鍙�", type = Excel.Type.IMPORT)
     private String customerContractNo;
+
 
     /**
      * 椤圭洰鍚嶇О
@@ -49,6 +54,7 @@
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
     @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date entryDate;
 
     /**
@@ -71,8 +77,12 @@
     /**
      * 褰曞叆浜�
      */
-    @Excel(name = "褰曞叆浜�")
     private String entryPerson;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "褰曞叆浜�")
+    @Excel(name = "褰曞叆浜�")
+    private String entryPersonName;
 
     /**
      * 澶囨敞
@@ -97,6 +107,72 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�(鍏�)")
-    private BigDecimal noInvoiceAmountTotal;
+    @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;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "浜よ揣澶╂暟宸�")
+    private Integer deliveryDaysDiff;
+
+    @TableField(exist = false)
+    //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
+    private Boolean isFh;
+
+    @TableField(exist = false)
+    //鏄惁鍙紪杈�
+    private Boolean isEdit;
+    @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+    @TableField(fill = FieldFill.INSERT)
+    private Integer createUser;
+
+    @TableField(fill = FieldFill.INSERT)
+    private Long deptId;
+
+    @ApiModelProperty(value = "鏄惁鏈夌敓浜ц褰�")
+    @TableField(exist = false)
+    private Boolean hasProductionRecord;
+
+    @ApiModelProperty(value = "瀹℃壒鐘舵��")
+    private Integer approvalStatus;
+
+
+    @ApiModelProperty(value = "瀹℃壒浜篿ds")
+    @TableField(exist = false)
+    private String approveUserIds;
+
+    @ApiModelProperty(value = "宸茬粦瀹氬鎵硅鍗曞垪琛�")
+    @TableField(exist = false)
+    private List<ProductOrderDto> productionOrders;
+
+
+
 }
 

--
Gitblit v1.9.3