From 0c1bb120efef0a6d7770fc9ea5d578a36ca24a04 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Fri, 11 Mar 2022 11:20:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B1=BD=E8=BD=A6=E5=B8=A6=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BC=98=E5=8C=96?= 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 | 8 ++++++++ 1 file changed, 8 insertions(+) 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 3948ae2..326fda9 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 @@ -146,6 +146,14 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="模具编码") private String mouldCode; + @Column(name="LINE_PRIORITY") + @ApiParam(value ="产线优先级") + private String LinePriority; + +// @Column(name="HAS_SUPPLY") +// @ApiParam(value ="是否拼模") +// private Boolean hasSupply = false; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } From cdd2eda3accfd638ff8ad7c90b8a849ae00ca1b2 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Thu, 17 Mar 2022 14:23:48 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=B1=BD=E8=BD=A6=E5=B8=A6pojo=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5?= 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 | 2 ++ 1 file changed, 2 insertions(+) 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 326fda9..a9cd580 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 @@ -146,10 +146,12 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="模具编码") private String mouldCode; + @Column(name="LINE_PRIORITY") @ApiParam(value ="产线优先级") private String LinePriority; + // @Column(name="HAS_SUPPLY") // @ApiParam(value ="是否拼模") // private Boolean hasSupply = false; From 8b4b6c4dfccdcb68792ecb5e10b3694c5f504e58 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Thu, 17 Mar 2022 16:22:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B1=BD=E8=BD=A6=E5=B8=A6=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= 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 | 10 ---------- 1 file changed, 10 deletions(-) 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 a9cd580..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 @@ -146,16 +146,6 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="模具编码") private String mouldCode; - - @Column(name="LINE_PRIORITY") - @ApiParam(value ="产线优先级") - private String LinePriority; - - -// @Column(name="HAS_SUPPLY") -// @ApiParam(value ="是否拼模") -// private Boolean hasSupply = false; - @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }