From 23ec64ed997fc206fba9f0d6a84975f7b36c47be Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 11 十月 2026 16:09:26 +0800
Subject: [PATCH] 天津-奇缘恒艺 录数据需求修改
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 110 +++++++++++++-----------------------------------------
1 files changed, 27 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index c909871..a39f4ef 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -50,6 +50,11 @@
private String productCategory;
/**
+ * 鏉愯川锛堝凡搴熷純锛氬彴璐︿笉鍐嶅綍鍏ワ紝淇濈暀璇ュ垪浠ュ吋瀹瑰巻鍙叉暟鎹級
+ */
+ private String material;
+
+ /**
* 瑙勬牸鍨嬪彿
*/
@Excel(name = "瑙勬牸鍨嬪彿")
@@ -60,12 +65,6 @@
*/
@Excel(name = "鍗曚綅")
private String unit;
-
- /**
- * 鐢熶骇鐐掓満
- */
- @Excel(name = "鐢熶骇鐐掓満")
- private String speculativeTradingName;
/**
* 鏁伴噺
@@ -110,46 +109,6 @@
private Integer type;
/**
- * 鏈鏉ョエ鏁�
- */
- private BigDecimal ticketsNum=BigDecimal.ZERO;
-
- /**
- * 鏈鏉ョエ閲戦(鍏�)
- */
- private BigDecimal ticketsAmount=BigDecimal.ZERO;
-
- /**
- * 鏈潵绁ㄦ暟
- */
- private BigDecimal futureTickets=BigDecimal.ZERO;
-
- /**
- * 鏈潵绁ㄩ噾棰�(鍏�)
- */
- private BigDecimal futureTicketsAmount=BigDecimal.ZERO;
-
- @Schema(description = "寮�绁ㄦ暟")
- private BigDecimal invoiceNum = BigDecimal.ZERO;
-
- @Schema(description = "鏈紑绁ㄦ暟")
- private BigDecimal noInvoiceNum = BigDecimal.ZERO;
-
- @Schema(description = "寮�绁ㄩ噾棰�")
- private BigDecimal invoiceAmount = BigDecimal.ZERO;
-
- @Schema(description = "鏈紑绁ㄩ噾棰�")
- private BigDecimal noInvoiceAmount = BigDecimal.ZERO;
-
- @Schema(description = "鏈寮�绁ㄦ暟")
- @TableField(exist = false)
- private BigDecimal currentInvoiceNum;
-
- @TableField(exist = false)
- @Schema(description = "鏈寮�绁ㄩ噾棰�")
- private BigDecimal currentInvoiceAmount;
-
- /**
* 浜у搧id
*/
private Long productId;
@@ -158,26 +117,6 @@
* 浜у搧瑙勬牸id
*/
private Long productModelId;
-
- @Schema(description = "鍒濆鏈紑绁ㄦ暟")
- @TableField(exist = false)
- private BigDecimal originalNoInvoiceNum;
-
- @Schema(description = "涓存椂鏈紑绁ㄦ暟")
- @TableField(exist = false)
- private BigDecimal tempNoInvoiceNum;
-
- @Schema(description = "涓存椂鏈紑绁ㄩ噾棰�")
- @TableField(exist = false)
- private BigDecimal tempnoInvoiceAmount;
-
- @Schema(description = "涓存椂鏈潵绁ㄦ暟")
- @TableField(exist = false)
- private BigDecimal tempFutureTickets;
-
- @Schema(description = "涓存椂鏈潵绁ㄩ噾棰�")
- @TableField(exist = false)
- private BigDecimal tempFutureTicketsAmount;
@Schema(description = "鐧昏浜�")
private String register;
@@ -215,21 +154,13 @@
/**
* 浜у搧鐘舵��
*/
+ @TableField(exist = false)
+ @Schema(description = "鍏ュ簱瀹℃牳鐘舵��")
+ private String stockInApprovalStatus;
+
// @TableField(exist = false)
@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 = "鏄惁璐ㄦ")
//閽堝閲囪喘鍙拌处锛屾槸鍚﹁川妫�
@@ -238,11 +169,7 @@
@TableField(exist = false)
private Integer hasSufficientStock;
- // 閫�璐ф暟閲�
- @TableField(exist = false)
- private BigDecimal returnQuality;
-
- // 鍙敤鏁伴噺 quantity - returnQuality
+ // 鍙敤鏁伴噺 quantity - returnQuantity
@TableField(exist = false)
private BigDecimal availableQuality;
@Schema(description = "鍒涘缓鐢ㄦ埛")
@@ -257,5 +184,22 @@
private Boolean isProduction;
@TableField(exist = false)
+ @Schema(description = "寰呭彂璐ф暟閲�")
private BigDecimal noQuantity;
+
+ @TableField(exist = false)
+ @Schema(description = "閫�璐ф暟閲�")
+ private BigDecimal returnQuantity;
+
+ @TableField(exist = false)
+ @Schema(description = "閿�鍞彂璐ф暟閲�")
+ private BigDecimal shippedQuantity;
+
+ @TableField(exist = false)
+ @Schema(description = "宸插鏍稿叆搴撴暟閲�")
+ private BigDecimal approvedStockInNum;
+
+ @TableField(exist = false)
+ @Schema(description = "瀹℃壒涓暟閲�")
+ private BigDecimal pendingApprovalQuantity;
}
--
Gitblit v1.9.3