From 77b9b1492b8578b280bd61e15896de5bdc8e5213 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期五, 09 五月 2025 13:22:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 708c875..510df6b 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
@@ -31,7 +31,8 @@
private String requireTrackId;
/**鍗曞彿*/
private String docNum;
-
+ /**涓婄骇鐗╂枡缂栫爜*/
+ private String bomHeaderCode;
/** bom_line_id */
// @Excel(name = "bom_line_id")
private String bomLineId;
@@ -65,14 +66,17 @@
private BigDecimal netRequirement;
/** 璁″垝寮�宸ユ棩 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "璁″垝寮�宸ユ棩")
private Date startDate;
/** 璁″垝瀹屽伐鏃� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "璁″垝瀹屽伐鏃�")
private Date completeDate;
/** 闇�姹傛棩鏈� */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "闇�姹傛棩鏈�")
private Date demandDate;
@@ -100,6 +104,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "寤鸿瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date suggestedCompletionDate;
+
/** 寤惰繜椋庨櫓鏍囪瘑 */
private String hasDelayRisk;
--
Gitblit v1.9.3