From 156dbab600d7727c13790e8b9a677107cfad2387 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 10:40:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateStandardRequire.java | 23 ++++++++++-------------
1 files changed, 10 insertions(+), 13 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..adad153 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
@@ -30,7 +30,7 @@
private String requireId;
/** bom_line_id */
- @Excel(name = "bom_line_id")
+// @Excel(name = "bom_line_id")
private String bomLineId;
/** 鏂欏彿 */
@@ -42,24 +42,24 @@
private Long bomLineLevel;
/** BOM鐢ㄩ噺 */
- @Excel(name = "BOM鐢ㄩ噺")
- private BigDecimal bomUseAmount;
+// @Excel(name = "BOM鐢ㄩ噺")
+ private String 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 = "鍑�闇�姹傞噺")
- private BigDecimal netRequirement;
+// @Excel(name = "鍑�闇�姹傞噺")
+ private String netRequirement;
/** 璁″垝寮�宸ユ棩 */
@Excel(name = "璁″垝寮�宸ユ棩")
@@ -79,17 +79,14 @@
/** 鐢熶骇鍩哄湴 */
@Excel(name = "鐢熶骇鍩哄湴")
-
private String productionBase;
/** 鍖归厤鐘舵�� */
@Excel(name = "鍖归厤鐘舵��")
-
private String matchState;
/** 鍖归厤妯″紡 */
@Excel(name = "鍖归厤妯″紡")
-
private String matchMode;
/** 鏈尮閰嶉渶姹傛暟閲� */
@@ -97,11 +94,11 @@
private String unmatchedDemandAmount;
/** 寤鸿瀹屾垚鏃ユ湡 */
- @Excel(name = "寤鸿瀹屾垚鏃ユ湡")
+// @Excel(name = "寤鸿瀹屾垚鏃ユ湡")
private String suggestedCompletionDate;
/** 寤惰繜椋庨櫓鏍囪瘑 */
- @Excel(name = "寤惰繜椋庨櫓鏍囪瘑")
+// @Excel(name = "寤惰繜椋庨櫓鏍囪瘑")
private String hasDelayRisk;
/** $column.columnComment */
--
Gitblit v1.9.3