From 1ca5584d7e3200a9af65a099bd26d3593e2ba702 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 07 五月 2026 14:36:08 +0800
Subject: [PATCH] 迁移pro
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 69 +++++++++++++++++++++++-----------
1 files changed, 46 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 1df16bd..c909871 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -1,12 +1,13 @@
package com.ruoyi.sales.pojo;
+import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import java.io.Serializable;
@@ -128,24 +129,24 @@
*/
private BigDecimal futureTicketsAmount=BigDecimal.ZERO;
- @ApiModelProperty(value = "寮�绁ㄦ暟")
+ @Schema(description = "寮�绁ㄦ暟")
private BigDecimal invoiceNum = BigDecimal.ZERO;
- @ApiModelProperty(value = "鏈紑绁ㄦ暟")
+ @Schema(description = "鏈紑绁ㄦ暟")
private BigDecimal noInvoiceNum = BigDecimal.ZERO;
- @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
+ @Schema(description = "寮�绁ㄩ噾棰�")
private BigDecimal invoiceAmount = BigDecimal.ZERO;
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
+ @Schema(description = "鏈紑绁ㄩ噾棰�")
private BigDecimal noInvoiceAmount = BigDecimal.ZERO;
- @ApiModelProperty(value = "鏈寮�绁ㄦ暟")
+ @Schema(description = "鏈寮�绁ㄦ暟")
@TableField(exist = false)
private BigDecimal currentInvoiceNum;
@TableField(exist = false)
- @ApiModelProperty(value = "鏈寮�绁ㄩ噾棰�")
+ @Schema(description = "鏈寮�绁ㄩ噾棰�")
private BigDecimal currentInvoiceAmount;
/**
@@ -158,30 +159,30 @@
*/
private Long productModelId;
- @ApiModelProperty(value = "鍒濆鏈紑绁ㄦ暟")
+ @Schema(description = "鍒濆鏈紑绁ㄦ暟")
@TableField(exist = false)
private BigDecimal originalNoInvoiceNum;
- @ApiModelProperty(value = "涓存椂鏈紑绁ㄦ暟")
+ @Schema(description = "涓存椂鏈紑绁ㄦ暟")
@TableField(exist = false)
private BigDecimal tempNoInvoiceNum;
- @ApiModelProperty(value = "涓存椂鏈紑绁ㄩ噾棰�")
+ @Schema(description = "涓存椂鏈紑绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal tempnoInvoiceAmount;
- @ApiModelProperty(value = "涓存椂鏈潵绁ㄦ暟")
+ @Schema(description = "涓存椂鏈潵绁ㄦ暟")
@TableField(exist = false)
private BigDecimal tempFutureTickets;
- @ApiModelProperty(value = "涓存椂鏈潵绁ㄩ噾棰�")
+ @Schema(description = "涓存椂鏈潵绁ㄩ噾棰�")
@TableField(exist = false)
private BigDecimal tempFutureTicketsAmount;
- @ApiModelProperty("鐧昏浜�")
+ @Schema(description = "鐧昏浜�")
private String register;
- @ApiModelProperty("鐧昏鏃ユ湡")
+ @Schema(description = "鐧昏鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime registerDate;
@@ -192,11 +193,11 @@
@TableField(exist = false)
private String shippingCarNumber;
- @ApiModelProperty("蹇�掑叕鍙�")
+ @Schema(description = "蹇�掑叕鍙�")
@TableField(exist = false)
private String expressCompany;
- @ApiModelProperty("蹇�掑崟鍙�")
+ @Schema(description = "蹇�掑崟鍙�")
@TableField(exist = false)
private String expressNumber;
@@ -209,30 +210,52 @@
private Date shippingDate;
@TableField(exist = false)
- @ApiModelProperty(value = "鍙戣揣鐘舵��")
+ @Schema(description = "鍙戣揣鐘舵��")
private String shippingStatus = "寰呭彂璐�";
/**
* 浜у搧鐘舵��
*/
// @TableField(exist = false)
- @ApiModelProperty(value = "浜у搧鐘舵�侊細1-鍏呰冻")
+ @Schema(description = "浜у搧鐘舵�侊細1-鍏呰冻")
private Integer approveStatus;
- @ApiModelProperty(value = "寰呭洖娆炬�婚噾棰�")
+ @Schema(description = "寰呭洖娆炬�婚噾棰�")
private BigDecimal pendingInvoiceTotal;
- @ApiModelProperty(value = "鍥炴鎬婚噾棰�")
+ @Schema(description = "鍥炴鎬婚噾棰�")
private BigDecimal invoiceTotal = BigDecimal.ZERO;
- @ApiModelProperty(value = "寰呬粯娆炬�婚噾棰�")
+ @Schema(description = "寰呬粯娆炬�婚噾棰�")
private BigDecimal pendingTicketsTotal;
- @ApiModelProperty(value = "浠樻鎬婚噾棰�")
+ @Schema(description = "浠樻鎬婚噾棰�")
private BigDecimal ticketsTotal = BigDecimal.ZERO;
- @ApiModelProperty(value = "鏄惁璐ㄦ")
+ @Schema(description = "鏄惁璐ㄦ")
+ //閽堝閲囪喘鍙拌处锛屾槸鍚﹁川妫�
private Boolean isChecked;
@TableField(exist = false)
private Integer hasSufficientStock;
+
+ // 閫�璐ф暟閲�
+ @TableField(exist = false)
+ private BigDecimal returnQuality;
+
+ // 鍙敤鏁伴噺 quantity - returnQuality
+ @TableField(exist = false)
+ private BigDecimal availableQuality;
+ @Schema(description = "鍒涘缓鐢ㄦ埛")
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
+
+ @TableField(fill = FieldFill.INSERT)
+ private Long deptId;
+
+ @Schema(description = "鏄惁鐢熶骇")
+ //閽堝閿�鍞彴璐︼紝鏄惁鐢熶骇
+ private Boolean isProduction;
+
+ @TableField(exist = false)
+ private BigDecimal noQuantity;
}
--
Gitblit v1.9.3