From 76e470b26081aa23bab72b3ca628c666e735f261 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 16 五月 2026 10:58:36 +0800
Subject: [PATCH] feat(PurchaseLedgerTemplate) productId productModelId 以及对应db 数据类型修正为long 去接受PurchaseLedgerDto.productData 中的productId productModelId(long)
---
src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java b/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
index d5f8b28..793fba6 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/SalesLedgerProductTemplate.java
@@ -8,8 +8,7 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
@@ -24,56 +23,56 @@
@Getter
@Setter
@TableName("sales_ledger_product_template")
-@ApiModel(value = "SalesLedgerProductTemplate瀵硅薄", description = "浜у搧淇℃伅妯℃澘")
+@Schema(name = "SalesLedgerProductTemplate瀵硅薄", description = "浜у搧淇℃伅妯℃澘")
public class SalesLedgerProductTemplate implements Serializable {
private static final long serialVersionUID = 1L;
- @ApiModelProperty("浜у搧淇℃伅涓婚敭")
+ @Schema(description = "浜у搧淇℃伅涓婚敭")
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鍏宠仈鍙拌处涓昏〃涓婚敭")
+ @Schema(description = "鍏宠仈鍙拌处涓昏〃涓婚敭")
private Integer salesLedgerId;
- @ApiModelProperty("浜у搧澶х被")
+ @Schema(description = "浜у搧澶х被")
private String productCategory;
- @ApiModelProperty("瑙勬牸鍨嬪彿")
+ @Schema(description = "瑙勬牸鍨嬪彿")
private String specificationModel;
- @ApiModelProperty("鍗曚綅")
+ @Schema(description = "鍗曚綅")
private String unit;
- @ApiModelProperty("鏁伴噺")
+ @Schema(description = "鏁伴噺")
private BigDecimal quantity;
- @ApiModelProperty("鏈�浣庡簱瀛�")
+ @Schema(description = "鏈�浣庡簱瀛�")
private BigDecimal minStock;
- @ApiModelProperty("绋庣巼")
+ @Schema(description = "绋庣巼")
private BigDecimal taxRate;
- @ApiModelProperty("鍚◣鍗曚环")
+ @Schema(description = "鍚◣鍗曚环")
private BigDecimal taxInclusiveUnitPrice;
- @ApiModelProperty("鍚◣鎬讳环")
+ @Schema(description = "鍚◣鎬讳环")
private BigDecimal taxInclusiveTotalPrice;
- @ApiModelProperty("涓嶅惈绋庢�讳环")
+ @Schema(description = "涓嶅惈绋庢�讳环")
private BigDecimal taxExclusiveTotalPrice;
- @ApiModelProperty("鍙戠エ绫诲瀷")
+ @Schema(description = "鍙戠エ绫诲瀷")
private String invoiceType;
- @ApiModelProperty("1.閿�鍞彴璐︼紝2.閲囪喘鍙拌处")
+ @Schema(description = "1.閿�鍞彴璐︼紝2.閲囪喘鍙拌处")
private Integer type;
- @ApiModelProperty("浜у搧id")
- private Integer productId;
+ @Schema(description = "浜у搧id")
+ private Long productId;
- @ApiModelProperty("鍨嬪彿id")
- private Integer productModelId;
+ @Schema(description = "鍨嬪彿id")
+ private Long productModelId;
private String register;
@@ -81,9 +80,9 @@
private BigDecimal warnNum;
- @ApiModelProperty("鏄惁鎺ㄩ�佽川妫�")
+ @Schema(description = "鏄惁鎺ㄩ�佽川妫�")
private Boolean isChecked;
- @ApiModelProperty(value = "鍒涘缓鐢ㄦ埛")
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
--
Gitblit v1.9.3