From dcd1aab9b5bec2556161c16bd1bc4fe71fef476d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 17:17:47 +0800
Subject: [PATCH] 关于社保补缴的计算,如果社保保险设置有多条数据,根据创建时间来判断,当月即以后得参考标准用对应的配置,并且需要统计当年从1月到现在缴纳的所有社保金额,和最新的社保比列得出的金额进行比较,计算需要补缴的金额,只有社会保险设置新增一条数据的当月会计算,其余月份对应的都是0
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 99 ++++++++++---------------------------------------
1 files changed, 21 insertions(+), 78 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..53e6c08 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -62,12 +62,6 @@
private String unit;
/**
- * 鐢熶骇鐐掓満
- */
- @Excel(name = "鐢熶骇鐐掓満")
- private String speculativeTradingName;
-
- /**
* 鏁伴噺
*/
@Excel(name = "鏁伴噺")
@@ -93,6 +87,18 @@
private BigDecimal taxInclusiveTotalPrice;
/**
+ * 杩愯垂鍗曚环
+ */
+ @Excel(name = "杩愯垂鍗曚环")
+ private BigDecimal freightUnitPrice;
+
+ /**
+ * 鎬昏繍璐�
+ */
+ @Excel(name = "鎬昏繍璐�")
+ private BigDecimal totalFreight;
+
+ /**
* 涓嶅惈绋庢�讳环
*/
@Excel(name = "涓嶅惈绋庢�讳环")
@@ -110,46 +116,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 +124,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 +161,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 = "鏄惁璐ㄦ")
//閽堝閲囪喘鍙拌处锛屾槸鍚﹁川妫�
@@ -257,5 +195,10 @@
private Boolean isProduction;
@TableField(exist = false)
+ @Schema(description = "寰呭彂璐ф暟閲�")
private BigDecimal noQuantity;
+
+ @TableField(exist = false)
+ @Schema(description = "瀹℃壒涓暟閲�")
+ private BigDecimal pendingApprovalQuantity;
}
--
Gitblit v1.9.3