From 99e26030611fdc06ee3dd523072fe5516b78dc5b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 11 五月 2026 13:05:38 +0800
Subject: [PATCH] feat(sales): 添加销售订单和产品相关字段
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 3966071..07f6cdb 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -23,7 +23,12 @@
@TableName("sales_ledger_product")
@Data
public class SalesLedgerProduct implements Serializable {
+
private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty(value = "搴撲綅")
+ @TableField(exist = false)
+ private String stockLocation;
/**
* 浜у搧淇℃伅涓婚敭
@@ -49,9 +54,9 @@
private String productCategory;
/**
- * 瑙勬牸鍨嬪彿
+ * 鍥剧焊缂栧彿
*/
- @Excel(name = "瑙勬牸鍨嬪彿")
+ @Excel(name = "鍥剧焊缂栧彿")
private String specificationModel;
/**
@@ -90,6 +95,26 @@
*/
@Excel(name = "鍚◣鎬讳环")
private BigDecimal taxInclusiveTotalPrice;
+
+ @ApiModelProperty(value = "浜よ揣鏁伴噺")
+ @Excel(name = "浜よ揣鏁伴噺")
+ private BigDecimal deliveryQuantity;
+
+ @ApiModelProperty(value = "鍓╀綑鏁伴噺")
+ @Excel(name = "鍓╀綑鏁伴噺")
+ private BigDecimal remainingQuantity;
+
+ @ApiModelProperty(value = "瀛愬簱瀛�")
+ @Excel(name = "瀛愬簱瀛�")
+ private String subInventory;
+
+ @ApiModelProperty(value = "璐т綅")
+ @Excel(name = "璐т綅")
+ private String location;
+
+ @ApiModelProperty(value = "鏄惁鍠风爞")
+ @Excel(name = "鏄惁鍠风爞")
+ private Boolean isSpray;
/**
* 涓嶅惈绋庢�讳环
@@ -192,6 +217,14 @@
@TableField(exist = false)
private String shippingCarNumber;
+ @ApiModelProperty("蹇�掑叕鍙�")
+ @TableField(exist = false)
+ private String expressCompany;
+
+ @ApiModelProperty("蹇�掑崟鍙�")
+ @TableField(exist = false)
+ private String expressNumber;
+
/**
* 鍙戣揣鏃ユ湡
*/
@@ -202,7 +235,7 @@
@TableField(exist = false)
@ApiModelProperty(value = "鍙戣揣鐘舵��")
- private String shippingStatus;
+ private String shippingStatus = "寰呭彂璐�";
/**
* 浜у搧鐘舵��
*/
@@ -227,4 +260,16 @@
@TableField(exist = false)
private Integer hasSufficientStock;
+
+ @ApiModelProperty(value = "鍙戣揣鏁伴噺")
+ @TableField(exist = false)
+ private BigDecimal shippingNum;
+
+ @ApiModelProperty(value = "閫�璐ф暟閲�")
+ @TableField(exist = false)
+ private BigDecimal returnNum;
+
+ @ApiModelProperty(value = "鐗╂枡鍙�")
+ @Excel(name = "鐗╂枡鍙�")
+ private String materialNo;
}
--
Gitblit v1.9.3