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/ProcurementBusinessSummaryDto.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
index 310ca78..3e48e79 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProcurementBusinessSummaryDto.java
@@ -8,8 +8,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -21,22 +20,24 @@
* @date : 2026/1/15 13:34
*/
@Data
-@ApiModel
+@Schema
public class ProcurementBusinessSummaryDto {
+ @Excel(name = "浜у搧澶х被")
private String productCategory;
/**
* 瑙勬牸鍨嬪彿
*/
+ @Excel(name = "瑙勬牸鍨嬪彿")
private String specificationModel;
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ @Schema(description = "寮�濮嬫椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDateStart;
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @Schema(description = "缁撴潫鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date entryDateEnd;
@@ -44,33 +45,52 @@
/**
* 閲囪喘鏁伴噺
*/
+ @Excel(name = "閲囪喘鏁伴噺")
private BigDecimal purchaseNum;
/**
* 閲囪喘閲戦
*/
+ @Excel(name = "閲囪喘閲戦")
private BigDecimal purchaseAmount;
/**
* 閲囪喘娆℃暟
*/
+ @Excel(name = "閲囪喘娆℃暟")
private Integer purchaseTimes;
/**
* 骞冲潎鍗曚环
*/
+ @Excel(name = "骞冲潎鍗曚环")
private BigDecimal averagePrice;
/**
* 渚涘簲鍟嗗悕绉�
*/
+ @Excel(name = "渚涘簲鍟嗗悕绉�")
private String supplierName;
/**
* 褰曞叆鏃ユ湡
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date entryDate;
+ /**
+ * 閫�璐ф暟閲�
+ */
+ @Excel(name = "閫�璐ф暟閲�")
+
+ private BigDecimal returnQuantity;
+
+ /**
+ * 閫�璐ч噾棰�
+ */
+ @Excel(name = "閫�璐ч噾棰�")
+ private BigDecimal returnAmount;
}
--
Gitblit v1.9.3