From b3ed5823f971c04e5f814711a49c9baf7cdf54b9 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 15 五月 2025 14:59:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
index f1b80b9..379ccec 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java
@@ -24,6 +24,7 @@
private static final long serialVersionUID = 1L;
/** 闇�姹侷D */
+ @JsonFormat(shape = JsonFormat.Shape.STRING)
private Long id;
/** 闇�姹傝拷婧疘D */
@@ -42,7 +43,7 @@
private String bomLineCode;
/** BOM浣庨樁鐮� */
- @Excel(name = "BOM浣庨樁鐮�")
+// @Excel(name = "浣庨樁鐮�")
private Long bomLineLevel;
/** BOM鐢ㄩ噺 */
@@ -59,22 +60,25 @@
/** 闇�姹傛暟閲� */
// @Excel(name = "闇�姹傛暟閲�")
- private String requireAmount;
+ private BigDecimal requireAmount;
/** 鍑�闇�姹傞噺 */
// @Excel(name = "鍑�闇�姹傞噺")
private BigDecimal netRequirement;
/** 璁″垝寮�宸ユ棩 */
- @Excel(name = "璁″垝寮�宸ユ棩")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date startDate;
/** 璁″垝瀹屽伐鏃� */
- @Excel(name = "璁″垝瀹屽伐鏃�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date completeDate;
/** 闇�姹傛棩鏈� */
- @Excel(name = "闇�姹傛棩鏈�")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "闇�姹傛棩鏈�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date demandDate;
/** 閫傜敤宸ュ巶 */
@@ -86,11 +90,11 @@
private String productionBase;
/** 鍖归厤鐘舵�� */
- @Excel(name = "鍖归厤鐘舵��")
+// @Excel(name = "鍖归厤鐘舵��")
private String matchState;
/** 鍖归厤妯″紡 */
- @Excel(name = "鍖归厤妯″紡")
+// @Excel(name = "鍖归厤妯″紡")
private String matchMode;
/** 鏈尮閰嶉渶姹傛暟閲� */
@@ -101,11 +105,17 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "寤鸿瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date suggestedCompletionDate;
+
/** 寤惰繜椋庨櫓鏍囪瘑 */
+ @Excel(name = "寤惰繜椋庨櫓鏍囪瘑")
private String hasDelayRisk;
private String batchNumber;
private String delFlag;
+ /**宸ュ崟鍒涘缓鏃堕棿*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+ private Date orderCreateTime;
}
--
Gitblit v1.9.3