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/dto/SalesLedgerProductDto.java | 71 +++++++++++++++++++++++++++++++++++
1 files changed, 70 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
index c51e642..07f291d 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
@@ -1,4 +1,73 @@
package com.ruoyi.sales.dto;
-public class SalesLedgerProductDto {
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class SalesLedgerProductDto extends SalesLedgerProduct {
+
+
+
+ /**
+ * 鐧昏缁撴潫鏃ユ湡
+ */
+// @JsonFormat(pattern = "yyyy-MM-dd",shape = JsonFormat.Shape.STRING)
+ private String registrationtDate;
+ /**
+ * 閲囪喘鍚堝悓鍙�
+ */
+ @Excel(name = "閲囪喘鍚堝悓鍙�")
+ private String purchaseContractNumber;
+ /**
+ * 閿�鍞悎鍚屽彿
+ */
+ private String salesContractNo;
+ /**
+ * 瀹㈡埛鍚堝悓鍙�
+ */
+ private String customerContractNo;
+ /**
+ * 椤圭洰鍚嶇О
+ */
+ private String projectName;
+ /**
+ * 瀹㈡埛鍚嶇О
+ */
+ private String customerName;
+ /**
+ * 鐘舵��
+ */
+ private String statusName;
+ /**
+ * true:涓嶆樉绀哄緟浠樻锛屽洖娆句负0鐨勬暟鎹�
+ */
+ private Boolean status;
+
+ /**
+ * 渚涘簲鍟嗗悕绉�
+ */
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ /**
+ * 渚涘簲鍟唅d
+ */
+ private Long supplierId;
+
+ private Integer approvalStatus;
+
+
+ @ApiModelProperty(value = "鏈��璐ф暟")
+ private BigDecimal unQuantity;
+
+ @ApiModelProperty(value = "閫�璐ф�绘暟")
+ private BigDecimal totalReturnNum;
+
+ @ApiModelProperty(value = "渚涘簲鍟嗗悕绉版垨鍚堝悓鍙�")
+ private String supplierNameOrContractNo;
+
}
--
Gitblit v1.9.3