From 3ee0745bd5168d91c9464b3c948745cb1bcdde8d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 22 四月 2026 09:23:45 +0800
Subject: [PATCH] fix: 去除生产相关入库
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java | 36 +++++++++++++++++++++++++++++++-----
1 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
index 53157d7..3831d47 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
@@ -1,17 +1,17 @@
package com.ruoyi.sales.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.SalesLedgerProductProcess;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-
-
-import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
-import java.time.LocalDate;
+import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SalesLedgerProductDto extends SalesLedgerProduct {
/**
@@ -44,4 +44,30 @@
*/
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("浜у搧瑙勬牸-鍗曚綅(product_model)")
+ private String productModelUnit;
+
+ @ApiModelProperty("閿�鍞骇鍝侀澶栧姞宸�")
+ private List<SalesLedgerProductProcess> salesProductProcessList;
+
}
--
Gitblit v1.9.3