From c8aa8900258c9f497d6fc5844d8d9cc9e9ef7779 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 23 四月 2025 11:33:54 +0800
Subject: [PATCH] 【UPDATE】修改S1中部分功能实体字段类型为小数
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java | 20 +++---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java | 68 +++++++++++++++++++---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java | 20 +++---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java | 20 +++---
4 files changed, 92 insertions(+), 36 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
index b0b32f7..9eec44c 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
@@ -1,11 +1,13 @@
package com.aps.core.domain;
-import java.util.Date;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.aps.common.core.annotation.Excel;
-import com.aps.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 姘斾綋绠¤矾璁″垝绠＄悊瀵硅薄 aps_gas_piping_plan
@@ -74,11 +76,11 @@
/** 鐢熶骇鏁伴噺 */
@Excel(name = "鐢熶骇鏁伴噺")
- private Long productionQuantity;
+ private BigDecimal productionQuantity;
/** 鑹搧鏁伴噺 */
@Excel(name = "鑹搧鏁伴噺")
- private Long goodProductsQuantity;
+ private BigDecimal goodProductsQuantity;
/** 宸ュ簭鍙� */
@Excel(name = "宸ュ簭鍙�")
@@ -299,22 +301,22 @@
return versionNumber;
}
- public void setProductionQuantity(Long productionQuantity)
+ public void setProductionQuantity(BigDecimal productionQuantity)
{
this.productionQuantity = productionQuantity;
}
- public Long getProductionQuantity()
+ public BigDecimal getProductionQuantity()
{
return productionQuantity;
}
- public void setGoodProductsQuantity(Long goodProductsQuantity)
+ public void setGoodProductsQuantity(BigDecimal goodProductsQuantity)
{
this.goodProductsQuantity = goodProductsQuantity;
}
- public Long getGoodProductsQuantity()
+ public BigDecimal getGoodProductsQuantity()
{
return goodProductsQuantity;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java
index dbd9deb..f1ef3e3 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java
@@ -1,11 +1,13 @@
package com.aps.core.domain;
-import java.util.Date;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.aps.common.core.annotation.Excel;
-import com.aps.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 姘斾綋绠¤矾璁″垝绠＄悊-涓存椂瀵硅薄 aps_gas_piping_plan_temp
@@ -75,11 +77,11 @@
/** 鐢熶骇鏁伴噺 */
@Excel(name = "鐢熶骇鏁伴噺")
- private Long productionQuantity;
+ private BigDecimal productionQuantity;
/** 鑹搧鏁伴噺 */
@Excel(name = "鑹搧鏁伴噺")
- private Long goodProductsQuantity;
+ private BigDecimal goodProductsQuantity;
/** 宸ュ簭鍙� */
@Excel(name = "宸ュ簭鍙�")
@@ -304,22 +306,22 @@
return versionNumber;
}
- public void setProductionQuantity(Long productionQuantity)
+ public void setProductionQuantity(BigDecimal productionQuantity)
{
this.productionQuantity = productionQuantity;
}
- public Long getProductionQuantity()
+ public BigDecimal getProductionQuantity()
{
return productionQuantity;
}
- public void setGoodProductsQuantity(Long goodProductsQuantity)
+ public void setGoodProductsQuantity(BigDecimal goodProductsQuantity)
{
this.goodProductsQuantity = goodProductsQuantity;
}
- public Long getGoodProductsQuantity()
+ public BigDecimal getGoodProductsQuantity()
{
return goodProductsQuantity;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
index c57d5bf..b928e75 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
@@ -1,11 +1,13 @@
package com.aps.core.domain;
-import java.util.Date;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.aps.common.core.annotation.Excel;
-import com.aps.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 閽ｉ噾璁″垝涓存椂琛ㄥ璞� aps_plate_plan_temp
@@ -75,11 +77,11 @@
/** 鐢熶骇鏁伴噺 */
@Excel(name = "鐢熶骇鏁伴噺")
- private Integer productionQuantity;
+ private BigDecimal productionQuantity;
/** 鑹搧鏁伴噺 */
@Excel(name = "鑹搧鏁伴噺")
- private Integer goodProductsQuantity;
+ private BigDecimal goodProductsQuantity;
/** 宸ュ簭鍙� */
@Excel(name = "宸ュ簭鍙�")
@@ -308,22 +310,22 @@
return versionNumber;
}
- public void setProductionQuantity(Integer productionQuantity)
+ public void setProductionQuantity(BigDecimal productionQuantity)
{
this.productionQuantity = productionQuantity;
}
- public Integer getProductionQuantity()
+ public BigDecimal getProductionQuantity()
{
return productionQuantity;
}
- public void setGoodProductsQuantity(Integer goodProductsQuantity)
+ public void setGoodProductsQuantity(BigDecimal goodProductsQuantity)
{
this.goodProductsQuantity = goodProductsQuantity;
}
- public Integer getGoodProductsQuantity()
+ public BigDecimal getGoodProductsQuantity()
{
return goodProductsQuantity;
}
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
index 5cb4ae5..1603e8b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
@@ -1,11 +1,13 @@
package com.aps.core.domain;
-import java.util.Date;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.aps.common.core.annotation.Excel;
-import com.aps.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 宸ヨ壓璺嚎瀵硅薄 aps_process_route
@@ -55,7 +57,7 @@
private Long completedCount;
/** 搴熷純鏁伴噺 */
@Excel(name = "搴熷純鏁伴噺")
- private Long discardCount;
+ private BigDecimal discardCount;
/** 闆嗘垚鏃ユ湡 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "闆嗘垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -64,10 +66,26 @@
/** 宸ュ巶 */
// @Excel(name = "宸ュ巶")
private String plant;
+
@Excel(name = "鏍囧噯宸ユ椂")
- private Long standardTime;
+ private BigDecimal standardTime;
+
@Excel(name = "宸ュ簭鎺掑簭")
private Long processOrder;
+
+ /** 宸ュ簭ID */
+ private String opId;
+
+ /** 鍔犲伐鏁伴噺 */
+ @Excel(name = "鍔犲伐鏁伴噺")
+ private BigDecimal processQty;
+
+ /** 宸ュ簭鐘舵�� */
+ private String opStatus;
+
+ /** 璐﹀浠ｇ爜 */
+ private String orgCode;
+
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
@@ -213,19 +231,19 @@
.toString();
}
- public Long getDiscardCount() {
+ public BigDecimal getDiscardCount() {
return discardCount;
}
- public void setDiscardCount(Long discardCount) {
+ public void setDiscardCount(BigDecimal discardCount) {
this.discardCount = discardCount;
}
- public Long getStandardTime() {
+ public BigDecimal getStandardTime() {
return standardTime;
}
- public void setStandardTime(Long standardTime) {
+ public void setStandardTime(BigDecimal standardTime) {
this.standardTime = standardTime;
}
@@ -236,4 +254,36 @@
public void setProcessOrder(Long processOrder) {
this.processOrder = processOrder;
}
+
+ public String getOpId() {
+ return opId;
+ }
+
+ public void setOpId(String opId) {
+ this.opId = opId;
+ }
+
+ public BigDecimal getProcessQty() {
+ return processQty;
+ }
+
+ public void setProcessQty(BigDecimal processQty) {
+ this.processQty = processQty;
+ }
+
+ public String getOpStatus() {
+ return opStatus;
+ }
+
+ public void setOpStatus(String opStatus) {
+ this.opStatus = opStatus;
+ }
+
+ public String getOrgCode() {
+ return orgCode;
+ }
+
+ public void setOrgCode(String orgCode) {
+ this.orgCode = orgCode;
+ }
}
--
Gitblit v1.9.3