From 84344f16a7f783cd32731764010a75a0af268384 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 08 四月 2026 11:32:37 +0800
Subject: [PATCH] feat:同步烜曌工贸（gongchunyi-26/4/3）
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 742529c..a52c2b4 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -192,6 +192,14 @@
@TableField(exist = false)
private String shippingCarNumber;
+ @ApiModelProperty("蹇�掑叕鍙�")
+ @TableField(exist = false)
+ private String expressCompany;
+
+ @ApiModelProperty("蹇�掑崟鍙�")
+ @TableField(exist = false)
+ private String expressNumber;
+
/**
* 鍙戣揣鏃ユ湡
*/
@@ -200,14 +208,14 @@
@JsonFormat(pattern = "yyyy-MM-dd")
private Date shippingDate;
-// @TableField(exist = false)
-// @ApiModelProperty(value = "鐢熶骇鐘舵��")
-// private String productionStatus = "鏈紑濮�";
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍙戣揣鐘舵��")
+ private String shippingStatus = "寰呭彂璐�";
/**
- * 鍙戣揣瀹℃壒鐘舵��
+ * 浜у搧鐘舵��
*/
// @TableField(exist = false)
- @ApiModelProperty(value = "瀹℃壒鐘舵�侊細0鏈敓浜�,1宸茬敓浜�,2瀹℃壒涓�(寰呭鎵�),3瀹℃壒閫氳繃锛�4瀹℃壒澶辫触")
+ @ApiModelProperty(value = "浜у搧鐘舵�侊細1-鍏呰冻")
private Integer approveStatus;
@ApiModelProperty(value = "寰呭洖娆炬�婚噾棰�")
@@ -224,4 +232,43 @@
@ApiModelProperty(value = "鏄惁璐ㄦ")
private Boolean isChecked;
+
+ @TableField(exist = false)
+ private Integer hasSufficientStock;
+
+ // 閫�璐ф暟閲�
+ @TableField(exist = false)
+ private BigDecimal returnQuality;
+
+ // 鍙敤鏁伴噺 quantity - returnQuality
+ @TableField(exist = false)
+ private BigDecimal availableQuality;
+
+ /**
+ * 鍗曚环锛堝绉佷笓鐢級
+ */
+ @ApiModelProperty(value = "鍗曚环锛堝绉佷笓鐢級")
+ @Excel(name = "鍗曚环锛堝绉侊級")
+ private BigDecimal unitPrice;
+
+ /**
+ * 鎬讳环锛堝绉佷笓鐢級
+ */
+ @ApiModelProperty(value = "鎬讳环锛堝绉佷笓鐢級")
+ @Excel(name = "鎬讳环锛堝绉侊級")
+ private BigDecimal totalPrice;
+
+ /**
+ * 杩愯垂
+ */
+ @ApiModelProperty(value = "杩愯垂")
+ @Excel(name = "杩愯垂")
+ private BigDecimal freight = BigDecimal.ZERO;
+
+ /**
+ * 鍚繍璐瑰崟浠�
+ */
+ @ApiModelProperty(value = "鍚繍璐瑰崟浠�")
+ @Excel(name = "鍚繍璐瑰崟浠�")
+ private BigDecimal priceWithFreight;
}
--
Gitblit v1.9.3