From bff1768d0a287e7be7a9e7a17690ab44a8729d26 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期一, 11 八月 2025 17:26:12 +0800
Subject: [PATCH] 飞书同步用户/安灯获取产线 用户表增加 飞书用户open_id（后期发送消息标识）
---
src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterialsDetail.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterialsDetail.java b/src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterialsDetail.java
index 95dc6c7..b00dfef 100644
--- a/src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterialsDetail.java
+++ b/src/main/java/org/jeecg/modules/pms/entity/PmsProcessBillMaterialsDetail.java
@@ -10,10 +10,11 @@
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.modules.sap.dto.OrderBomDTO;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
/**
@@ -51,20 +52,29 @@
@ApiModelProperty(value = "鏇存柊鏃ユ湡")
private Date updateTime;
/**鐢熶骇鐗╂枡ID*/
- @Excel(name = "鐢熶骇鐗╂枡ID", width = 15)
@ApiModelProperty(value = "鐢熶骇鐗╂枡ID")
@Dict(dictTable = "pms_process_bill_materials", dicCode = "id", dicText = "material_number")
private String materialId;
/**鐗╂枡缂栫爜*/
- @Excel(name = "鐗╂枡缂栫爜", width = 15)
@ApiModelProperty(value = "鐗╂枡缂栫爜")
private String materialNumber;
/**鐗╂枡鍚嶇О*/
- @Excel(name = "鐗╂枡鍚嶇О", width = 15)
@ApiModelProperty(value = "鐗╂枡鍚嶇О")
private String materialName;
+ /**鍩烘湰鍗曚綅*/
+ @ApiModelProperty(value = "鍩烘湰鍗曚綅")
+ private String productionUnit;
/**闇�姹傜敤閲�*/
- @Excel(name = "闇�姹傜敤閲�", width = 15)
@ApiModelProperty(value = "闇�姹傜敤閲�")
- private Double usageUnit;
+ private BigDecimal usageQuantity;
+
+ public PmsProcessBillMaterialsDetail(){}
+
+ public PmsProcessBillMaterialsDetail(String materialId, OrderBomDTO dto) {
+ this.materialId = materialId;
+ this.materialNumber = dto.getMATNR();
+ this.materialName = dto.getMAKTX();
+ this.productionUnit = dto.getMEINS();
+ this.usageQuantity = new BigDecimal(dto.getBDMNG());
+ }
}
--
Gitblit v1.9.3