From b62f5881e2d0976738c38fd373ede43d92c32cbf Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 07 八月 2025 10:22:29 +0800
Subject: [PATCH] 新增待入账明细前后端
---
service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java | 40 +++++++++-------------------------------
1 files changed, 9 insertions(+), 31 deletions(-)
diff --git a/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java b/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
index f60e8e5..9a4a2dc 100644
--- a/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
+++ b/service/src/main/java/com/ruoyi/cwgl/domain/DispatchOrder.java
@@ -5,7 +5,6 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.baomidou.mybatisplus.annotation.TableField;
-import java.util.Date;
import lombok.Data;
/**
* 璋冨害鍗曞璞� dispatch_order
@@ -24,9 +23,10 @@
/** 璋冨害鍗曞彿 */
@Excel(name = "璋冨害鍗曞彿")
-
- @TableField("dispatch_no")
+ @TableField("dispatch_no")
private String dispatchNo;
+ @TableField("customer_name")
+ private String customerName;
/** 杩愯緭鏂瑰紡 */
@@ -208,55 +208,33 @@
@TableField("is_deleted")
private Integer isDeleted;
- public String getActualDepartureTimeBegin() {
- return actualDepartureTimeBegin!=null?actualArrivalTimeBegin+" 00:00:00":null;
- }
-
public void setActualDepartureTimeBegin(String actualDepartureTimeBegin) {
- this.actualDepartureTimeBegin = actualDepartureTimeBegin;
- }
+ this.actualDepartureTimeBegin = actualDepartureTimeBegin!=null?actualDepartureTimeBegin+" 00:00:00":null;
- public String getActualDepartureTimeEnd() {
- return actualDepartureTimeEnd!=null?actualDepartureTimeEnd+" 23:59:59":null;
}
public void setActualDepartureTimeEnd(String actualDepartureTimeEnd) {
- this.actualDepartureTimeEnd = actualDepartureTimeEnd;
+ this.actualDepartureTimeEnd = actualDepartureTimeEnd!=null?actualDepartureTimeEnd+" 23:59:59":null;
}
- public String getRequiredArrivalTimeBegin() {
- return requiredArrivalTimeBegin!=null?requiredArrivalTimeBegin+" 00:00:00":null;
- }
public void setRequiredArrivalTimeBegin(String requiredArrivalTimeBegin) {
- this.requiredArrivalTimeBegin = requiredArrivalTimeBegin;
+ this.requiredArrivalTimeBegin = requiredArrivalTimeBegin!=null?requiredArrivalTimeBegin+" 00:00:00":null;
}
- public String getRequiredArrivalTimeEnd() {
- return requiredArrivalTimeEnd!=null?requiredArrivalTimeEnd+" 23:59:59":null;
- }
public void setRequiredArrivalTimeEnd(String requiredArrivalTimeEnd) {
- this.requiredArrivalTimeEnd = requiredArrivalTimeEnd;
+ this.requiredArrivalTimeEnd = requiredArrivalTimeEnd!=null?requiredArrivalTimeEnd+" 23:59:59":null;
}
-
-
- public String getActualArrivalTimeBegin() {
- return actualArrivalTimeBegin!=null?actualArrivalTimeBegin+" 00:00:00":null;
- }
public void setActualArrivalTimeBegin(String actualArrivalTimeBegin) {
- this.actualArrivalTimeBegin = actualArrivalTimeBegin;
- }
-
- public String getActualArrivalTimeEnd() {
- return actualArrivalTimeEnd!=null?actualArrivalTimeEnd+" 23:59:59":null;
+ this.actualArrivalTimeBegin = actualArrivalTimeBegin!=null?actualArrivalTimeBegin+" 00:00:00":null;
}
public void setActualArrivalTimeEnd(String actualArrivalTimeEnd) {
- this.actualArrivalTimeEnd = actualArrivalTimeEnd;
+ this.actualArrivalTimeEnd = actualArrivalTimeEnd!=null?actualArrivalTimeEnd+" 23:59:59":null;
}
}
--
Gitblit v1.8.0