From a9f55fb1ab24f43fee70b16e1a8c58a33fc59fa6 Mon Sep 17 00:00:00 2001 From: zhanghl <253316343@qq.com> Date: 星期二, 13 五月 2025 18:12:14 +0800 Subject: [PATCH] 钣金工单计划管理:新增 查看上下阶需求接口 --- aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java | 41 ++++++++++++++++++++--------------------- 1 files changed, 20 insertions(+), 21 deletions(-) diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java index 9d4a269..7190995 100644 --- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java +++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessStat.java @@ -26,7 +26,7 @@ private String workOrderNo; /** 宸ュ簭鍚嶇О */ - @Excel(name = "宸ュ簭鍚嶇О") + @Excel(name = "宸ュ簭鍚嶇О", width = 50) private String processName; private Integer num; @@ -41,25 +41,15 @@ /** 鐢熶骇鏁伴噺 */ @Excel(name = "鐢熶骇鏁伴噺") - private Integer productionQuantity; + private BigDecimal productionQuantity; /** 鏍囧噯宸ユ椂 */ @Excel(name = "鏍囧噯宸ユ椂") - private Integer standardTime; + private BigDecimal standardTime; /** 宸ュ簭鎬诲伐鏃� */ @Excel(name = "宸ュ簭鎬诲伐鏃�") - private Integer processTotalTime; - - /** 璁″垝瀹屾垚鏃� */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "璁″垝瀹屾垚鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") - private Date processPlanEndDay; - - /** 璁$畻瀹屾垚鏃� */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date computePlanEndDay; - + private BigDecimal processTotalTime; /** 璁″垝寮�宸ユ棩 */ @@ -67,10 +57,19 @@ @Excel(name = "璁″垝寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date processPlanStartDay; + /** 璁″垝瀹屾垚鏃� */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date processPlanEndDay; + /** 璁㈠崟寮�宸ユ棩 */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Excel(name = "璁㈠崟寮�宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "璁㈠崟瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date orderPlanEndDay; + + /** 璁$畻瀹屾垚鏃� */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date computePlanEndDay; /** 璁捐宸ユ椂 */ @@ -147,32 +146,32 @@ return currentProcessNumber; } - public void setProductionQuantity(Integer productionQuantity) + public void setProductionQuantity(BigDecimal productionQuantity) { this.productionQuantity = productionQuantity; } - public Integer getProductionQuantity() + public BigDecimal getProductionQuantity() { return productionQuantity; } - public void setStandardTime(Integer standardTime) + public void setStandardTime(BigDecimal standardTime) { this.standardTime = standardTime; } - public Integer getStandardTime() + public BigDecimal getStandardTime() { return standardTime; } - public void setProcessTotalTime(Integer processTotalTime) + public void setProcessTotalTime(BigDecimal processTotalTime) { this.processTotalTime = processTotalTime; } - public Integer getProcessTotalTime() + public BigDecimal getProcessTotalTime() { return processTotalTime; } -- Gitblit v1.9.3