From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位，审核
---
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java | 34 +++++++++++++++++++++++++++++-----
1 files changed, 29 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 79cb32f..6bb8e1d 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;
/**
* 浜у搧淇℃伅涓婚敭
@@ -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宸插彂璐�")
+ @ApiModelProperty(value = "浜у搧鐘舵�侊細1-鍏呰冻")
private Integer approveStatus;
@ApiModelProperty(value = "寰呭洖娆炬�婚噾棰�")
@@ -224,4 +237,15 @@
@ApiModelProperty(value = "鏄惁璐ㄦ")
private Boolean isChecked;
+
+ @TableField(exist = false)
+ private Integer hasSufficientStock;
+
+ @ApiModelProperty(value = "鍙戣揣鏁伴噺")
+ @TableField(exist = false)
+ private BigDecimal shippingNum;
+
+ @ApiModelProperty(value = "閫�璐ф暟閲�")
+ @TableField(exist = false)
+ private BigDecimal returnNum;
}
--
Gitblit v1.9.3