From 9d66bfbfcda297f628e6a857e343f98422f4534a Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 22 五月 2026 09:32:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'refs/remotes/origin/dev_New_pro' into dev_New_pro_OA
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 126 +++++++++++++++++++++++++++--------------
1 files changed, 83 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 7c73d97..08bb128 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -1,14 +1,19 @@
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;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
/**
* 浜у搧淇℃伅瀵硅薄 sales_ledger_product
@@ -18,7 +23,7 @@
*/
@TableName("sales_ledger_product")
@Data
-public class SalesLedgerProduct {
+public class SalesLedgerProduct implements Serializable {
private static final long serialVersionUID = 1L;
/**
@@ -32,6 +37,11 @@
*/
@Excel(name = "鍏宠仈閿�鍞彴璐︿富琛ㄤ富閿�")
private Long salesLedgerId;
+
+ /**
+ * 棰勮鏁伴噺
+ */
+ private BigDecimal warnNum;
/**
* 浜у搧澶х被
@@ -56,7 +66,8 @@
*/
@Excel(name = "鏁伴噺")
private BigDecimal quantity;
-
+ @Excel(name = "鏈�浣庡簱瀛樻暟閲�")
+ private BigDecimal minStock;
/**
* 绋庣巼
*/
@@ -93,46 +104,6 @@
private Integer type;
/**
- * 鏈鏉ョエ鏁�
- */
- private Long ticketsNum;
-
- /**
- * 鏈鏉ョエ閲戦(鍏�)
- */
- private BigDecimal ticketsAmount;
-
- /**
- * 鏈潵绁ㄦ暟
- */
- private Long futureTickets;
-
- /**
- * 鏈潵绁ㄩ噾棰�(鍏�)
- */
- private BigDecimal futureTicketsAmount;
-
- @ApiModelProperty(value = "寮�绁ㄦ暟")
- private Integer invoiceNum;
-
- @ApiModelProperty(value = "鏈紑绁ㄦ暟")
- private Integer noInvoiceNum;
-
- @ApiModelProperty(value = "寮�绁ㄩ噾棰�")
- private BigDecimal invoiceAmount;
-
- @ApiModelProperty(value = "鏈紑绁ㄩ噾棰�")
- private BigDecimal noInvoiceAmount;
-
- @ApiModelProperty(value = "鏈寮�绁ㄦ暟")
- @TableField(exist = false)
- private Integer currentInvoiceNum;
-
- @TableField(exist = false)
- @ApiModelProperty(value = "鏈寮�绁ㄩ噾棰�")
- private BigDecimal currentInvoiceAmount;
-
- /**
* 浜у搧id
*/
private Long productId;
@@ -141,4 +112,73 @@
* 浜у搧瑙勬牸id
*/
private Long productModelId;
+
+ @Schema(description = "鐧昏浜�")
+ private String register;
+
+ @Schema(description = "鐧昏鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐧昏鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime registerDate;
+ /**
+ * 鍙戣揣杞︾墝鍙�
+ */
+ @Excel(name = "鍙戣揣杞︾墝鍙�")
+ @TableField(exist = false)
+ private String shippingCarNumber;
+
+ @Schema(description = "蹇�掑叕鍙�")
+ @TableField(exist = false)
+ private String expressCompany;
+
+ @Schema(description = "蹇�掑崟鍙�")
+ @TableField(exist = false)
+ private String expressNumber;
+
+ /**
+ * 鍙戣揣鏃ユ湡
+ */
+ @Excel(name = "鍙戣揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date shippingDate;
+
+ @TableField(exist = false)
+ @Schema(description = "鍙戣揣鐘舵��")
+ private String shippingStatus = "寰呭彂璐�";
+ /**
+ * 浜у搧鐘舵��
+ */
+// @TableField(exist = false)
+ @Schema(description = "浜у搧鐘舵�侊細1-鍏呰冻")
+ private Integer approveStatus;
+
+ @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)
+ @Schema(description = "寰呭彂璐ф暟閲�")
+ private BigDecimal noQuantity;
}
--
Gitblit v1.9.3