From 0c38056604bbcbf5cb7abc00f76f39b6b6fd4e4d Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Mon, 10 Jan 2022 18:53:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 2 +- .../cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 9689a0b..20ac801 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java @@ -40,7 +40,7 @@ public class PlanFeedback extends BaseAPS { @Column(name="TOP_ORDER_ID") @ApiParam(value ="顶层订单") - @FieldAnnotation(popSearch = true, mainkey = true, relation = "Order") + @FieldAnnotation(popSearch = true, relation = "Order") private Long topOrderId; @Column(name="STATUS") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java index a7bcaf2..e049012 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/CalendarTimeValidator.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.validator; import cn.estsh.i3plus.pojo.aps.annotation.CalendarTimeAnntation; import cn.estsh.i3plus.pojo.aps.model.TimeBlock; import cn.estsh.i3plus.pojo.base.util.StringUtil; +import org.apache.commons.lang3.StringUtils; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -14,11 +15,13 @@ public class CalendarTimeValidator implements ConstraintValidator Date: Thu, 17 Feb 2022 18:28:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B1=BD=E8=BD=A6=E5=B8=A6=E6=8E=92?= =?UTF-8?q?=E7=A8=8B=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 1 + .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 7 ++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 9a24c86..3948ae2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -142,6 +142,10 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="调整时间") private Date adjustDate; + @Column(name="MOULD_CODE") + @ApiParam(value ="模具编码") + private String mouldCode; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index 257d11e..7aab9d4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -19,4 +19,5 @@ public enum EWorkPlan { FurnacePlan, PrevAssPlan, PostAssPlan, + Mould } diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index 69983dc..a42ca6c 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -1199,7 +1199,12 @@ public class ApsEnumUtil { TWO_COATING("TWO_COATING", "二车间覆胶"), TWO_WRAPPING("TWO_WRAPPING", "二车间包布"), TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"), - FOUR_MANUF_TRAINBEARER("FOUR_MANUF_TRAINBEARER", "四车间手动牵纱"); + FOUR_MANUF_TRAINBEARER("FOUR_MANUF_TRAINBEARER", "四车间手动牵纱"), + THIRD_SULFIDATION("THIRD_SULFIDATION", "汽车带硫化"), + THIRD_MOLDING("THIRD_MOLDING", "汽车带成型"), + THIRD_CUTTING("THIRD_CUTTING", "汽车带切割"), + THIRD_SMALLGRIND("THIRD_SMALLGRIND", "汽车带小磨"), + THIRD_BIGGRIND("THIRD_BIGGRIND", "汽车带大磨"); private final String value; private final String description;