From 39e8f88af6d3c07c183cda4e7c1d1b1c850209f5 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 18 六月 2026 15:58:59 +0800
Subject: [PATCH] 生产报废、废品发货退货后、不合格处理报废的产品都要进到废品库

---
 src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java |   17 ++++++++++++++++-
 1 files changed, 16 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 cd3b9fd..2966237 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -27,6 +27,11 @@
 
     private String entryDateStart;
     private String entryDateEnd;
+    @Schema(description = "鍏ュ簱鐘舵��")
+    private String stockInStatus;
+
+    @Schema(description = "鏄惁鎵�鏈変骇鍝侀兘闇�瑕佽川妫�")
+    private Boolean allNeedQualityCheck;
 
     private Long id;
 
@@ -86,7 +91,7 @@
     /**
      * 褰曞叆鏃ユ湡
      */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
     private Date entryDate;
 
@@ -130,6 +135,9 @@
     private Integer Type;
 
     private List<SalesLedgerProduct> productData;
+
+    @Schema(description = "鎵归噺澶勭悊閲囪喘鍙拌处ID鍒楄〃")
+    private List<Long> ids;
 
     private List<String> tempFileIds;
 
@@ -178,6 +186,13 @@
 
     @Schema(description = "浠樻鏂瑰紡")
     private String paymentMethod;
+
+    @Schema(description = "杞︾墝鍙�")
+    private String carPlateNumber;
+
+    @Schema(description = "杩愯緭鍗曚綅/涓汉")
+    private String transportUnitOrPerson;
+
     @Schema(description = "瀹℃壒鐘舵��")
     private Integer approvalStatus;
     @Schema(description = "妯℃澘鍚嶇О")

--
Gitblit v1.9.3