From b4fc4408fae3f46edeb6c5421224c484bb149a89 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 15 六月 2026 16:22:40 +0800
Subject: [PATCH] 同一月份工资不可以发放多次
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 08bb128..d9e9457 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -87,6 +87,18 @@
private BigDecimal taxInclusiveTotalPrice;
/**
+ * 杩愯垂鍗曚环
+ */
+ @Excel(name = "杩愯垂鍗曚环")
+ private BigDecimal freightUnitPrice;
+
+ /**
+ * 鎬昏繍璐�
+ */
+ @Excel(name = "鎬昏繍璐�")
+ private BigDecimal totalFreight;
+
+ /**
* 涓嶅惈绋庢�讳环
*/
@Excel(name = "涓嶅惈绋庢�讳环")
@@ -112,6 +124,9 @@
* 浜у搧瑙勬牸id
*/
private Long productModelId;
+
+ @Schema(description = "搴撳瓨绫诲瀷锛歲ualified/waste")
+ private String stockType;
@Schema(description = "鐧昏浜�")
private String register;
@@ -149,6 +164,10 @@
/**
* 浜у搧鐘舵��
*/
+ @TableField(exist = false)
+ @Schema(description = "鍏ュ簱瀹℃牳鐘舵��")
+ private String stockInApprovalStatus;
+
// @TableField(exist = false)
@Schema(description = "浜у搧鐘舵�侊細1-鍏呰冻")
private Integer approveStatus;
@@ -167,6 +186,10 @@
// 鍙敤鏁伴噺 quantity - returnQuality
@TableField(exist = false)
private BigDecimal availableQuality;
+
+ // 寰呭叆搴撴暟閲� quantity - 宸插鎵圭悊璁哄叆搴� - 寰呭鎵圭悊璁哄叆搴�
+ @TableField(exist = false)
+ private BigDecimal pendingInboundQuantity;
@Schema(description = "鍒涘缓鐢ㄦ埛")
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
@@ -181,4 +204,8 @@
@TableField(exist = false)
@Schema(description = "寰呭彂璐ф暟閲�")
private BigDecimal noQuantity;
+
+ @TableField(exist = false)
+ @Schema(description = "瀹℃壒涓暟閲�")
+ private BigDecimal pendingApprovalQuantity;
}
--
Gitblit v1.9.3