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-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java | 43 ++++++++++++++++++++++++++++--------------- 1 files changed, 28 insertions(+), 15 deletions(-) diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java index 330ad8f..5394aae 100644 --- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java +++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java @@ -7,6 +7,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; import java.io.Serial; +import java.math.BigDecimal; import java.util.Date; /** @@ -45,25 +46,25 @@ /** 鏍囧噯宸ユ椂-灏忔暟 */ @Excel(name = "鏍囧噯宸ユ椂-灏忔暟") - private Float standardTime; + private BigDecimal standardTime; /** 宸ュ簭璁″垝寮�濮嬫椂闂� */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "宸ュ簭璁″垝寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @Excel(name = "宸ュ簭璁″垝寮�濮嬫椂闂�", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss") private Date palnStartDate; /** 宸ュ簭璁″垝瀹屾垚鏃ユ湡 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "宸ュ簭璁″垝瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @Excel(name = "宸ュ簭璁″垝瀹屾垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss") private Date planCompleteDate; /** 鍔犲伐鏁伴噺-灏忔暟 */ @Excel(name = "鍔犲伐鏁伴噺-灏忔暟") - private Float processQty; + private BigDecimal processQty; /** 搴熷純鏁伴噺 */ @Excel(name = "搴熷純鏁伴噺") - private Float scrapQty; + private BigDecimal scrapQty; /** 宸ュ簭鐘舵�� */ @Excel(name = "宸ュ簭鐘舵��") @@ -77,12 +78,15 @@ @Excel(name = "璐﹀缂栫爜") private String orgCode; - public void setId(Long id) + @Excel(name = "宸ヤ綔涓績") + private String workCenter; + + public void setId(Long id) { this.id = id; } - public Long getId() + public Long getId() { return id; } @@ -137,12 +141,12 @@ return processName; } - public void setStandardTime(Float standardTime) + public void setStandardTime(BigDecimal standardTime) { this.standardTime = standardTime; } - public Float getStandardTime() + public BigDecimal getStandardTime() { return standardTime; } @@ -167,22 +171,22 @@ return planCompleteDate; } - public void setProcessQty(Float processQty) + public void setProcessQty(BigDecimal processQty) { this.processQty = processQty; } - public Float getProcessQty() + public BigDecimal getProcessQty() { return processQty; } - public void setScrapQty(Float scrapQty) + public void setScrapQty(BigDecimal scrapQty) { this.scrapQty = scrapQty; } - public Float getScrapQty() + public BigDecimal getScrapQty() { return scrapQty; } @@ -217,6 +221,14 @@ return orgCode; } + public String getWorkCenter() { + return workCenter; + } + + public void setWorkCenter(String workCenter) { + this.workCenter = workCenter; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) @@ -234,6 +246,7 @@ .append("opStatus", getOpStatus()) .append("org", getOrg()) .append("orgCode", getOrgCode()) + .append("workCenter", getWorkCenter()) .toString(); } } -- Gitblit v1.9.3