From 6e2533f366a28e5f0147f8c8b62a1593acc2a61c Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期五, 09 五月 2025 13:25:24 +0800
Subject: [PATCH] 【UPDATE】补充刷新BOM数据任务

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 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 b7f7d39..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
@@ -2,6 +2,7 @@
 
 import com.aps.common.core.annotation.Excel;
 import com.aps.common.core.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -27,10 +28,13 @@
 
     /** 闇�姹傝拷婧疘D */
     @Excel(name = "闇�姹傝拷婧疘D")
-    private String requireId;
-
+    private String requireTrackId;
+    /**鍗曞彿*/
+    private String docNum;
+    /**涓婄骇鐗╂枡缂栫爜*/
+    private String bomHeaderCode;
     /** bom_line_id */
-    @Excel(name = "bom_line_id")
+//    @Excel(name = "bom_line_id")
     private String bomLineId;
 
     /** 鏂欏彿 */
@@ -42,34 +46,37 @@
     private Long bomLineLevel;
 
     /** BOM鐢ㄩ噺 */
-    @Excel(name = "BOM鐢ㄩ噺")
+//    @Excel(name = "BOM鐢ㄩ噺")
     private BigDecimal bomUseAmount;
 
     /** 宸ヨ壓璺嚎ID */
-    @Excel(name = "宸ヨ壓璺嚎ID")
+//    @Excel(name = "宸ヨ壓璺嚎ID")
     private String processRouteId;
 
     /** 宸ヨ壓璺嚎宸ユ椂 */
-    @Excel(name = "宸ヨ壓璺嚎宸ユ椂")
+//    @Excel(name = "宸ヨ壓璺嚎宸ユ椂")
     private String processRouteHours;
 
     /** 闇�姹傛暟閲� */
-    @Excel(name = "闇�姹傛暟閲�")
+//    @Excel(name = "闇�姹傛暟閲�")
     private String requireAmount;
 
     /** 鍑�闇�姹傞噺 */
-    @Excel(name = "鍑�闇�姹傞噺")
+//    @Excel(name = "鍑�闇�姹傞噺")
     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;
 
@@ -79,36 +86,30 @@
 
     /** 鐢熶骇鍩哄湴 */
     @Excel(name = "鐢熶骇鍩哄湴")
-
     private String productionBase;
 
     /** 鍖归厤鐘舵�� */
     @Excel(name = "鍖归厤鐘舵��")
-
     private String matchState;
 
     /** 鍖归厤妯″紡 */
     @Excel(name = "鍖归厤妯″紡")
-
     private String matchMode;
 
     /** 鏈尮閰嶉渶姹傛暟閲� */
     @Excel(name = "鏈尮閰嶉渶姹傛暟閲�")
-    private String unmatchedDemandAmount;
+    private BigDecimal unmatchedDemandAmount;
 
     /** 寤鸿瀹屾垚鏃ユ湡 */
-    @Excel(name = "寤鸿瀹屾垚鏃ユ湡")
-    private String suggestedCompletionDate;
+    @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;
-
-    /** $column.columnComment */
 
     private String batchNumber;
 
-    /** $column.columnComment */
     private String delFlag;
 
 }

--
Gitblit v1.9.3