From 32bcf3f12aef0de69f7cb83d3521b2452a01e50d Mon Sep 17 00:00:00 2001
From: wenwj <‘1106994300@qq.com>
Date: 星期六, 12 四月 2025 17:28:29 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 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 61dea35..c12bbd2 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,11 +1,17 @@
package com.aps.core.domain;
import java.util.Date;
+
+import com.aps.common.core.utils.uuid.IdUtils;
+import com.aps.common.core.utils.uuid.UUID;
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 org.springframework.data.annotation.Id;
+
+import javax.annotation.processing.Generated;
/**
* 闆朵欢璁″垝绠＄悊瀵硅薄 aps_part_plan
@@ -19,14 +25,13 @@
/** 涓婚敭id */
private String id;
-
/** 涓昏鍒掑憳 */
- @Excel(name = "涓昏鍒掑憳")
+ @Excel(name = "涓昏鍒�")
private String masterPlanner;
/** 鍛ㄦ棩 */
@JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "MM-dd")
private Date weekDay;
/** 鍛ㄥ害 */
@@ -121,11 +126,11 @@
/** 鏄惁鎸傝捣 */
@Excel(name = "鏄惁鎸傝捣")
- private Integer isSuspended;
+ private String isSuspended;
/** 澶栧崗鏍囪瘑 */
@Excel(name = "澶栧崗鏍囪瘑")
- private Integer isOutsourcing;
+ private String isOutsourcing;
/** 璐﹀ */
@Excel(name = "璐﹀")
@@ -159,6 +164,10 @@
/** 椋庨櫓鏍囪瘑 */
@Excel(name = "椋庨櫓鏍囪瘑")
private Integer hasRisk;
+
+ /** 宸ュ巶 */
+// @Excel(name = "宸ュ巶")
+ private String plant;
public void setId(String id)
{
@@ -410,22 +419,22 @@
return nextProcessDeparment;
}
- public void setIsSuspended(Integer isSuspended)
+ public void setIsSuspended(String isSuspended)
{
this.isSuspended = isSuspended;
}
- public Integer getIsSuspended()
+ public String getIsSuspended()
{
return isSuspended;
}
- public void setIsOutsourcing(Integer isOutsourcing)
+ public void setIsOutsourcing(String isOutsourcing)
{
this.isOutsourcing = isOutsourcing;
}
- public Integer getIsOutsourcing()
+ public String getIsOutsourcing()
{
return isOutsourcing;
}
@@ -548,6 +557,14 @@
.append("isStockComplete", getIsStockComplete())
.append("hasTurnback", getHasTurnback())
.append("hasRisk", getHasRisk())
+ .append("plant", getPlant())
.toString();
}
+ public String getPlant() {
+ return plant;
+ }
+
+ public void setPlant(String plant) {
+ this.plant = plant;
+ }
}
--
Gitblit v1.9.3