From 65bf12d8c871308e36fff97d985f49ad6bce6adc Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 07 四月 2026 16:01:09 +0800
Subject: [PATCH] feat: 支持个人对私录入销售订单；支持个人采购；供应商、客户档案、销售采购导入导出修改
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 48 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 2a05597..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;
+
/**
* 鍙戣揣鏃ユ湡
*/
@@ -202,7 +210,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "鍙戣揣鐘舵��")
- private String shippingStatus;
+ private String shippingStatus = "寰呭彂璐�";
/**
* 浜у搧鐘舵��
*/
@@ -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