From 3822fcf8e60ecf62e9de48bcf9b014df1b8e8896 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 27 Sep 2023 16:37:31 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=89=A9=E6=96=99=E4=BF=A1?=
=?UTF-8?q?=E6=81=AF=E3=80=81=E8=AE=BE=E5=A4=87=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../aucma/base/domain/BaseDeviceLedger.java | 44 +++++++++++++++++--
.../aucma/base/domain/BaseMaterialinfo.java | 14 ++++++
.../mapper/base/BaseDeviceLedgerMapper.xml | 14 +++++-
.../mapper/base/BaseMaterialinfoMapper.xml | 5 +++
4 files changed, 73 insertions(+), 4 deletions(-)
diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java
index 9704ac5..2cde3f7 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseDeviceLedger.java
@@ -44,7 +44,7 @@ public class BaseDeviceLedger extends BaseEntity {
* 设备类型
*/
@Excel(name = "设备类型")
- private Long deviceType;
+ private String deviceType;
/**
* 设备位置
@@ -64,6 +64,19 @@ public class BaseDeviceLedger extends BaseEntity {
@Excel(name = "使用部门")
private String usedDepartment;
+ /** 成本中心 */
+ @Excel(name = "成本中心")
+ private String costCenter;
+
+ /** 生产厂商 */
+ @Excel(name = "生产厂商")
+ private String manufacturer;
+
+ /** 启用日期 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "启用日期", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date enableDate;
+
/**
* 所属工位
*/
@@ -102,6 +115,31 @@ public class BaseDeviceLedger extends BaseEntity {
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime;
+
+ public String getCostCenter() {
+ return costCenter;
+ }
+
+ public void setCostCenter(String costCenter) {
+ this.costCenter = costCenter;
+ }
+
+ public String getManufacturer() {
+ return manufacturer;
+ }
+
+ public void setManufacturer(String manufacturer) {
+ this.manufacturer = manufacturer;
+ }
+
+ public Date getEnableDate() {
+ return enableDate;
+ }
+
+ public void setEnableDate(Date enableDate) {
+ this.enableDate = enableDate;
+ }
+
public void setObjId(Long objId) {
this.objId = objId;
}
@@ -134,11 +172,11 @@ public class BaseDeviceLedger extends BaseEntity {
return deviceModel;
}
- public void setDeviceType(Long deviceType) {
+ public void setDeviceType(String deviceType) {
this.deviceType = deviceType;
}
- public Long getDeviceType() {
+ public String getDeviceType() {
return deviceType;
}
diff --git a/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialinfo.java b/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialinfo.java
index 58e6443..b4edb77 100644
--- a/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialinfo.java
+++ b/aucma-base/src/main/java/com/aucma/base/domain/BaseMaterialinfo.java
@@ -92,6 +92,20 @@ public class BaseMaterialInfo extends BaseEntity
@Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date updatedTime;
+ /**
+ * 增量日期
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "增量日期", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date incrementDate;
+
+ public Date getIncrementDate() {
+ return incrementDate;
+ }
+
+ public void setIncrementDate(Date incrementDate) {
+ this.incrementDate = incrementDate;
+ }
public Long getObjId() {
return objId;
diff --git a/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml b/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
index 5b19fbb..fe92e0f 100644
--- a/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
+++ b/aucma-base/src/main/resources/mapper/base/BaseDeviceLedgerMapper.xml
@@ -14,6 +14,9 @@
+
+
+
@@ -22,7 +25,7 @@
- select obj_id, device_code, device_name, device_model, device_type, device_address, device_status, used_department, product_line_code, is_flag, created_by, created_time, updated_by, updated_time from base_deviceledger
+ select obj_id, device_code, device_name, device_model, device_type, device_address, device_status, used_department, cost_center, manufacturer, enable_date,product_line_code, is_flag, created_by, created_time, updated_by, updated_time from base_deviceledger