From 01e45371334efcf7f4ccf2fbf8343ec063aa1ff2 Mon Sep 17 00:00:00 2001
From: dy <dingyang@lnfxkj.tech>
Date: 星期六, 19 四月 2025 11:14:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java | 35 +++++++++++++----------------------
1 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
index 6ebb573..b82b0d4 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
@@ -1,5 +1,6 @@
package com.aps.core.domain;
+import java.math.BigDecimal;
import java.util.Date;
import com.aps.common.core.utils.uuid.IdUtils;
@@ -9,6 +10,7 @@
import org.apache.commons.lang3.builder.ToStringStyle;
import com.aps.common.core.annotation.Excel;
import com.aps.common.core.web.domain.BaseEntity;
+import org.apache.poi.hpsf.Decimal;
import org.springframework.data.annotation.Id;
import javax.annotation.processing.Generated;
@@ -80,11 +82,11 @@
/** 鐢熶骇鏁伴噺 */
@Excel(name = "鐢熶骇鏁伴噺")
- private Long productionQuantity;
+ private Decimal productionQuantity;
/** 鑹搧鏁伴噺 */
@Excel(name = "鑹搧鏁伴噺")
- private Long goodProductsQuantity;
+ private Decimal goodProductsQuantity;
/** 宸ュ簭鍙� */
@Excel(name = "宸ュ簭鍙�")
@@ -125,11 +127,9 @@
private String nextProcessDeparment;
/** 鏄惁鎸傝捣 */
-// @Excel(name = "鏄惁鎸傝捣")
- private Integer isSuspended;
- /** 鏄惁鎸傝捣 */
@Excel(name = "鏄惁鎸傝捣")
- private String isSuspendedTxt;
+ private String isSuspended;
+
/** 澶栧崗鏍囪瘑 */
@Excel(name = "澶栧崗鏍囪瘑")
private String isOutsourcing;
@@ -168,7 +168,7 @@
private Integer hasRisk;
/** 宸ュ巶 */
- @Excel(name = "宸ュ巶")
+// @Excel(name = "宸ュ巶")
private String plant;
public void setId(String id)
@@ -311,22 +311,22 @@
return versionNumber;
}
- public void setProductionQuantity(Long productionQuantity)
+ public void setProductionQuantity(Decimal productionQuantity)
{
this.productionQuantity = productionQuantity;
}
- public Long getProductionQuantity()
+ public Decimal getProductionQuantity()
{
return productionQuantity;
}
- public void setGoodProductsQuantity(Long goodProductsQuantity)
+ public void setGoodProductsQuantity(Decimal goodProductsQuantity)
{
this.goodProductsQuantity = goodProductsQuantity;
}
- public Long getGoodProductsQuantity()
+ public Decimal getGoodProductsQuantity()
{
return goodProductsQuantity;
}
@@ -421,12 +421,12 @@
return nextProcessDeparment;
}
- public void setIsSuspended(Integer isSuspended)
+ public void setIsSuspended(String isSuspended)
{
this.isSuspended = isSuspended;
}
- public Integer getIsSuspended()
+ public String getIsSuspended()
{
return isSuspended;
}
@@ -562,15 +562,6 @@
.append("plant", getPlant())
.toString();
}
-
- public String getIsSuspendedTxt() {
- return isSuspendedTxt;
- }
-
- public void setIsSuspendedTxt(String isSuspendedTxt) {
- this.isSuspendedTxt = isSuspendedTxt;
- }
-
public String getPlant() {
return plant;
}
--
Gitblit v1.9.3