From 14f982bf34e45b0ad5218212346cf2b33f0a6915 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期六, 10 五月 2025 18:06:16 +0800
Subject: [PATCH] 【ADD】1.新增同步物料定时任务 2.同步任务增加批次号
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
index e97a48c..d9498c3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsMaterialManagement.java
@@ -1,12 +1,13 @@
package com.aps.core.domain;
-import java.math.BigDecimal;
-import java.util.Date;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.aps.common.core.annotation.Excel;
-import com.aps.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 鐗╂枡绠＄悊瀵硅薄 aps_material_management
@@ -19,7 +20,7 @@
private static final long serialVersionUID = 1L;
/** id */
- private String id;
+ private Long id;
/** 鏂欏彿 */
@Excel(name = "鏂欏彿")
@@ -70,26 +71,26 @@
private String applicableWorkshop;
/** 鐢熸晥鏃ユ湡 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鐢熸晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐢熸晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date effectiveDate;
/** 澶辨晥鏃ユ湡 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "澶辨晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "澶辨晥鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date expiringDate;
/** 闆嗘垚鏃ユ湡 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "闆嗘垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "闆嗘垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date integrationDate;
- public void setId(String id)
+ public void setId(Long id)
{
this.id = id;
}
- public String getId()
+ public Long getId()
{
return id;
}
--
Gitblit v1.9.3