From 04bbc3649af0f318e5346eabb0f0446a5376f5d9 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:27:27 +0800
Subject: [PATCH] 钣金需求匹配-完善工时计算
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
index fe35cdc..f59dde3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsBom.java
@@ -3,11 +3,10 @@
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;
+import lombok.*;
+import java.math.BigDecimal;
import java.util.Date;
-import java.util.List;
/**
* BOM鏁版嵁绠＄悊瀵硅薄 aps_bom
@@ -17,6 +16,8 @@
*/
@EqualsAndHashCode(callSuper = true)
@Data
+@NoArgsConstructor
+@AllArgsConstructor
public class ApsBom extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -26,16 +27,44 @@
/** bomID */
@Excel(name = "bomID")
- private String bomId;
+ private String bomLineId;
/** 鐖惰妭鐐笲OM ID */
@Excel(name = "鐖惰妭鐐笲OM ID")
- private String parentBomId;
+ private String bomHeaderId;
/** 鏂欏彿 */
@Excel(name = "鏂欏彿")
private String itemCode;
+ /** 鍥惧彿 */
+ @Excel(name = "鍥惧彿")
+ private String drawingNo;
+
+ /** 搴忓彿 */
+ @Excel(name = "搴忓彿")
+ private String processNo;
+
+ /** 搴忓彿 */
+ @Excel(name = "鍗曚綅")
+ private String unit;
+
+ /** 鏁伴噺 */
+ @Excel(name = "鏁伴噺")
+ private BigDecimal num;
+
+ /** 鎬绘暟閲� */
+ @Excel(name = "鎬绘暟閲�")
+ private BigDecimal total_num;
+
+ /** 鍑嗗宸ユ椂 */
+ @Excel(name = "鍑嗗宸ユ椂")
+ private BigDecimal preparationTime;
+
+ /** 鍔犲伐宸ユ椂 */
+ @Excel(name = "鍔犲伐宸ユ椂")
+ private BigDecimal processingTime;
+
/** 鐗╂枡鎻忚堪 */
@Excel(name = "鐗╂枡鎻忚堪")
private String itemName;
--
Gitblit v1.9.3