From 9571956561915d24ebfc0915117e7df24ea3058d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 03 四月 2026 10:52:05 +0800
Subject: [PATCH] fix： 发货审批通过库存不扣减
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 19 ++++++++++++++++++-
1 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 695a17c..e8ca9d4 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -37,7 +37,7 @@
/**
* 瀹㈡埛鍚堝悓鍙�
*/
- @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+ @Excel(name = "瀹㈡埛鍚堝悓鍙�", type = Excel.Type.IMPORT)
private String customerContractNo;
@@ -89,6 +89,12 @@
private String remarks;
/**
+ * 瀹㈡埛澶囨敞
+ */
+ @Excel(name = "瀹㈡埛澶囨敞")
+ private String customerRemarks;
+
+ /**
* 闄勪欢鏉愭枡锛屽瓨鍌ㄦ枃浠跺悕绛夌浉鍏充俊鎭�
*/
private String attachmentMaterials;
@@ -136,11 +142,22 @@
@TableField(value = "delivery_date")
private LocalDate deliveryDate;
+ /**
+ * 鍙戣揣鐘舵�侊細1-鏈彂璐э紝2-瀹℃壒涓紝3-瀹℃壒涓嶉�氳繃锛�4-宸插彂璐�
+ */
+ @ApiModelProperty("鍙戣揣鐘舵�侊細1-鏈彂璐э紝2-瀹℃壒涓紝3-瀹℃壒涓嶉�氳繃锛�4-宸插彂璐�")
+ private Integer deliveryStatus;
+
@TableField(exist = false)
@ApiModelProperty(value = "浜よ揣澶╂暟宸�")
private Integer deliveryDaysDiff;
@TableField(exist = false)
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
private Boolean isFh;
+
+ @TableField(exist = false)
+ //鏄惁鍙紪杈�
+ private Boolean isEdit;
}
--
Gitblit v1.9.3