From c3a981e80973ac52b5988aca62b87409976c6fb1 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 18 六月 2026 13:09:28 +0800
Subject: [PATCH] 1.计量器具台账上传附件报错 2.质量拉的数据不对（未明确） 3.计量器具台账逾期的做标红提醒 4.设备保养定时任务和记录要加上具体的保养内容 5.质量要区分质检规则抽检还是全检，抽检的话是抽多少百分比 6.供应商管理东西太少了，没有资质文件啊这些东西（是不是可以参考pro） 7.采购审批把人从李莹莹改成龙红星
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 32 ++++++++++++--------------------
1 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index c6b1406..31df834 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -27,6 +27,8 @@
private String entryDateStart;
private String entryDateEnd;
+ @Schema(description = "鍏ュ簱鐘舵��")
+ private String stockInStatus;
private Long id;
@@ -48,11 +50,11 @@
*/
@Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
- /**
- * 鏄惁鐧藉悕鍗�
- */
- @Excel(name = "鏄惁鐧藉悕鍗�")
- private Integer isWhite;
+// /**
+// * 鏄惁鐧藉悕鍗�
+// */
+// @Excel(name = "鏄惁鐧藉悕鍗�")
+// private Integer isWhite;
/**
* 褰曞叆浜哄鍚峣d
@@ -131,6 +133,9 @@
private List<SalesLedgerProduct> productData;
+ @Schema(description = "鎵归噺澶勭悊閲囪喘鍙拌处ID鍒楄〃")
+ private List<Long> ids;
+
private List<String> tempFileIds;
private List<CommonFile> SalesLedgerFiles;
@@ -165,26 +170,11 @@
private BigDecimal invoiceAmount;
/**
- * 鏉ョエ鐧昏id
- */
- private Long ticketRegistrationId;
-
- /**
* 鍚堝悓閲戦锛堜骇鍝佸惈绋庢�讳环锛�
*/
@Excel(name = "鍚堝悓閲戦")
private BigDecimal contractAmount = BigDecimal.ZERO;
-
- @TableField(exist = false)
- @Schema(description = "鏉ョエ閲戦")
- @Excel(name = "宸叉潵绁ㄩ噾棰�(鍏�)")
- private BigDecimal receiptPaymentAmount = BigDecimal.ZERO;
-
- @Schema(description = "鏈潵绁ㄩ噾棰�")
- @TableField(exist = false)
- @Excel(name = "鏈潵绁ㄩ噾棰�(鍏�)")
- private BigDecimal unReceiptPaymentAmount =BigDecimal.ZERO;
@Schema(description = "鏂囦欢绫诲瀷 鍙� 4")
@TableField(exist = false)
@@ -195,6 +185,8 @@
private String paymentMethod;
@Schema(description = "瀹℃壒鐘舵��")
private Integer approvalStatus;
+ @Schema(description = "鏀惰揣鐘舵�� 1-寰呮敹璐� 2-鏀惰揣涓� 3-宸叉敹璐�")
+ private Integer status;
@Schema(description = "妯℃澘鍚嶇О")
private String templateName;
@Schema(description = "瀹℃壒浜篿d")
--
Gitblit v1.9.3