From b159e50bbf0f055a69ba5430fb956021ab90b450 Mon Sep 17 00:00:00 2001
From: suerwei <18810552194@163.com>
Date: 星期五, 17 五月 2024 17:41:07 +0800
Subject: [PATCH] 进出库管理调整字段
---
javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java | 46 +++++++++++++++++++++++++++-------------------
1 files changed, 27 insertions(+), 19 deletions(-)
diff --git a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
index 5b674b3..0c65631 100644
--- a/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
+++ b/javaweb-plus/javaweb-cms/src/main/java/com/javaweb/geo/domain/DeviceLog.java
@@ -40,20 +40,24 @@
@Excel(name = "璁惧鍚嶇О")
private String deviceName;
- /** 鍑哄叆搴撶被鍨嬶紙in /out锛� */
- @Excel(name = "鍑哄叆搴撶被鍨�", readConverterExp = "i=n,/=out")
+ /** 绫诲瀷锛堣澶囷紝鏉愭枡锛� */
+ @Excel(name = "鍑哄叆搴撶被鍨�", readConverterExp = "绫诲瀷锛堣澶囷紝鏉愭枡锛�")
private String type;
- /** 鍑哄叆搴撴椂闂� */
- @Excel(name = "鍑哄叆搴撴椂闂�")
- private String transactionDate;
+ /** 鍑哄簱鏃堕棿 */
+ @Excel(name = "鍑哄簱鏃堕棿")
+ private String outboundDate;
+
+ /** 鍏ュ簱鏃堕棿 */
+ @Excel(name = "鍏ュ簱鏃堕棿")
+ private String inboundDate;
/** 缁忓姙浜� */
@Excel(name = "缁忓姙浜�")
private String optUser;
/** 浣跨敤浜� */
- @Excel(name = "浣跨敤浜�")
+ @Excel(name = "璐熻矗浜�")
private String applyUser;
/** 鍑哄叆搴撴暟閲� */
@@ -130,25 +134,31 @@
this.type = type;
}
- public String getType()
- {
+ public String getType() {
return type;
}
- public void setTransactionDate(String transactionDate)
- {
- this.transactionDate = transactionDate;
+
+ public String getOutboundDate() {
+ return outboundDate;
}
- public String getTransactionDate()
- {
- return transactionDate;
+ public void setOutboundDate(String outboundDate) {
+ this.outboundDate = outboundDate;
}
- public void setOptUser(String optUser)
- {
+
+ public String getInboundDate() {
+ return inboundDate;
+ }
+
+ public void setInboundDate(String inboundDate) {
+ this.inboundDate = inboundDate;
+ }
+
+ public void setOptUser(String optUser) {
this.optUser = optUser;
}
- public String getOptUser()
+ public String getOptUser()
{
return optUser;
}
@@ -190,8 +200,6 @@
.append("deviceId", getDeviceId())
.append("deviceCode", getDeviceCode())
.append("deviceName", getDeviceName())
- .append("type", getType())
- .append("transactionDate", getTransactionDate())
.append("optUser", getOptUser())
.append("applyUser", getApplyUser())
.append("number", getNumber())
--
Gitblit v1.9.1