From 1769107c38d40f7d209a48ab7752fe27a81b9709 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 14 四月 2026 17:48:18 +0800
Subject: [PATCH] fix:1.出库台账(删除出库记录查询结果有误)增加批号和供应商 2.出入库不合格管理加批号和供应商 3.发货以及发货记录(部分发货)
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index 547861e..c8ea3f5 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -7,6 +7,7 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.util.Date;
@@ -14,6 +15,12 @@
@Data
public class PurchaseLedgerDto {
+ /**
+ * 瀹℃壒浜篿d鍒楄〃
+ */
+ @ApiModelProperty(value = "瀹℃壒浜篿d鍒楄〃")
+ private String approveUserIds;
+
private String entryDateStart;
@@ -28,6 +35,7 @@
private String purchaseContractNumber;
+
/**
* 渚涘簲鍟嗗悕绉癷d
*/
@@ -38,6 +46,11 @@
*/
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
+ /**
+ * 鏄惁鐧藉悕鍗�
+ */
+ @Excel(name = "鏄惁鐧藉悕鍗�")
+ private Integer isWhite;
/**
* 褰曞叆浜哄鍚峣d
@@ -74,6 +87,14 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
+
+ /**
+ * 绛捐鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "绛捐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private Date executionDate;
/**
* 澶囨敞
@@ -170,5 +191,10 @@
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
-
+ @ApiModelProperty("瀹℃壒鐘舵��")
+ private Integer approvalStatus;
+ @ApiModelProperty(value = "妯℃澘鍚嶇О")
+ private String templateName;
+ @ApiModelProperty(value = "瀹℃壒浜篿d")
+ private Integer approverId;
}
--
Gitblit v1.9.3