From bf84fec7d8dd5e7fbcc93030b8d83da7ec0ece91 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 03 四月 2026 15:39:36 +0800
Subject: [PATCH] yys
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 6111d1d..7515c2a 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;
/**
@@ -192,6 +197,14 @@
@TableField(exist = false)
private String shippingCarNumber;
+ @ApiModelProperty("蹇�掑叕鍙�")
+ @TableField(exist = false)
+ private String expressCompany;
+
+ @ApiModelProperty("蹇�掑崟鍙�")
+ @TableField(exist = false)
+ private String expressNumber;
+
/**
* 鍙戣揣鏃ユ湡
*/
@@ -200,14 +213,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 = "寰呭洖娆炬�婚噾棰�")
@@ -227,4 +240,15 @@
@TableField(exist = false)
private Integer hasSufficientStock;
+
+ @ApiModelProperty(value = "鍙戣揣鏁伴噺")
+ @TableField(exist = false)
+ private BigDecimal shippingNum;
+
+ @ApiModelProperty(value = "閫�璐ф暟閲�")
+ @TableField(exist = false)
+ private BigDecimal returnNum;
+
+ @ApiModelProperty(value = "鐗╂枡鍙�")
+ private String material;
}
--
Gitblit v1.9.3