From 1f938212fd4d7c81480c777aead1a87e123afed9 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 03 二月 2026 10:39:59 +0800
Subject: [PATCH] fix: 导出的生产订单数据中完成状态更改为完成进度
---
src/main/java/com/ruoyi/sales/pojo/SalesLedger.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 35b7488..35ac5f5 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -40,20 +40,6 @@
@Excel(name = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
- /**
- * 鍙戣揣杞︾墝鍙�
- */
- @Excel(name = "鍙戣揣杞︾墝鍙�")
- @TableField(exist = false)
- private String shippingCarNumber;
-
- /**
- * 鍙戣揣鏃ユ湡
- */
- @Excel(name = "鍙戣揣鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @TableField(exist = false)
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date shippingDate;
/**
* 椤圭洰鍚嶇О
@@ -140,5 +126,22 @@
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鐢熶骇鐘舵��")
+ private String productionStatus = "鏈紑濮�";
+
+ //浜よ揣鏃ユ湡
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ @TableField(value = "delivery_date")
+ private LocalDate deliveryDate;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "浜よ揣澶╂暟宸�")
+ private Integer deliveryDaysDiff;
+
+ @TableField(exist = false)
+ //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
+ private Boolean isFh;
}
--
Gitblit v1.9.3