From 4809db01709fd66fe3a25452ef41a6378b6ac6c8 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 11:18:21 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_cbsglxt
---
src/main/java/com/ruoyi/procurementrecord/dto/ProcurementManagementUpdateDto.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementManagementUpdateDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementManagementUpdateDto.java
index ae93d84..0d97384 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementManagementUpdateDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ProcurementManagementUpdateDto.java
@@ -1,11 +1,8 @@
package com.ruoyi.procurementrecord.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
-import java.time.LocalDateTime;
/**
* @author :yys
@@ -15,6 +12,23 @@
public class ProcurementManagementUpdateDto {
private String createBy;
+ private BigDecimal minStock;
+
+
+ /**
+ * 鍗曚环
+ */
+ private BigDecimal unitPrice;
+
+ /**
+ * 鎬讳环
+ */
+ private BigDecimal totalPrice;
+
+ // 鍗曚环
+ private BigDecimal taxInclusiveUnitPrice;
+ // 鎬讳环
+ private BigDecimal taxInclusiveTotalPrice;
private Long createUser;
@@ -23,5 +37,5 @@
private String entryDate;
private Integer id;
-
+ private Integer salesLedgerProductId;
}
--
Gitblit v1.9.3