From d55278560d29562b341aafa1652209a8aae0af33 Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期四, 30 四月 2026 17:08:16 +0800
Subject: [PATCH] 计量器具台账附件修改
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 99 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 73 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index f35b916..70ffa12 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;
@@ -111,41 +112,41 @@
/**
* 鏈鏉ョエ鏁�
*/
- private BigDecimal ticketsNum;
+ private BigDecimal ticketsNum=BigDecimal.ZERO;
/**
* 鏈鏉ョエ閲戦(鍏�)
*/
- private BigDecimal ticketsAmount;
+ private BigDecimal ticketsAmount=BigDecimal.ZERO;
/**
* 鏈潵绁ㄦ暟
*/
- private BigDecimal futureTickets;
+ private BigDecimal futureTickets=BigDecimal.ZERO;
/**
* 鏈潵绁ㄩ噾棰�(鍏�)
*/
- private BigDecimal futureTicketsAmount;
+ private BigDecimal futureTicketsAmount=BigDecimal.ZERO;
- @ApiModelProperty(value = "寮�绁ㄦ暟")
- private BigDecimal invoiceNum;
+ @Schema(description = "寮�绁ㄦ暟")
+ private BigDecimal invoiceNum = BigDecimal.ZERO;
- @ApiModelProperty(value = "鏈紑绁ㄦ暟")
- private BigDecimal noInvoiceNum;
+ @Schema(description = "鏈紑绁ㄦ暟")
+ private BigDecimal noInvoiceNum = BigDecimal.ZERO;
- @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
- private BigDecimal invoiceAmount;
+ @Schema(description = "寮�绁ㄩ噾棰�")
+ private BigDecimal invoiceAmount = BigDecimal.ZERO;
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
- private BigDecimal noInvoiceAmount;
+ @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,6 +193,14 @@
@TableField(exist = false)
private String shippingCarNumber;
+ @Schema(description = "蹇�掑叕鍙�")
+ @TableField(exist = false)
+ private String expressCompany;
+
+ @Schema(description = "蹇�掑崟鍙�")
+ @TableField(exist = false)
+ private String expressNumber;
+
/**
* 鍙戣揣鏃ユ湡
*/
@@ -201,12 +210,50 @@
private Date shippingDate;
@TableField(exist = false)
- @ApiModelProperty(value = "鐢熶骇鐘舵��")
- private String productionStatus = "鏈紑濮�";
+ @Schema(description = "鍙戣揣鐘舵��")
+ private String shippingStatus = "寰呭彂璐�";
/**
- * 鍙戣揣瀹℃壒鐘舵��
+ * 浜у搧鐘舵��
*/
// @TableField(exist = false)
- @ApiModelProperty(value = "瀹℃壒鐘舵��")
+ @Schema(description = "浜у搧鐘舵�侊細1-鍏呰冻")
private Integer approveStatus;
+
+ @Schema(description = "寰呭洖娆炬�婚噾棰�")
+ private BigDecimal pendingInvoiceTotal;
+
+ @Schema(description = "鍥炴鎬婚噾棰�")
+ private BigDecimal invoiceTotal = BigDecimal.ZERO;
+
+ @Schema(description = "寰呬粯娆炬�婚噾棰�")
+ private BigDecimal pendingTicketsTotal;
+
+ @Schema(description = "浠樻鎬婚噾棰�")
+ private BigDecimal ticketsTotal = BigDecimal.ZERO;
+
+ @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;
+
}
--
Gitblit v1.9.3