From 6dd8cb52d4ac6e7c17ff735189444c9a3d9fceda Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 24 Aug 2021 11:02:17 +0800 Subject: [PATCH 01/86] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E6=8B=96=E5=8A=A8=E9=80=BB=E8=BE=91=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E8=B6=85=E5=87=BA=E5=B7=A6=E8=BE=B9=E7=95=8C?= =?UTF-8?q?=EF=BC=8C=E8=B6=85=E5=87=BA=E6=9C=80=E5=A4=A7=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E7=BB=99=E6=8F=90=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java | 1 + 2 files changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index c088593..9892f7c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -69,4 +69,8 @@ public class SysParam extends BaseAPS { @Column(name="FOUR_FIRST_SUPPLY") @ApiParam(value ="是否牵纱补满模") private Boolean fourFirstSupply = false; + + @Column(name="MAX_SPACE_LIMIT_DRAG") + @ApiParam(value ="间隔时间限制") + private Boolean maxSpaceLimitDrag = true; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java index b0d518e..53496da 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java @@ -8,4 +8,5 @@ public class GanttDragModel { private Long resId; private Long targetResId; private Long targetWorkId; + private Boolean ignoreSpaceLimit; } From 1736ff0ac9f64752057fd0b2a7d677ab78affa59 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 3 Sep 2021 10:26:22 +0800 Subject: [PATCH 02/86] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=AF=84=E4=BC=B0=E9=80=89=E9=A1=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 13 +++++++++++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java | 3 ++- .../src/main/resources/relations/FurnacePlan.xml | 2 ++ .../cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 5 +++-- .../estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java | 3 --- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index f57b2ac..bde1d94 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -49,6 +49,19 @@ public class FurnacePlan extends BaseAPS { @ApiParam(value ="固定组炉的计划") private Boolean fixPlan; + @Column(name="MERGE_PLAN_ID") + @ApiParam(value ="合并炉计划") + private Long mergePlanId; + @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); } + + public FurnacePlan getMergePlan() { + return BeanRelation.get(this, EFurnacePlan.MergePlan); + } + + public void setMergePlan(FurnacePlan plan) { + this.mergePlanId = plan != null ? plan.getId() : 0L; + BeanRelation.set(this, EFurnacePlan.MergePlan, plan); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index e7571fd..0bc77d6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -184,6 +184,11 @@ public class Work extends BaseAPS { @ApiParam(value ="工作排序顺序") private Integer workSeqNumber; + @Column(name="MOULD_ID") + @ApiParam(value ="模具能力id") + @FieldAnnotation(property = false) + private Long mouldId = 0L; + // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; private transient boolean supplyCount = false; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java index 098fa63..53c3bd9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EFurnacePlan { - WorkPlans + WorkPlans, + MergePlan, } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml index 49f17bd..da58392 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml @@ -2,4 +2,6 @@ + + \ No newline at end of file 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 6154f40..2dabd59 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 @@ -1327,9 +1327,10 @@ public class ApsEnumUtil { FOUR_COATING("FOUR_COATING", "四车间覆胶"), FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"), TWO_SULFIDATION("TWO_SULFIDATION", "二车间硫化"), - TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"), + TWO_MOLDING("TWO_MOLDING", "二车间成型"), TWO_COATING("TWO_COATING", "二车间覆胶"), - TWO_WRAPPING("TWO_WRAPPING", "二车间包布"); + TWO_WRAPPING("TWO_WRAPPING", "二车间包布"), + TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"); private String value; private String description; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index d3349da..483a6d9 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -131,9 +131,6 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "是否重置") private Integer isReset; - @ApiParam(value = "任务编号") - private String taskNo; - public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; this.message = message; From e75c5d35ae2eed4e32ce8dc894330a95fa5b9665 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 3 Sep 2021 17:18:04 +0800 Subject: [PATCH 03/86] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5taskNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java index d3349da..b327925 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java @@ -131,8 +131,8 @@ public class WmsActionResponseBean implements Serializable { @ApiParam(value = "是否重置") private Integer isReset; - @ApiParam(value = "任务编号") - private String taskNo; +// @ApiParam(value = "任务编号") +// private String taskNo; public WmsActionResponseBean(Boolean codeStatus, String message) { this.codeStatus = codeStatus; From 5d6f52f526385ac69b639f83041d01d0a7028adf Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 3 Sep 2021 17:31:51 +0800 Subject: [PATCH 04/86] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9F=BA=E5=87=86?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=97=B4=E9=9A=94=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java | 1 + .../i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml | 2 +- 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index bde1d94..0287a35 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -64,4 +64,9 @@ public class FurnacePlan extends BaseAPS { this.mergePlanId = plan != null ? plan.getId() : 0L; BeanRelation.set(this, EFurnacePlan.MergePlan, plan); } + + @JsonBackReference + public FurnacePlan getOriginMergePlan() { + return BeanRelation.get(this, EFurnacePlan.OriginMergePlan); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 3235ae8..058ad2d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -73,6 +73,12 @@ public class StandOperation extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxSpaceTime; + @Column(name="FLUSH_TIME_BLOCK") + @ApiParam(value ="刷新时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + // 刷新计划时将一天时间按块分割，后工作在本工作的下一时间块中排程。 + private String flushTimeBlock; + @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java index 53c3bd9..f944cd0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java @@ -3,4 +3,5 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EFurnacePlan { WorkPlans, MergePlan, + OriginMergePlan, } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml index da58392..58711e4 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/FurnacePlan.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file From c58d1c29258a766c50b91b625211f85685999705 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 6 Sep 2021 18:24:29 +0800 Subject: [PATCH 05/86] =?UTF-8?q?=E4=BA=8C=E8=BD=A6=E9=97=B4=E6=8E=92?= =?UTF-8?q?=E7=A8=8B=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 058ad2d..c8d64bc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -74,7 +74,7 @@ public class StandOperation extends BaseAPS { private String maxSpaceTime; @Column(name="FLUSH_TIME_BLOCK") - @ApiParam(value ="刷新时间间隔") + @ApiParam(value ="基准时间间隔") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) // 刷新计划时将一天时间按块分割，后工作在本工作的下一时间块中排程。 private String flushTimeBlock; From b60832e19de9b6cd034c7356a83058ee9d57f94d Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 10 Sep 2021 16:09:10 +0800 Subject: [PATCH 06/86] =?UTF-8?q?=E7=8E=8B=E6=9D=B0:plc=E6=9F=A5=E8=AF=A2b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 0a0fe1f..34e5995 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -1462,7 +1462,7 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesPlc.getWorkCenterCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCenterCode(), "workCenterCode", packBean); } - if (!StringUtils.isEmpty(mesPlc.getPlcCode())) { + if (!StringUtils.isEmpty(mesPlc.getWorkCellCode())) { DdlPreparedPack.getStringEqualPack(mesPlc.getWorkCellCode(), "workCellCode", packBean); } if (!StringUtils.isEmpty(mesPlc.getEquipmentCode())) { From a87c1bf9c256e128e7f4f36837b593bfbe3aea8c Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sun, 12 Sep 2021 09:24:35 +0800 Subject: [PATCH 07/86] =?UTF-8?q?=E7=8E=8B=E6=9D=B0:=E6=9D=A1=E7=A0=81?= =?UTF-8?q?=E5=B1=A5=E5=8E=86=E8=A1=A8=20=E5=A2=9E=E5=8A=A0=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=8F=B7=20=E7=B3=BB=E7=BB=9F=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=A0=87=E5=BF=97=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java index 73f6281..e255104 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProduceSnTravel.java @@ -36,6 +36,16 @@ import java.io.Serializable; public class MesProduceSnTravel extends BaseBean implements Serializable { private static final long serialVersionUID = -1807953720033107108L; + @Version + @Column(name = "LOCK_VERSION") + @ApiParam(value = "乐观锁", example = "1") + public Integer lockVersion; + + @Column(name = "SYSTEM_SYNC_STATUS") + @ColumnDefault("2") + @ApiParam(value = "系统同步标志") + public Integer systemSyncStatus; + @Column(name = "SERIAL_NUMBER") @ApiParam("过程条码") private String serialNumber; From 93b26c8dfd0f225bf814c380b078a71eefe664c1 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 13 Sep 2021 14:50:10 +0800 Subject: [PATCH 08/86] =?UTF-8?q?=E5=85=81=E8=AE=B8=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E9=A1=B5=E9=9D=A2=E6=8B=96=E5=8A=A8=E7=BB=84=E7=82=89?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E4=BD=9C=E5=9D=97=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java | 7 +++---- .../main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java | 1 + .../main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 6 ++---- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java | 1 + .../main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java | 4 +++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 5 ----- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java | 5 ----- .../cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java | 1 + .../main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java | 3 +++ 13 files changed, 23 insertions(+), 19 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java index f4f3b4d..60d2e84 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/CancelPlanRule.java @@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -23,11 +24,9 @@ import javax.persistence.Table; @Api("取消计划规则") public class CancelPlanRule extends BaseRule { private static final long serialVersionUID = 2674055522875545446L; + + @Lob @Column(name="WORK_FILTERS") @ApiParam(value ="工作筛选") private String workFilters; - - @Column(name="RECORD_RIGHT_EDGE") - @ApiParam(value ="记录工作右边界") - private Boolean recordRightEdge; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index ea42942..ed30351 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -26,6 +27,8 @@ import javax.persistence.Table; @Api("动态设置时间") public class DynamicSetTime extends BaseAPS { private static final long serialVersionUID = -1696499471488104793L; + + @Lob @Column(name="RES_CODE") @ApiParam(value ="资源代码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index e859fe8..3a905d3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -11,6 +11,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -36,10 +37,12 @@ public class ExportDetail extends BaseAPS { @ApiParam(value ="内部表名") private String inName; + @Lob @Column(name="FILTER") @ApiParam(value ="筛选") private String filter; + @Lob @Column(name="SORT_BY") @ApiParam(value ="排序") private String sortBy; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index bf6ca40..98bc0d9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -30,6 +30,7 @@ import java.util.List; @Api("数据导出明细集合") public class ExportProject extends BaseAPS { private static final long serialVersionUID = -7281303629295174330L; + @Column(name="NAME") @ApiParam(value ="标识名") private String name; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java index cff475c..7d7c3e8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -36,6 +37,7 @@ public class ExpressionRecord extends BaseAPS { @ApiParam(value ="名称") private String name; + @Lob @Column(name="EXPRESSION") @ApiParam(value ="表达式") private String expression; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 49cf675..d7d9033 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -13,10 +13,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.lang.reflect.Method; import java.sql.JDBCType; @@ -87,6 +84,7 @@ public class FieldInfo extends BaseAPS { @ApiParam(value ="字段提示") private String tips; + @Lob @Column(name="EXPRESSION") @ApiParam(value ="表达式") private String expression; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index ee8ddc3..b476159 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Api("属性赋值规则") public class FieldSetRule extends BaseRule { private static final long serialVersionUID = 6880145972942618559L; + @Column(name="BEAN") @ApiParam(value ="实体名") private String bean; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java index 57deab2..5191d3d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceCapacity.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import javax.validation.constraints.Min; @@ -30,8 +31,9 @@ import javax.validation.constraints.Min; @Table(name="APS_FURNACE_CAPACITY") @Api("炉容量") public class FurnaceCapacity extends BaseAPS { - private static final long serialVersionUID = -5657804042629460659L; + + @Lob @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 25594d0..46955d4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -46,11 +46,6 @@ public class Inventory extends BaseOrder { @FieldAnnotation(modify = false) private Double assignCount; -// @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") -// @ApiParam(value ="多余量") -// @FieldAnnotation(modify = false) -// private Double excessCount; - @Column(name="SINGLE_SUPPLY_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="单次补充数量") private Double singleSupplyCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index e00c22a..4f1acff 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -100,11 +100,6 @@ public class Material extends BaseAPS { @FieldAnnotation(modify = false) private Integer level; - @Column(name="IS_AUTO_FIX_PEGGING") - @ApiParam(value ="自动补充标识") - @FieldAnnotation(defaultValue = "1") - private Boolean autoFixPegging; - @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)") @ApiParam(value ="最大生产批量") private Double maxProductBatch; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java index 1e7ca3b..7724a6c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java @@ -29,6 +29,7 @@ import java.util.Date; @Api("物料交期承诺") public class MaterialDeliveryPromise extends BaseBean { private static final long serialVersionUID = 831759543772896829L; + @Column(name="QTY") @ApiParam(value ="到货数量") private Double count; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 36eceaa..5ead088 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -30,6 +30,7 @@ import java.util.List; @Api("工序") public class Operation extends BaseAPS { private static final long serialVersionUID = 4394179144091116858L; + @Column(name="NUMBER") @ApiParam(value ="工序号") @FieldAnnotation(notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java index 2c394a3..ef65b38 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OvertimeCalendar.java @@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; import java.util.Date; @@ -27,6 +28,8 @@ import java.util.Date; @Api("加班日历") public class OvertimeCalendar extends BaseAPS { private static final long serialVersionUID = -501715721073189464L; + + @Lob @Column(name="RES_CODES") @ApiParam(value ="资源代码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) From 4ec97f09fe4e836aef836fa661e426e58a7cda0e Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 15 Sep 2021 18:34:44 +0800 Subject: [PATCH 09/86] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E6=8C=89=E7=8F=AD=E6=AC=A1=E5=88=86=E5=89=B2=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=9C=AA=E8=80=83=E8=99=91=E8=81=94=E7=BB=84=E5=B8=A6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 0bc77d6..7aa6f20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -175,12 +175,6 @@ public class Work extends BaseAPS { @ApiParam(value ="补满模工作编码") private String supplyWorkCode; - @ApiParam(value ="工作左边界") - private Date leftEdge; - - @ApiParam(value ="工作右边界") - private Date rightEdge; - @ApiParam(value ="工作排序顺序") private Integer workSeqNumber; @@ -191,7 +185,6 @@ public class Work extends BaseAPS { // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; - private transient boolean supplyCount = false; // 排程时确定工作是正向排程还是逆向排程。 private transient boolean positive = true; From bcd683c6847a55763ae2ed67a3631afccc27cac7 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 23 Sep 2021 18:22:45 +0800 Subject: [PATCH 10/86] =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=9B=9B=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E7=A1=AB=E5=8C=96=E6=8D=A2=E6=A8=A1=E6=AC=A1=E6=95=B0?= 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 | 6 +++--- .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 3 +-- 2 files changed, 4 insertions(+), 5 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 2ff8c15..dcbecdd 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 @@ -139,21 +139,21 @@ public class WorkPlan extends BaseAPS { public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkPlan.Work, work); } public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); } public void setResource(Resource resource) { - this.resourceId = resource != null ? resource.getId() : 0l; + this.resourceId = resource != null ? resource.getId() : 0L; BeanRelation.set(this, EWorkPlan.Resource, resource); } public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); } public void setWorkResource(WorkResource workResource) { - this.workResourceId = workResource != null ? workResource.getId() : 0l; + this.workResourceId = workResource != null ? workResource.getId() : 0L; BeanRelation.set(this, EWorkPlan.WorkResource, workResource); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index e204a88..fef2680 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -31,14 +31,13 @@ public abstract class BaseAPS extends BaseBean { @FieldAnnotation(property = false) private HashMap customFields = new HashMap<>(); - @Column(name="KEY") @ApiParam(value ="主键值") @FieldAnnotation(display = false, modify = false) @Transient private String key; @FieldAnnotation(property = false) - private transient Long updateId = 0l; + private transient Long updateId = 0L; public Object getCustomField(String code) { return customFields.get(code); From 4a9ac431bb4759e142e6f7c35ab464bcb44292a0 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 24 Sep 2021 10:28:21 +0800 Subject: [PATCH 11/86] =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=9B=9B=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E7=A1=AB=E5=8C=96=E6=8D=A2=E6=A8=A1=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/holders/EBaseOrder.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EBaseRule.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EDayShift.java | 7 ++++ .../i3plus/pojo/aps/holders/EExportDetail.java | 7 ++++ .../i3plus/pojo/aps/holders/EExportProject.java | 7 ++++ .../i3plus/pojo/aps/holders/EFurnacePlan.java | 7 ++++ .../i3plus/pojo/aps/holders/EImportDetail.java | 7 ++++ .../i3plus/pojo/aps/holders/EImportField.java | 7 ++++ .../i3plus/pojo/aps/holders/EImportProject.java | 7 ++++ .../i3plus/pojo/aps/holders/EInsertedOrder.java | 7 ++++ .../pojo/aps/holders/EInterMediateDetail.java | 7 ++++ .../pojo/aps/holders/EInterMediateResult.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EInventory.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EMaterial.java | 7 ++++ .../pojo/aps/holders/EMaterialDeliveryPromise.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EOperInput.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EOperOutput.java | 7 ++++ .../i3plus/pojo/aps/holders/EOperResource.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EOperation.java | 7 ++++ .../i3plus/pojo/aps/holders/EOrderFeedback.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EParentWork.java | 7 ++++ .../i3plus/pojo/aps/holders/EPlanFeedback.java | 7 ++++ .../i3plus/pojo/aps/holders/EProductOrder.java | 7 ++++ .../i3plus/pojo/aps/holders/EProductRouting.java | 7 ++++ .../i3plus/pojo/aps/holders/EResCalendar.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EResource.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/ERuleDetail.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/ERuleGroup.java | 7 ++++ .../i3plus/pojo/aps/holders/ESafeStockOrder.java | 7 ++++ .../i3plus/pojo/aps/holders/EShippingTime.java | 15 ++++++--- .../i3plus/pojo/aps/holders/EStandOperation.java | 7 ++++ .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 39 +++++++++++++--------- .../estsh/i3plus/pojo/aps/holders/EWorkInput.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EWorkOutput.java | 7 ++++ .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 7 ++++ .../i3plus/pojo/aps/holders/EWorkRelation.java | 7 ++++ .../i3plus/pojo/aps/holders/EWorkResource.java | 7 ++++ .../cn/estsh/i3plus/pojo/aps/model/BomModel.java | 8 +++-- .../estsh/i3plus/pojo/aps/model/ContextMenu.java | 8 +++-- .../i3plus/pojo/aps/model/DelaySalesOrder.java | 4 ++- .../cn/estsh/i3plus/pojo/aps/model/EnumModel.java | 7 ++++ .../estsh/i3plus/pojo/aps/model/FunctionModel.java | 7 ++++ .../i3plus/pojo/aps/model/GanttCalendarModel.java | 13 ++++++-- .../i3plus/pojo/aps/model/GanttDragModel.java | 7 ++++ .../i3plus/pojo/aps/model/GanttLineModel.java | 7 ++++ .../i3plus/pojo/aps/model/GanttOrderModel.java | 28 +++++++++++++--- .../i3plus/pojo/aps/model/GanttPlanModel.java | 7 ++++ .../cn/estsh/i3plus/pojo/aps/model/KPIModel.java | 8 +++-- .../i3plus/pojo/aps/model/LargeSpanOrder.java | 4 ++- .../pojo/aps/model/MaterialDeliveryAnalyze.java | 4 ++- .../i3plus/pojo/aps/model/PrematureProduct.java | 4 ++- .../estsh/i3plus/pojo/aps/model/ReportPager.java | 17 ++++++++-- .../i3plus/pojo/aps/model/ResourceLoadRequest.java | 19 +++++++++-- .../i3plus/pojo/aps/model/RuleDetailModel.java | 7 ++++ .../i3plus/pojo/aps/model/ShiftReportModel.java | 7 ++++ .../pojo/aps/model/StatisticReportReponse.java | 7 ++++ 56 files changed, 430 insertions(+), 42 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java index d6720fa..5236a10 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 订单关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EBaseOrder { Works, Material, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java index 9753913..8342a93 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseRule.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 规则关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EBaseRule { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java index 1c7f79e..052c635 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EDayShift.java @@ -1,4 +1,11 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 班次关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EDayShift { } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java index 70098c7..47a3150 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportDetail.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 导出明细关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EExportDetail { Project } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java index be46ca5..dea1750 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EExportProject.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 导出关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EExportProject { Link, Details diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java index f944cd0..f5e11f8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EFurnacePlan.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 炉计划关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EFurnacePlan { WorkPlans, MergePlan, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java index 50772bb..00bcc79 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportDetail.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 导入明细关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EImportDetail { Project, Fields diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java index eeff1ef..c723817 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportField.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 导入字段关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EImportField { ImportDetail } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java index 5f00e96..8df1fcb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EImportProject.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 导入关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EImportProject { Link, Details diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java index c8a6248..a1abc31 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInsertedOrder.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 插单关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EInsertedOrder { ProductRouting } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java index 0683e8f..0d9adab 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateDetail.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 计算中间结果明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EInterMediateDetail { Result } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java index 0465f7d..a32686e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInterMediateResult.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 计算中间结果 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EInterMediateResult { Work, Resource, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java index 9c0719a..f7d036d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EInventory.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 库存关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EInventory { SafeStockOrders } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index 16f5f77..e4702ed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 物料关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EMaterial { Group, Childs, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java index abc6ec5..848cc93 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterialDeliveryPromise.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 物料交期承诺 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EMaterialDeliveryPromise { Material, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java index 9ce8642..eb13f50 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperInput.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工序输入关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EOperInput { Operation, InputMaterial, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java index df02363..e91b487 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperOutput.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工序输出关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EOperOutput { Operation, OutputMaterial, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java index 36345e9..97db425 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperResource.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工序资源关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EOperResource { Operation, Resource, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java index 85a4795..8f84aa3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工序关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EOperation { ProductRouting, OperInputs, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java index 5719df5..365c2e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOrderFeedback.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 成品检验报工关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EOrderFeedback { Order } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java index 334c388..378c042 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 父工作关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EParentWork { ProductOrder, Operation, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java index 5ce71a5..62bba5c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作报工关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EPlanFeedback { Work } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java index 5b2f068..3577b9c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 生产订单关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EProductOrder { ProductRouting, ParentWorks diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java index 9fe315f..1882b55 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductRouting.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工艺路线关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EProductRouting { Material, Operations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java index 1717230..50e753e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 资源日历关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EResCalendar { DayShifts, Resources diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index ded90db..b03a61e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 资源关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EResource { WorkShop, WorkPlans diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java index d63f726..a23953c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleDetail.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 规则明细关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum ERuleDetail { RuleGroup, Rule diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java index db3dba0..e981d66 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ERuleGroup.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 规则组合关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum ERuleGroup { Details } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java index bec040c..87bfc37 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/ESafeStockOrder.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 安全库存关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum ESafeStockOrder { Inventory } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java index 100379b..430cef1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EShippingTime.java @@ -1,8 +1,15 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 运输时间关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EShippingTime { - PrevRes, // 前资源 - PostRes, // 后资源 - PrevStand, // 前标准工序 - PostStand // 后标准工序 + PrevRes, + PostRes, + PrevStand, + PostStand } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java index 6e9ac1b..d710c15 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EStandOperation.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 标准工序关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EStandOperation { WorkShop } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 689d599..a0406b3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -1,20 +1,27 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWork { - Order, // 订单 - ParentWork, // 父工作 - WorkResources, // 工作资源 - WorkInputs, // 工作输入 - WorkOutputs, // 工作输出 - PrevRelations, // 前关联 - PostRelations, // 后关联 - Operation, // 工序 - OriginOperation, // 原始工序 - PlanFeedback, // 工作计划反馈 - MainPlan, // 关联的为主资源的计划 - WorkPlans, // 关联的工作计划 - SpecifyResource, // 指定资源 - DynSplitWorks, // 动态拆分后的工作 - OriginWork, // 动态拆分前的工作 - EvaluateResult, // 资源评估结果 + Order, + ParentWork, + WorkResources, + WorkInputs, + WorkOutputs, + PrevRelations, + PostRelations, + Operation, + OriginOperation, + PlanFeedback, + MainPlan, + WorkPlans, + SpecifyResource, + DynSplitWorks, + OriginWork, + EvaluateResult, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java index ddfbd3a..6a54dbb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作输入关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWorkInput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java index e2f1de2..7e731b0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作输出关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWorkOutput { Work, WorkRelations, 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 cec9e5a..7398237 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 @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 生产计划关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWorkPlan { Work, MainWork, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java index 1fc05e6..6fc5188 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作关联关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWorkRelation { Material, PrevOrder, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java index 2f77bcc..0a2a131 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java @@ -1,5 +1,12 @@ package cn.estsh.i3plus.pojo.aps.holders; +/** + * @Description : 工作资源关系标识 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ public enum EWorkResource { Work, Resource, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java index 59d8be4..cfd3fe7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/BomModel.java @@ -6,8 +6,12 @@ import java.util.ArrayList; import java.util.List; /** - * Bom接口数据 - */ + * @Description : Bom接口数据 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class BomModel { @Data diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java index 2331242..feaeef9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ContextMenu.java @@ -3,8 +3,12 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; /** - * 表格右键菜单 - */ + * @Description : 表格右键菜单 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class ContextMenu { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java index 540a328..b888f46 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/DelaySalesOrder.java @@ -64,7 +64,9 @@ public class DelaySalesOrder { @ApiParam(value ="允许的最大延期时间") private String allowDelayTime; - // 0正常显示，1显示黄色，2显示红色 + /** + * 0正常显示，1显示黄色，2显示红色 + */ @ApiParam(value ="背景显示颜色") private Integer backgroundColor; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java index db5b676..aad92f9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/EnumModel.java @@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; +/** + * @Description : 枚举模型 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class EnumModel { private String code; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java index b810c25..6799813 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/FunctionModel.java @@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; +/** + * @Description : 表达式函数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class FunctionModel { private String code; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java index 7a80b06..8d16f9c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttCalendarModel.java @@ -8,6 +8,13 @@ import lombok.Data; import java.util.Date; +/** + * @Description : 甘特图日历请求参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class GanttCalendarModel { private String resourceId; @@ -18,9 +25,11 @@ public class GanttCalendarModel { @JsonDeserialize(using = CustomDateDeserializer.class) private Date endDate; private String cls; - //private String timeRangeColor; private String eventColor; private String name; - private Double percentDone;//完成百分比 + /** + * 完成百分比 + */ + private Double percentDone; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java index 53496da..0171f62 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttDragModel.java @@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; +/** + * @Description : 甘特图拖拽工作块请求参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class GanttDragModel { private Long workId; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java index 0c5ab45..d0d00e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttLineModel.java @@ -2,6 +2,13 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; +/** + * @Description : 甘特图连线 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class GanttLineModel { private long from; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java index d486f26..df3d311 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java @@ -10,6 +10,13 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +/** + * @Description : 订单甘特图工作块 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class GanttOrderModel { private String id; @@ -23,11 +30,22 @@ public class GanttOrderModel { @JsonDeserialize(using = CustomDateDeserializer.class) private Date endDate; private String color; - private Double percentDone;//完成百分比 - private Boolean expanded;//是否展开树 - private Boolean rollup;//自动把数据相加 在children的上层 当前 - private String duration;//持续时间 天/小时/分钟 -// private String durationUnit; + /** + * 完成百分比 + */ + private Double percentDone; + /** + * 是否展开树 + */ + private Boolean expanded; + /** + * 自动把数据相加 在children的上层 当前 + */ + private Boolean rollup; + /** + * 持续时间 天/小时/分钟 + */ + private String duration; private Boolean manuallyScheduled; private List children = new ArrayList<>(); private List lineModels = new ArrayList<>(); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index 6e2e3bb..077e605 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java @@ -9,6 +9,13 @@ import lombok.Data; import java.util.Date; import java.util.List; +/** + * @Description : 甘特图生产计划 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ @Data public class GanttPlanModel { private Long resourceId; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java index 7a4c619..c1dae27 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/KPIModel.java @@ -3,8 +3,12 @@ package cn.estsh.i3plus.pojo.aps.model; import lombok.Data; /** - * KPI接口数据 - */ + * @Description : KPI接口数据 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ @Data public class KPIModel { private Integer salesOrderCount; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java index 5ddc2dd..e81abef 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/LargeSpanOrder.java @@ -60,7 +60,9 @@ public class LargeSpanOrder { @ApiParam(value ="跨度时间") private String spanTime; - // 0正常显示，1显示黄色，2显示红色 + /** + * 0正常显示，1显示黄色，2显示红色 + */ @ApiParam(value ="背景显示颜色") private Integer backgroundColor; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java index c7a0500..5142f87 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MaterialDeliveryAnalyze.java @@ -52,7 +52,9 @@ public class MaterialDeliveryAnalyze { @JsonDeserialize(using = CustomDateDeserializer.class) private Date arrivalDate; - // 0正常显示，1显示红色 + /** + * 0正常显示，1显示红色 + */ @ApiParam(value ="背景显示颜色") private Integer backgroundColor; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java index 4080aa9..896cd06 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PrematureProduct.java @@ -54,7 +54,9 @@ public class PrematureProduct { @ApiParam(value ="提前完成时间") private String times; - // 0正常显示，1显示红色 + /** + * 0正常显示，1显示红色 + */ @ApiParam(value ="背景显示颜色") private Integer backgroundColor; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java index 788b585..9cd8071 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ReportPager.java @@ -20,13 +20,24 @@ import java.util.Date; @Data @Api("报表分页查询参数") public class ReportPager extends APSPager { + /** + * 统计开始时间 + */ @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date begin; // 统计开始时间 + private Date begin; + + /** + * 统计结束时间 + */ @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date end; // 统计结束时间 + private Date end; private ApsEnumUtil.MATERIAL_REPORT_TYPE type; - private ApsEnumUtil.REPORT_TIME_SPAN span; // 统计时间间隔 + + /** + * 统计时间间隔 + */ + private ApsEnumUtil.REPORT_TIME_SPAN span; private String shiftCode; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java index b7bcac0..ac6f52a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceLoadRequest.java @@ -9,15 +9,30 @@ import lombok.Data; import java.util.Date; +/** + * @Description : 资源负荷请求参数 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ @Data public class ResourceLoadRequest { private ApsEnumUtil.RESOURCE_LOAD_SPAN span; + + /** + * 统计开始时间 + */ @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date begin; // 统计开始时间 + private Date begin; + + /** + * 统计结束时间 + */ @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) - private Date end; // 统计结束时间 + private Date end; private Long[] resourceIds; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java index 6c0b455..f40114a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java @@ -3,6 +3,13 @@ package cn.estsh.i3plus.pojo.aps.model; import io.swagger.annotations.ApiParam; import lombok.Data; +/** + * @Description : 规则执行结果明细 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ @Data public class RuleDetailModel { @ApiParam(value ="主执行进度") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java index 112618a..b9b28b0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ShiftReportModel.java @@ -6,6 +6,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +/** + * @Description : + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ @Data public class ShiftReportModel { private List dates = new ArrayList<>(); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java index 91a36ab..9318579 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/StatisticReportReponse.java @@ -6,6 +6,13 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +/** + * @Description : + * @Reference : + * @Author : jason.niu + * @CreateDate : 2021-04-15 + * @Modify: + **/ @Data public class StatisticReportReponse { private List headers = new ArrayList<>(); From 923a9563c9f18519415658a75a397c4adf7a4e10 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Fri, 24 Sep 2021 18:25:21 +0800 Subject: [PATCH 12/86] =?UTF-8?q?=E5=9B=A0=E9=95=BF=E5=BA=A6=E8=BF=87?= =?UTF-8?q?=E9=95=BF,=E5=8E=BB=E9=99=A4content=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java index 3ac9292..ed75a18 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfEdiInitialData.java @@ -28,7 +28,7 @@ import java.io.Serializable; @Inheritance(strategy = InheritanceType.JOINED) @Table(name = "IF_EDI_INITIAL_DATA", indexes = { @Index(columnList = "PROGRAM_DATA"), - @Index(columnList = "CONTENT"), +// @Index(columnList = "CONTENT"), @Index(columnList = "SYNC_STATUS") }) @Api("EDI_初始数据表") From a1aaf07a96c766732620aa3dbb45dd0a7c4e6dd0 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 28 Sep 2021 11:22:48 +0800 Subject: [PATCH 13/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8C=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E7=A1=AB=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttResourceModel.java | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java new file mode 100644 index 0000000..7571c55 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttResourceModel.java @@ -0,0 +1,27 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.converter.CustomDateDeserializer; +import cn.estsh.i3plus.pojo.aps.converter.CustomDateSerializer; +import com.fasterxml.jackson.databind.annotation.JsonDeserialize; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import lombok.Data; + +import java.util.Date; + +/** + * @Description : 订单甘特图工作块 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-11 + * @Modify: + **/ +@Data +public class GanttResourceModel extends APSPager { + private Boolean hasEmptyResource; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date begin; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date end; +} From 8406b0c3e8fa4b0a3e255b6e84f2e18e65cdfb97 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 7 Oct 2021 10:12:31 +0800 Subject: [PATCH 14/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=8C=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E7=A1=AB=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 22 ------------------ .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 26 ---------------------- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 4 ++-- .../estsh/i3plus/pojo/aps/holders/EMaterial.java | 2 -- .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 2 ++ .../src/main/resources/relations/Material.xml | 2 -- .../src/main/resources/relations/WorkPlan.xml | 2 ++ 7 files changed, 6 insertions(+), 54 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 4f1acff..cb1c5e3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -62,11 +62,6 @@ public class Material extends BaseAPS { @FieldAnnotation(defaultValue = "ONEBYONE") private ApsEnumUtil.REPLENISHMENT_TYPE replType; - @Column(name="GROUP_ID") - @ApiParam(value ="物料组") - @FieldAnnotation(relation = "Material") - private Long groupId; - @Column(name="PURCHASE_LEAD_TIME") @ApiParam(value ="采购提前期") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -140,11 +135,6 @@ public class Material extends BaseAPS { @FieldAnnotation(property = false) private Double maxStockCount; - @Column(name="ORDER_BATCH_PERIOD") - @ApiParam(value ="订单合并期间") - @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) - private String orderBatchPeriod; - @Column(name="LABEL_NAME") @ApiParam(value ="标签名称") private String labelName; @@ -158,18 +148,6 @@ public class Material extends BaseAPS { @FieldAnnotation(relation = "WorkShop") private Long workShopId; - public Material getGroup() { - return BeanRelation.get(this, EMaterial.Group); - } - - public void setGroup(Material material) { - this.groupId = material != null ? material.getId() : 0l; - BeanRelation.set(this, EMaterial.Group, material); - } - - @JsonBackReference - public List getChilds() { return BeanRelation.list(this, EMaterial.Childs); } - @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index b5dbeae..63692bd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -18,7 +18,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; -import java.util.Date; import java.util.List; /** @@ -80,14 +79,6 @@ public class Resource extends BaseAPS { @ApiParam(value ="最大生产批量") private Double maxProduceBatch; - @Column(name="TIME_TAIL_ADJUST") - @ApiParam(value ="时间尾数圆整") - private String timeTailAdjust; - - @Column(name="TIME_ADJUST") - @ApiParam(value ="时间圆整") - private String timeAdjust; - @Column(name="MAX_PREV_SD_TIME") @ApiParam(value ="最大前设置中断时间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) @@ -103,33 +94,16 @@ public class Resource extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String maxPostSdTime; - @Column(name="ROUND_TYPE") - @ApiParam(value ="圆整类型") - @FieldAnnotation(defaultValue = "ROUNDING") - private ApsEnumUtil.TIME_ROUND_TYPE roundType; - @Column(name="EFFICIENCY_EFFECT") @ApiParam(value ="效率影响类型") @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer EfficiencyEffect; - @Column(name="TIME_ROUND") - @ApiParam(value ="时间圆整影响") - @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) - private Integer timeRound; - - @Column(name="TIME_TAIL_ROUND") - @ApiParam(value ="时间尾数影响") - @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) - private Integer timeTailRound; - @ApiParam(value ="是否存在任务冲突") @FieldAnnotation(property = false) @Transient private boolean hasConflict; - private transient Date rightLimit; - public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); } public void setWorkShop(WorkShop workShop) { 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 dcbecdd..54aa79b 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 @@ -72,14 +72,14 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="生产开始时间") @FieldAnnotation(modify = false) @RippleAnnotation(dependence = {"MainWork.PrevRelations.PrevWork.MainPlan.produceBegin", - "PrevPlan.produceBegin", "PrevFurnace.produceBegin"}, method = "calcPositive") + "PrevPlan.produceBegin", "PrevFurnace.produceBegin", "PrevAssPlan.produceBegin"}, method = "calcPositive") private Date produceBegin; @Column(name="PRODUCE_END") @ApiParam(value ="生产结束时间") @FieldAnnotation(modify = false) @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceEnd", - "PostPlan.produceEnd", "PostFurnace.produceEnd"}, method = "calcReverse") + "PostPlan.produceEnd", "PostFurnace.produceEnd", "PostAssPlan.produceEnd"}, method = "calcReverse") private Date produceEnd; @Column(name="PRODUCE_TIME") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java index e4702ed..fb9fee4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java @@ -8,8 +8,6 @@ package cn.estsh.i3plus.pojo.aps.holders; * @Modify: **/ public enum EMaterial { - Group, - Childs, ProductRoutings, OperInputs, OperOutputs, 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 7398237..257d11e 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 @@ -17,4 +17,6 @@ public enum EWorkPlan { PrevFurnace, PostFurnace, FurnacePlan, + PrevAssPlan, + PostAssPlan, } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml index 6ce3798..ef83c89 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml @@ -2,8 +2,6 @@ - - \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index 47d45a9..6b2c8c0 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -6,4 +6,6 @@ + + \ No newline at end of file From 98cfaf0db2f6aedb191fb1b6850988e74972c541 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 14 Oct 2021 10:42:23 +0800 Subject: [PATCH 15/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9B=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java | 10 +++++++++- .../main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java | 5 +++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 9057dad..0dc81b8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -25,7 +25,7 @@ public class BeanRelation { private static Map relations = new ConcurrentHashMap<>(); private static BeanRelation get() { - Long userId = 0l; + Long userId = 0L; BeanRelation relation = relations.get(userId); if (relation == null) { synchronized (BeanRelation.class) { @@ -383,6 +383,14 @@ public class BeanRelation { } /** + * 移除关联关系中的对象，并不会移除关联的对象的关系 + * @param bean + */ + public static void erase(BaseBean bean) { + get().caches.get(bean.getClass()).remove(bean.getId()); + } + + /** * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 * @param bean * @param fun diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java index eb35e2c..0aa3d16 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.model; import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan; import cn.estsh.i3plus.pojo.aps.bean.Resource; import cn.estsh.i3plus.pojo.aps.bean.WorkPlan; +import cn.estsh.i3plus.pojo.aps.bean.WorkResource; import lombok.Data; /** @@ -23,6 +24,10 @@ public class PlanRecord { */ private Resource resource; /** + * 工作可用资源 + */ + private WorkResource workResource; + /** * 插入到目标工作计划前面 */ private WorkPlan postPlan; From 5888b17cd8861baf80d2d0c8358a10b75de6bdc7 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 15 Oct 2021 16:59:59 +0800 Subject: [PATCH 16/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9B=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 2 +- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 311 ++++++--------------- 2 files changed, 84 insertions(+), 229 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index cb1c5e3..bb8c32d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -206,7 +206,7 @@ public class Material extends BaseAPS { public WorkShop getWorkShop() { return BeanRelation.get(this, EMaterial.WorkShop); } public void setWorkShop(WorkShop workShop) { - this.workShopId = workShop != null ? workShop.getId() : 0l; + this.workShopId = workShop != null ? workShop.getId() : 0; BeanRelation.set(this, EMaterial.WorkShop, workShop); } } 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 2dabd59..5d911a9 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 @@ -4,11 +4,8 @@ package cn.estsh.i3plus.pojo.base.enumutil; import com.fasterxml.jackson.annotation.JsonFormat; /** - * @Description : - * @Reference : * @Author : jason.niu * @CreateDate : 2019-11-11 - * @Modify: **/ public class ApsEnumUtil { @@ -25,8 +22,8 @@ public class ApsEnumUtil { SATURDAY(32, "星期六"), SUNDAY(64, "星期天"); - private int value; - private String description; + private final int value; + private final String description; CALENDAR_WEEK(int value, String description) { this.value = value; @@ -63,8 +60,8 @@ public class ApsEnumUtil { INNER_PRODUCT("INNER_PRODUCT", "中间品"), VIRTUAL("VIRTUAL", "虚拟件"); - private String value; - private String description; + private final String value; + private final String description; MATERIAL_TYPE(String value, String description) { this.value = value; @@ -81,31 +78,6 @@ public class ApsEnumUtil { } /** - * 物料类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_VALID_TYPE { - VALID("VALID", "有效"), - INVALID("INVALID", "无效"); - - private String value; - private String description; - - ORDER_VALID_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 物料报表统计类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -114,8 +86,8 @@ public class ApsEnumUtil { PRODUCE("PRODUCE", "生产"), INVENTORY("INVENTORY", "库存"); - private String value; - private String description; + private final String value; + private final String description; MATERIAL_REPORT_TYPE(String value, String description) { this.value = value; @@ -143,8 +115,8 @@ public class ApsEnumUtil { ONE_WEEK("ONE_WEEK", "一周"), ONE_MONTH("ONE_MONTH", "一月"); - private String value; - private String description; + private final String value; + private final String description; REPORT_TIME_SPAN(String value, String description) { this.value = value; @@ -169,8 +141,8 @@ public class ApsEnumUtil { SELF_MAKE("SELF_MAKE", "自制"), // 自制 PURCHASE("PURCHASE", "采购"); // 采购 - private String value; - private String description; + private final String value; + private final String description; PREPARE_TYPE(String value, String description) { this.value = value; @@ -195,8 +167,8 @@ public class ApsEnumUtil { BATCH("BATCH", "批量补充"), ONEBYONE("ONEBYONE", "一对一补充"); - private String value; - private String description; + private final String value; + private final String description; REPLENISHMENT_TYPE(String value, String description) { this.value = value; @@ -222,8 +194,8 @@ public class ApsEnumUtil { PURCHASE(2, "采购制约"), PRODUCT(4, "生产制约"); - private int value; - private String description; + private final int value; + private final String description; MATERIAL_ASSIGN_LIMIT(int value, String description) { this.value = value; @@ -257,8 +229,8 @@ public class ApsEnumUtil { POSITIVE("POSITIVE", "正向"), REVERSE("REVERSE", "逆向"); - private String value; - private String description; + private final String value; + private final String description; DIRECTION(String value, String description) { this.value = value; @@ -275,32 +247,6 @@ public class ApsEnumUtil { } /** - * 尾数处理方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TAIL_DEAL { - NODEAL("NODEAL", "不处理"), - CEILING("CEILING", "向下"), - PUSHFRONT("PUSHFRONT", "向上"); - - private String value; - private String description; - - TAIL_DEAL(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 则管理中规则的类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -311,8 +257,8 @@ public class ApsEnumUtil { FIELD_SET("FIELD_SET", "字段赋值"), FLUSH_PLAN("FLUSH_PLAN", "刷新计划"); - private String value; - private String description; + private final String value; + private final String description; RULE_TYPE(String value, String description) { this.value = value; @@ -337,8 +283,8 @@ public class ApsEnumUtil { SINGLE("SINGLE", "单资源"), BATCH("BATCH", "炉资源"); - private String value; - private String description; + private final String value; + private final String description; RESOURCE_CLASS(String value, String description) { this.value = value; @@ -355,32 +301,6 @@ public class ApsEnumUtil { } /** - * 锁定时间的取值方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RESOURCE_LOCK_TYPE { - NONE("NONE", "不锁定"), - PRODUCE_BEGIN("PRODUCE_BEGIN", "后工序生产开始时刻"), - PRODUCE_END("PRODUCE_END", "后工序生产结束时刻"); - - private String value; - private String description; - - RESOURCE_LOCK_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 资源类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -388,8 +308,8 @@ public class ApsEnumUtil { MAIN("MAIN", "主资源"), ASS("ASS", "副资源"); - private String value; - private String description; + private final String value; + private final String description; RESOURCE_TYPE(String value, String description) { this.value = value; @@ -414,8 +334,8 @@ public class ApsEnumUtil { PRODUCE(2, "生产"), // 生产 POST_SET(4, "后设置"); // 后设置 - private int value; - private String description; + private final int value; + private final String description; EFFICIENCY_EFFECT(int value, String description){ this.value = value; @@ -455,8 +375,8 @@ public class ApsEnumUtil { RESOURCE_USEAGE("RESOURCE_USEAGE", "资源使用率"), CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); - private String value; - private String description; + private final String value; + private final String description; RESOURCE_CHOISE_RULE(String value, String description) { this.value = value; @@ -485,8 +405,8 @@ public class ApsEnumUtil { NO_POR("NO_POR", "指示完毕"), NO_PPRS("NO_PPRS", "已确认"); - private String value; - private String description; + private final String value; + private final String description; ORDER_DEL_LIMIT(String value, String description) { this.value = value; @@ -515,8 +435,8 @@ public class ApsEnumUtil { MIN_ALL_RESOURCE("MIN_ALL_RESOURCE", "主副资源最小值"), AVG_ALL_RESOURCE("AVG_ALL_RESOURCE", "主副资源平均值"); - private String value; - private String description; + private final String value; + private final String description; RES_COMB_TIME_TYPE(String value, String description) { this.value = value; @@ -533,32 +453,6 @@ public class ApsEnumUtil { } /** - * 时间圆整方式 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum TIME_ROUND_TYPE { - UP("UP", "向上"), - DOWN("DOWN", "向下"), - ROUNDING("ROUNDING", "四舍五入"); - - private String value; - private String description; - - TIME_ROUND_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 工艺路径有效性判断类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -567,8 +461,8 @@ public class ApsEnumUtil { CALC_LET_LT("CALC_LET_LT", "与最晚结束时刻计算值-提前期做比较"), BASE_TIME("BASE_TIME", "与基准时刻做比较"); - private String value; - private String description; + private final String value; + private final String description; ROUTING_VALID_TYPE(String value, String description) { this.value = value; @@ -597,8 +491,8 @@ public class ApsEnumUtil { FIFTH_ASS("FIFTH_ASS", "第五套副资源"), SIXTH_ASS("SIXTH_ASS", "第六套副资源"); - private String value; - private String description; + private final String value; + private final String description; USE_TYPE(String value, String description) { this.value = value; @@ -623,8 +517,8 @@ public class ApsEnumUtil { ASS_PLAN("ASS_PLAN", "副资源计划"), BATCH_PLAN("BATCH_PLAN", "炉资源计划"); - private String value; - private String description; + private final String value; + private final String description; WORK_PLAN_TYPE(String value, String description) { this.value = value; @@ -648,8 +542,8 @@ public class ApsEnumUtil { INNER("INNER", "订单内关联"), OUTER("OUTER", "订单间关联"); - private String value; - private String description; + private final String value; + private final String description; WORK_RELATION_TYPE(String value, String description) { this.value = value; @@ -691,8 +585,8 @@ public class ApsEnumUtil { TOP_ORDER_PRIORITY("TOP_ORDER_PRIORITY", "顶层订单优先级"), CUST_EXPRESSION("CUST_EXPRESSION", "自定义表达式"); - private String value; - private String description; + private final String value; + private final String description; WORK_SORT_RULE(String value, String description) { this.value = value; @@ -719,8 +613,8 @@ public class ApsEnumUtil { BATCH("BATCH", "按批量分割"), REMAINDER("REMAINDER", "按余数分割"); - private String value; - private String description; + private final String value; + private final String description; WORK_SPLIT_TYPE(String value, String description) { this.value = value; @@ -748,8 +642,8 @@ public class ApsEnumUtil { STARTPRODUCT("STARTPRODUCT", "生产中"), FINISH("FINISH", "完成"); - private String value; - private String description; + private final String value; + private final String description; WORK_STATUS(String value, String description) { this.value = value; @@ -777,8 +671,8 @@ public class ApsEnumUtil { // 此工作参与排程 NORMAL("NORMAL", "普通工作"); - private String value; - private String description; + private final String value; + private final String description; WORK_TYPE(String value, String description) { this.value = value; @@ -803,8 +697,8 @@ public class ApsEnumUtil { POST_SET("POST_SET", "只对后设置影响"), ALL("ALL", "对前后设置都产生影响"); - private String value; - private String description; + private final String value; + private final String description; DYNAMIC_SET_TYPE(String value, String description) { this.value = value; @@ -829,8 +723,8 @@ public class ApsEnumUtil { MAX("MAX", "取最大值"), SUM("SUM", "求和"); - private String value; - private String description; + private final String value; + private final String description; DYNAMIC_SET_CALC(String value, String description) { this.value = value; @@ -856,8 +750,8 @@ public class ApsEnumUtil { EE("EE", "前工序结束，后工序结束"), SSEE("SSEE", "前后工序同时开始或同时结束"); - private String value; - private String description; + private final String value; + private final String description; CONSTRAINT_TYPE(String value, String description) { this.value = value; @@ -881,8 +775,8 @@ public class ApsEnumUtil { ENABLE("ENABLE", "加班"), DISABLE("DISABLE", "下班"); - private String value; - private String description; + private final String value; + private final String description; CALENDAR_TYPE(String value, String description) { this.value = value; @@ -906,8 +800,8 @@ public class ApsEnumUtil { REPLACE("REPLACE", "替代导入"), DIFF("DIFF", "差分导入"); - private String value; - private String description; + private final String value; + private final String description; IMPORT_DETAIL_TYPE(String value, String description) { this.value = value; @@ -924,45 +818,6 @@ public class ApsEnumUtil { } /** - * 字段赋值对象 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FIELD_SET_BEAN { - Material("Material", "物料"), - ProductRouting("ProductRouting", "工艺路线"), - Operation("Operation", "工序"), - OperInput("OperInput", "工序输入"), - OperOutput("OperOutput", "工序输出"), - OperResource("OperResource", "工序资源"), - StandOperation("StandOperation", "标准工序"), - SalesOrder("SalesOrder", "销售订单"), - ProductOrder("ProductOrder", "生产订单"), - PurchaseOrder("PurchaseOrder", "采购订单"), - Inventory("Inventory", "库存"), - Work("Work", "工作"), - WorkInput("WorkInput", "工作输入"), - WorkOutput("WorkOutput", "工作输出"), - WorkResource("WorkResource", "工作资源"), - WorkRelation("WorkRelation", "工作关联"); - - private String value; - private String description; - - FIELD_SET_BEAN(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 计划类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) @@ -971,8 +826,8 @@ public class ApsEnumUtil { PRODUCE("", "生产"), POST_SET("", "后设置"); - private String value; - private String description; + private final String value; + private final String description; PLAN_TYPE(String value, String description) { this.value = value; @@ -998,8 +853,8 @@ public class ApsEnumUtil { ORACLE("ORACLE", "Oracle"), SQLSERVER("SQLSERVER", "SqlServer"); - private String value; - private String description; + private final String value; + private final String description; DATA_LINK_TYPE(String value, String description) { this.value = value; @@ -1040,8 +895,8 @@ public class ApsEnumUtil { QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"), COLOR_PICKER("COLOR_PICKER", "颜色选择框"); - private String value; - private String description; + private final String value; + private final String description; EDIT_TYPE(String value, String description) { this.value = value; @@ -1079,8 +934,8 @@ public class ApsEnumUtil { OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"), LIST("LIST", "对象集合，不可编辑。"); - private String value; - private String description; + private final String value; + private final String description; FIELD_TYPE(String value, String description) { this.value = value; @@ -1110,8 +965,8 @@ public class ApsEnumUtil { ONE_WEEK("ONE_WEEK", "1周"), ONE_MONTH("ONE_MONTH", "1月"); - private String value; - private String description; + private final String value; + private final String description; RESOURCE_LOAD_SPAN(String value, String description) { this.value = value; @@ -1139,8 +994,8 @@ public class ApsEnumUtil { STARTPRODUCT("STARTPRODUCT", "开始生产"), FINISH("FINISH", "完成"); - private String value; - private String description; + private final String value; + private final String description; ORDER_STATUS(String value, String description) { this.value = value; @@ -1165,8 +1020,8 @@ public class ApsEnumUtil { CHANGE("CHANGE", "改带"), COMMIT("COMMIT", "确认"); - private String value; - private String description; + private final String value; + private final String description; SALES_ORDER_STATUS(String value, String description) { this.value = value; @@ -1191,8 +1046,8 @@ public class ApsEnumUtil { SPLIT_MAIN("SPLIT_MAIN", "拆分下发（主）"), SPLIT_CHILD("SPLIT_CHILD", "拆分下发（子）"); - private String value; - private String description; + private final String value; + private final String description; SALES_ORDER_SPLIT_STATUS(String value, String description) { this.value = value; @@ -1216,8 +1071,8 @@ public class ApsEnumUtil { UNCOMMIT("UNCOMMIT", "待处理"), COMMIT("COMMIT", "确认"); - private String value; - private String description; + private final String value; + private final String description; SAFE_STOCK_ORDER_STATUS(String value, String description) { this.value = value; @@ -1241,8 +1096,8 @@ public class ApsEnumUtil { UNCOMMIT("UNCOMMIT", "待处理"), COMMIT("COMMIT", "确认"); - private String value; - private String description; + private final String value; + private final String description; INSERTED_ORDER_STATUS(String value, String description) { this.value = value; @@ -1266,8 +1121,8 @@ public class ApsEnumUtil { UNCOMMIT("UNCOMMIT", "未提交"), COMMIT("COMMIT", "提交"); - private String value; - private String description; + private final String value; + private final String description; FEED_BACK_STATUS(String value, String description) { this.value = value; @@ -1295,9 +1150,9 @@ public class ApsEnumUtil { SAFE_STOCK_ORDER("SAFE_STOCK_ORDER", "Q", "安全库存订单"), INSERTED_ORDER("INSERTED_ORDER", "I", "插单"); - private String value; - private String prefix; - private String description; + private final String value; + private final String prefix; + private final String description; APS_ORDER_TYPE(String value, String prefix, String description) { this.value = value; @@ -1332,8 +1187,8 @@ public class ApsEnumUtil { TWO_WRAPPING("TWO_WRAPPING", "二车间包布"), TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"); - private String value; - private String description; + private final String value; + private final String description; SANLUX_OPERATION_TYPE(String value, String description) { this.value = value; From d04286164bae99e0a623efd028828565b1ad59ce Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sun, 17 Oct 2021 09:41:12 +0800 Subject: [PATCH 17/86] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=8E=8B=E6=9D=B0?= =?UTF-8?q?=EF=BC=9A=E6=B7=BB=E5=8A=A0=E7=B4=A2=E5=BC=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java | 13 +++++++------ .../java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java | 6 +++++- .../cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java | 13 ++++++------- .../cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java | 4 +++- .../i3plus/pojo/mes/bean/MesLabelTemplateParam.java | 4 +++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java | 12 ++++++------ .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java | 13 ++++++------- .../estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java | 12 ++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java | 15 +++++++++------ .../estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 3 ++- .../java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 5 ++++- .../cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java | 13 +++++++------ .../estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java | 16 +++++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 13 +++++++------ .../cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java | 13 ++++++------- .../i3plus/pojo/mes/bean/MesStateMachineStatus.java | 4 +++- .../estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java | 13 ++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java | 14 ++++++++------ .../java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java | 14 +++++++------- .../java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java | 14 +++++++------- .../cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 14 +++++++------- 34 files changed, 197 insertions(+), 179 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java index 465d4ee..1ec7de5 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesArea.java @@ -7,16 +7,13 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -33,7 +30,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_AREA") +@Table(name = "MES_AREA", indexes = { + @Index(columnList = "AREA_CODE") +}) @Api("生产区域") public class MesArea extends BaseBean implements Serializable { private static final long serialVersionUID = 4320604250440221043L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java index edad745..dde5707 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesConfig.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -29,7 +27,10 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_CONFIG") +@Table(name = "MES_CONFIG", indexes = { + @Index(columnList = "CFG_CODE"), + @Index(columnList = "CFG_CODE, CFG_KEY") +}) @Api("mes配置表") public class MesConfig extends BaseBean implements Serializable { private static final long serialVersionUID = 2462824203686013806L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java index 58af48c..e5a411d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesContainer.java @@ -23,7 +23,9 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_CONTAINER") +@Table(name = "MES_CONTAINER", indexes = { + @Index(columnList = "CT_NO") +}) @Api("MES_容器类型") public class MesContainer extends BaseBean { private static final long serialVersionUID = -3843389042411645111L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java index 9ff2531..4759e03 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomer.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -29,7 +27,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_CUSTOMER") +@Table(name = "MES_CUSTOMER", indexes = { + @Index(columnList = "CUSTOMER_CODE") +}) @Api("客户信息") public class MesCustomer extends BaseBean implements Serializable { private static final long serialVersionUID = 6049359006918853570L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java index 39b12bc..9a80643 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustomerPart.java @@ -26,7 +26,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_CUSTOMER_PART") +@Table(name = "MES_CUSTOMER_PART", indexes = { + @Index(columnList = "CUSTOMER_CODE"), + @Index(columnList = "PART_NO"), + @Index(columnList = "CUSTOMER_PART_NO") +}) @Api("客户零件关系") public class MesCustomerPart extends BaseBean implements Serializable { private static final long serialVersionUID = 2600442373171403668L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java index 5f382f0..82e9cf4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDataObject.java @@ -5,16 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -28,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_DATA_OBJECT") +@Table(name = "MES_DATA_OBJECT", indexes = { + @Index(columnList = "OBJECT_CODE") +}) @Api("数据对象") public class MesDataObject extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java index c724e84..dadbc6a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesDefect.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -30,7 +27,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_DEFECT") +@Table(name = "MES_DEFECT", indexes = { + @Index(columnList = "DEFECT_CODE") +}) @Api("缺陷表") public class MesDefect extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java index 4236f7c..53b13c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesKpsnRule.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,7 +26,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_KPSN_RULE") +@Table(name = "MES_KPSN_RULE", indexes = { + @Index(columnList = "PART_NO") +}) @Api("关键件条码校验规则") public class MesKpsnRule extends BaseBean implements Serializable { private static final long serialVersionUID = 2592621267902381297L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java index bc9f9f9..4847b67 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplate.java @@ -27,7 +27,9 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_LABEL_TEMPLATE") +@Table(name = "MES_LABEL_TEMPLATE", indexes = { + @Index(columnList = "TEMPLATE_CODE") +}) @Api(value = "打印模板", description = "打印模板") public class MesLabelTemplate extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java index 94828e2..9587392 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLabelTemplateParam.java @@ -28,7 +28,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_LABEL_TEMPLATE_PARAM") +@Table(name = "MES_LABEL_TEMPLATE_PARAM", indexes = { + @Index(columnList = "TEMPLATE_CODE") +}) @Api(value = "打印模板参数", description = "打印模板参数") public class MesLabelTemplateParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java index f931891..6ca3271 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesMethod.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -29,7 +27,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_METHOD") +@Table(name = "MES_METHOD", indexes = { + @Index(columnList = "METHOD_CODE") +}) @Api("系统业务方法") public class MesMethod extends BaseBean implements Serializable { private static final long serialVersionUID = -3254086662292709833L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java index 95710bd..06092ce 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberRule.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -27,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_NUMBER_RULE") +@Table(name = "MES_NUMBER_RULE", indexes = { + @Index(columnList = "RULE_CODE") +}) @Api("条码生成规则") public class MesNumberRule extends BaseBean implements Serializable { private static final long serialVersionUID = -7547623897602721464L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java index c40c38a..2731ed7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesNumberSerialno.java @@ -5,16 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Version; import java.io.Serializable; /** @@ -28,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_NUMBER_SERIALNO") +@Table(name = "MES_NUMBER_SERIALNO", indexes = { + @Index(columnList = "CURRENT_NUMBER_PREFIX") +}) @Api("编码序号") public class MesNumberSerialno extends BaseBean implements Serializable { private static final long serialVersionUID = -6004402998083665263L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index 3581c46..2c3bd0a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -5,16 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -28,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_OBJECT_CFG") +@Table(name = "MES_OBJECT_CFG", indexes = { + @Index(columnList = "OBJECT_CODE") +}) @Api("对象结构") public class MesObjectCfg extends BaseBean implements Serializable { private static final long serialVersionUID = 55753384888695913L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java index dbdd627..dcfd1cd 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectDao.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -29,7 +27,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_OBJECT_DAO") +@Table(name = "MES_OBJECT_DAO", indexes = { + @Index(columnList = "OBJECT_CODE") +}) @Api("MES_对象与dao对应关系") public class MesObjectDao extends BaseBean implements Serializable { private static final long serialVersionUID = 2286752362359060L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java index cd4b446..c17d955 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcn.java @@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -28,7 +26,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PCN") +@Table(name = "MES_PCN", indexes = { + @Index(columnList = "PCN_CODE") +}) @Api("PCN节点") public class MesPcn extends BaseBean implements Serializable { private static final long serialVersionUID = -9150091413555406397L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java index f9b7fa0..9c156da 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSyncCfg.java @@ -5,16 +5,13 @@ import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -30,7 +27,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PCN_SYNC_CFG") +@Table(name = "MES_PCN_SYNC_CFG", indexes = { + @Index(columnList = "PCN_CODE, SYNC_TYPE") +}) @Api("MES_PCN_同步配置") public class MesPcnSyncCfg extends BaseBean implements Serializable { private static final long serialVersionUID = 7270930330576127126L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java index b72573b..f07115e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPcnSysUserOffline.java @@ -6,16 +6,13 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; import java.io.Serializable; /** @@ -31,7 +28,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PCN_SYS_USER_OFFLINE") +@Table(name = "MES_PCN_SYS_USER_OFFLINE", indexes = { + @Index(columnList = "LOGIN_NAME") +}) @Api(value = "账号离线登陆表", description = "账号离线登陆表。") public class MesPcnSysUserOffline extends BaseBean implements Serializable { private static final long serialVersionUID = -7483799830588482021L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java index fcee248..1c1daf6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProcess.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,7 +26,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PROCESS") +@Table(name = "MES_PROCESS", indexes = { + @Index(columnList = "PROCESS_CODE") +}) @Api("工序") public class MesProcess extends BaseBean implements Serializable { private static final long serialVersionUID = -615476712907856558L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java index 89bd66a..7c3dd40 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdPack.java @@ -5,15 +5,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -27,7 +25,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PROD_PACK") +@Table(name = "MES_PROD_PACK", indexes = { + @Index(columnList = "PART_NO") +}) @Api("产品包装关系") public class MesProdPack extends BaseBean implements Serializable { private static final long serialVersionUID = -5748484568201154400L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java index 9aef4c6..fd8919f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java @@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -28,7 +26,12 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_PROD_ROUTE_CFG") +@Table(name = "MES_PROD_ROUTE_CFG", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "ROUTE_CODE, WORK_CENTER_CODE"), + @Index(columnList = "WORK_CENTER_CODE, ROUTE_TYPE") +}) @Api("产品类流程配置表") public class MesProdRouteCfg extends BaseBean implements Serializable { private static final long serialVersionUID = -3903152693262813917L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index 1e38879..aef69cf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -29,7 +29,8 @@ import java.io.Serializable; @Table(name = "MES_PROD_ROUTE_OPT_PARAM", indexes = { @Index(columnList = "ROUTE_CODE"), @Index(columnList = "PROCESS_CODE"), - @Index(columnList = "STEP_CODE") + @Index(columnList = "STEP_CODE"), + @Index(columnList = "PROD_ROUTE_CFG_ID") }) @Api("产品流程配置操作参数表") public class MesProdRouteOptParam extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index 116e8ba..f9eb211 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -26,7 +26,10 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_ROUTE") +@Table(name = "MES_ROUTE", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ROUTE_TYPE") +}) @Api("流程表") public class MesRoute extends BaseBean implements Serializable { private static final long serialVersionUID = -3616935751787295145L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java index 201b6d7..50aa1d3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcess.java @@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -28,7 +26,10 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_ROUTE_PROCESS") +@Table(name = "MES_ROUTE_PROCESS", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ROUTE_CODE, PROCESS_CODE") +}) @Api("流程工序关系") public class MesRouteProcess extends BaseBean implements Serializable { private static final long serialVersionUID = -1248219638779313299L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java index 809725a..66b9aed 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessCell.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,7 +26,12 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_ROUTE_PROCESS_CELL") +@Table(name = "MES_ROUTE_PROCESS_CELL", indexes = { + @Index(columnList = "ROUTE_CODE"), + @Index(columnList = "ROUTE_CODE, WORK_CELL_CODE"), + @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE"), + @Index(columnList = "ROUTE_CODE, WORK_CENTER_CODE, WORK_CELL_CODE") +}) @Api("工序工作单元对照") public class MesRouteProcessCell extends BaseBean implements Serializable { private static final long serialVersionUID = 4823057491756814599L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index b83f6cd..2195459 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -5,17 +5,15 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; import org.springframework.data.annotation.Transient; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -31,7 +29,10 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_SHIFT") +@Table(name = "MES_SHIFT", indexes = { + @Index(columnList = "SHIFT_CODE"), + @Index(columnList = "AREA_CODE, WORK_CENTER_CODE, SHIFT_CODE") +}) @Api("班次信息") public class MesShift extends BaseBean implements Serializable { private static final long serialVersionUID = 4001070186534674096L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java index 6362acd..f2ca1c1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachine.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; import java.io.Serializable; /** @@ -27,7 +24,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_STATE_MACHINE") +@Table(name = "MES_STATE_MACHINE", indexes = { + @Index(columnList = "SM_CODE") +}) @Api("MES状态机") public class MesStateMachine extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java index b3600b0..5c49a5b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStatus.java @@ -22,7 +22,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_STATE_MACHINE_STATUS") +@Table(name = "MES_STATE_MACHINE_STATUS", indexes = { + @Index(columnList = "SM_CODE") +}) @Api("MES状态机步骤") public class MesStateMachineStatus extends BaseBean implements Serializable { private static final long serialVersionUID = 6093522587973076640L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java index 613a5bd..7437b6a 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStateMachineStep.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Index; import javax.persistence.Table; import java.io.Serializable; @@ -25,7 +26,9 @@ import java.io.Serializable; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name = "MES_STATE_MACHINE_STEP") +@Table(name = "MES_STATE_MACHINE_STEP", indexes = { + @Index(columnList = "SM_CODE") +}) @Api("状态机工步参数配置表") public class MesStateMachineStep extends BaseBean implements Serializable { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java index 87ca767..ba596b6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStep.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; /** @@ -29,7 +26,9 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_STEP") +@Table(name = "MES_STEP", indexes = { + @Index(columnList = "STEP_CODE") +}) @Api("工步") public class MesStep extends BaseBean implements Serializable { private static final long serialVersionUID = -1106608189453496947L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java index cf5da7a..0e1221f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepGroup.java @@ -4,15 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; import java.io.Serializable; /** @@ -26,7 +24,11 @@ import java.io.Serializable; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_STEP_GROUP") +@Table(name = "MES_STEP_GROUP", indexes = { + @Index(columnList = "STEP_CODE"), + @Index(columnList = "AMG_ID"), + @Index(columnList = "STEP_CODE, AMG_ID") +}) @Api("工步集") public class MesStepGroup extends BaseBean implements Serializable { private static final long serialVersionUID = 1876053661752102998L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index c9409c9..d98c06e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -4,16 +4,13 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; import java.util.Map; @@ -31,7 +28,10 @@ import java.util.Map; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_STEP_PARAM") +@Table(name = "MES_STEP_PARAM", indexes = { + @Index(columnList = "STEP_CODE"), + @Index(columnList = "STEP_CODE, PARAM_CODE") +}) @Api("工步参数") public class MesStepParam extends BaseBean implements Serializable { private static final long serialVersionUID = 6709455994477993263L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java index d257687..d3df26c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCell.java @@ -6,17 +6,14 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.ColumnDefault; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -33,7 +30,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_WORK_CELL") +@Table(name = "MES_WORK_CELL", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "WORK_CENTER_CODE, WORK_CELL_CODE") +}) @Api("工作单元") public class MesWorkCell extends BaseBean implements Serializable { private static final long serialVersionUID = 8552890090536989486L; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 91703ac..7dec04e 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -6,16 +6,13 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; + +import javax.persistence.*; + import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; import java.io.Serializable; import java.util.List; @@ -32,7 +29,10 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name = "MES_WORK_CENTER") +@Table(name = "MES_WORK_CENTER", indexes = { + @Index(columnList = "WORK_CENTER_CODE"), + @Index(columnList = "AREA_CODE") +}) @Api("工作中心") public class MesWorkCenter extends BaseBean implements Serializable { private static final long serialVersionUID = 5583253625290231595L; From b1af42c78b41a4d108b7ed152bbff38cc855f967 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 19 Oct 2021 15:44:53 +0800 Subject: [PATCH 18/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9B=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index 0142e58..e5ff2f6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -29,4 +29,8 @@ public class BaseRule extends BaseAPS { @ApiParam(value ="规则编码") @FieldAnnotation(popSearch = true, mainkey = true) private String code; + + @Column(name="REMARK") + @ApiParam(value ="备注") + private String remark; } From 351e542fd9cf676a5ecb16d83765518cc264da43 Mon Sep 17 00:00:00 2001 From: gsz Date: Fri, 22 Oct 2021 11:09:00 +0800 Subject: [PATCH 19/86] =?UTF-8?q?18062=2020065-=E6=96=B0=E5=A2=9E=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E6=98=BE=E7=A4=BA=E9=A1=B6=E5=B1=82=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E7=9A=84=E8=BE=93=E5=85=A5=E5=92=8C=E8=BE=93=E5=87=BA=E6=83=85?= =?UTF-8?q?=E5=86=B5-20211019?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/model/OrderFinishStatusModel.java | 57 ++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java new file mode 100644 index 0000000..44919e9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/OrderFinishStatusModel.java @@ -0,0 +1,57 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import io.swagger.annotations.Api; +import lombok.Data; + +/** + * 顶层订单完成情况 + * + * @Description : OrderFinishStatusModel + * @Author :gsz + * @Date 2021/10/21 10:45 + * @Modify + **/ +@Data +@Api("顶层订单完成情况报表") +public class OrderFinishStatusModel extends APSPager { + //订单号 + private String topOrderNo; + //订单类型 + private String orderType; + //物料编码 + private String materialCode; + //工厂货品 + private String materialName; + //商标编码 + private String code; + //商标 + private String logo; + //皮带标识编码 + private String leatherSignId; + //皮带标识 + private String sign; + //顶层订单数量 + private Integer topOrderCount; + //库存扣减数量 + private Integer inventoryBackCount; + //生产订单数量 + private Integer productOrderCount; + //参与排程数量 + private Double inScheduleCount; + //已下发数量 + private Double confirmCount; + //已报工数量 + private Double reportCount; + //牵纱排程数量 + private Double trainbearerScheduleCount; + //覆胶排程数量 + private Double coatingScheduleCount; + //包布排程数量 + private Double wrappingScheduleCount; + //硫化排程数量 + private Double sulfidationScheduleCount; + + +} From 29acf31f7447c42f5248ab73aed3332722570bce Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 22 Oct 2021 14:37:06 +0800 Subject: [PATCH 20/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9B=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index 077e605..0223427 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java @@ -32,4 +32,5 @@ public class GanttPlanModel { private List resIds; private Boolean draggable; private Boolean furnacePlan = false; + private Boolean overPriorityRange = false; } From e97f49d8ee2813ff396f57fe04317a097042c21f Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 26 Oct 2021 09:30:47 +0800 Subject: [PATCH 21/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9B=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 7 ++----- .../main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java index a7e3134..69d804f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -46,10 +46,12 @@ public class InsertedOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @Column(name="REMARK") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 2b079df..8bdaf48 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -56,11 +56,6 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting") private String specifyRouting; - @Column(name="RECALC_COUNT") - @ApiParam(value ="是否重新计算数量") - @FieldAnnotation(defaultValue = "true") - private Boolean recalcCount; - @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; @@ -95,10 +90,12 @@ public class ProductOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @Column(name="PRODUCT_ROUTING_ID") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java index d1118a1..c16400f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -43,10 +43,12 @@ public class SafeStockOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 88c8cfe..346d1ef 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -77,12 +77,12 @@ public class SalesOrder extends BaseOrder { @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, defaultValue = "0") private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, defaultValue = "0") private Double qualifiedCount; @Column(name="SERIAL_NUMBER") From 3af6e02e528a8eb1f9c6e48b13b28778be8eb6e7 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 26 Oct 2021 13:35:34 +0800 Subject: [PATCH 22/86] =?UTF-8?q?=E5=A4=A7=E9=80=BB=E8=BE=91=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E5=89=8D=E6=8F=90=E4=BA=A4=EF=BC=9A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E7=9A=84=E8=AE=A2=E5=8D=95=E9=87=8D=E6=96=B0?= =?UTF-8?q?=E6=8E=92=E7=A8=8B=E4=B8=8D=E5=BD=B1=E5=93=8D=E4=BA=A4=E6=9C=9F?= =?UTF-8?q?=E6=97=A9=E7=9A=84=E8=AE=A2=E5=8D=95=E3=80=82?= 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, 1 insertion(+), 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 54aa79b..81bdc50 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 @@ -36,8 +36,8 @@ import java.util.List; @Table(name="APS_WORK_PLAN") @Api("工作计划") public class WorkPlan extends BaseAPS { - private static final long serialVersionUID = 5489548115780676195L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") From 462f5c9d58dfa9078f8b9c446dc6d4cdaf8fde2c Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 29 Oct 2021 13:10:10 +0800 Subject: [PATCH 23/86] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/SerialNumber.java | 4 +++ .../estsh/i3plus/pojo/aps/bean/WorkRelation.java | 14 ++++----- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 34 ++-------------------- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 3 +- 4 files changed, 16 insertions(+), 39 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java index bf0944d..0046368 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -52,6 +52,10 @@ public class SerialNumber extends BaseAPS { @ApiParam(value ="插单流水号") private Integer hNumber = 0; + @Column(name="Z_NUMBER") + @ApiParam(value ="补充订单流水号") + private Integer zNumber = 0; + @Column(name="LAST_DATE") @ApiParam(value ="最后生成日期") private Date lastDate; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 607a948..a4a9d20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -102,7 +102,7 @@ public class WorkRelation extends BaseAPS { } public void setWorkInput(WorkInput input) { - this.workInputId = input != null ? input.getId() : 0l; + this.workInputId = input != null ? input.getId() : 0L; BeanRelation.set(this, EWorkRelation.WorkInput, input); } @@ -111,7 +111,7 @@ public class WorkRelation extends BaseAPS { } public void setWorkOutput(WorkOutput output) { - this.workOutputId = output != null ? output.getId() : 0l; + this.workOutputId = output != null ? output.getId() : 0L; BeanRelation.set(this, EWorkRelation.WorkOutput, output); } @@ -120,7 +120,7 @@ public class WorkRelation extends BaseAPS { } public void setPrevWork(Work work) { - this.prevWorkId = work != null ? work.getId() : 0l; + this.prevWorkId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkRelation.PrevWork, work); } @@ -129,7 +129,7 @@ public class WorkRelation extends BaseAPS { } public void setPostWork(Work work) { - this.postWorkId = work != null ? work.getId() : 0l; + this.postWorkId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkRelation.PostWork, work); } @@ -138,7 +138,7 @@ public class WorkRelation extends BaseAPS { } public void setPrevOrder(BaseOrder order) { - this.prevOrderId = order != null ? order.getId() : 0l; + this.prevOrderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EWorkRelation.PrevOrder, order); } @@ -147,7 +147,7 @@ public class WorkRelation extends BaseAPS { } public void setPostOrder(BaseOrder order) { - this.postOrderId = order != null ? order.getId() : 0l; + this.postOrderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EWorkRelation.PostOrder, order); } @@ -156,7 +156,7 @@ public class WorkRelation extends BaseAPS { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EWorkRelation.Material, material); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 0dc81b8..2198ec8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -23,7 +23,7 @@ public class BeanRelation { } } - private static Map relations = new ConcurrentHashMap<>(); + private static final Map relations = new ConcurrentHashMap<>(); private static BeanRelation get() { Long userId = 0L; BeanRelation relation = relations.get(userId); @@ -214,8 +214,8 @@ public class BeanRelation { return result; } - private final static boolean lastListImpl(List result, BaseBean bean, BaseBean self, Predicate pred, - Enum[] holders, int index) { + private static boolean lastListImpl(List result, BaseBean bean, BaseBean self, Predicate pred, + Enum[] holders, int index) { if (index >= holders.length) { if (self == bean) { return false; @@ -270,10 +270,6 @@ public class BeanRelation { /** * 设值两个对象之间的关联 - * - * @param bean - * @param holder - * @param relaBean */ public static void set(BaseBean bean, Enum holder, BaseBean relaBean) { if (bean == null || holder == null) { @@ -309,11 +305,6 @@ public class BeanRelation { /** * 建立对象之间双向引用实现 - * - * @param bean - * @param holder - * @param relaBean - * @param reverseHolder */ private static void setImpl(BaseBean bean, Enum holder, BaseBean relaBean, Enum reverseHolder) { get(bean).get(holder).add(relaBean); @@ -324,8 +315,6 @@ public class BeanRelation { /** * 移除对象所有关系 - * - * @param bean */ public static void remove(BaseBean bean) { if (bean == null) { @@ -342,9 +331,6 @@ public class BeanRelation { /** * 移除关联 - * - * @param bean - * @param holder */ public static void remove(BaseBean bean, Enum holder) { if (bean == null || holder == null) { @@ -365,10 +351,6 @@ public class BeanRelation { /** * 移除关联的指定对象 - * - * @param bean - * @param holder - * @param relaBean */ public static void remove(BaseBean bean, Enum holder, BaseBean relaBean) { if (bean == null || holder == null) { @@ -384,7 +366,6 @@ public class BeanRelation { /** * 移除关联关系中的对象，并不会移除关联的对象的关系 - * @param bean */ public static void erase(BaseBean bean) { get().caches.get(bean.getClass()).remove(bean.getId()); @@ -392,10 +373,6 @@ public class BeanRelation { /** * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。 - * @param bean - * @param fun - * @param holders - * @param */ public static void recursion(BaseBean bean, Predicate fun, Enum... holders) { if (holders.length == 0) { @@ -406,11 +383,6 @@ public class BeanRelation { /** * 按指定路径，递归调用实现。采用广度优先搜索。 - * @param bean - * @param fun - * @param holders - * @param index - * @param */ private final static void recursionImpl(BaseBean bean, Predicate fun, Enum[] holders, int index) { 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 5d911a9..57d208b 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 @@ -1148,7 +1148,8 @@ public class ApsEnumUtil { PURCHASE_ORDER("PURCHASE_ORDER", "P", "采购订单"), INVENTORY("INVENTORY", "W", "库存订单"), SAFE_STOCK_ORDER("SAFE_STOCK_ORDER", "Q", "安全库存订单"), - INSERTED_ORDER("INSERTED_ORDER", "I", "插单"); + INSERTED_ORDER("INSERTED_ORDER", "I", "插单"), + SUPPLY_ORDER("SUPPLY_ORDER", "Z", "补充订单"); private final String value; private final String prefix; From 6effb386a3300a42476e22c22ceb585244b5ac24 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 29 Oct 2021 14:15:52 +0800 Subject: [PATCH 24/86] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/bean/AssistResourceSetTime.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 3 +- .../cn/estsh/i3plus/pojo/aps/bean/BaseRule.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/DataLink.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 1 + .../estsh/i3plus/pojo/aps/bean/ExportDetail.java | 4 +- .../estsh/i3plus/pojo/aps/bean/ExportProject.java | 2 +- .../i3plus/pojo/aps/bean/ExpressionRecord.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 2 +- .../estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 1 + .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 3 +- .../cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 2 +- .../estsh/i3plus/pojo/aps/bean/ImportProject.java | 3 +- .../estsh/i3plus/pojo/aps/bean/InsertedOrder.java | 2 +- .../i3plus/pojo/aps/bean/InterMediateDetail.java | 2 +- .../i3plus/pojo/aps/bean/InterMediateResult.java | 4 +- .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 1 + .../pojo/aps/bean/MaterialDeliveryPromise.java | 2 +- .../i3plus/pojo/aps/bean/MaterialSetTime.java | 6 +- .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 5 +- .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 5 +- .../estsh/i3plus/pojo/aps/bean/OperResource.java | 5 +- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 4 +- .../estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/OrderTree.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 5 +- .../estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 3 +- .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 3 +- .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 3 +- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 20 ++++-- .../estsh/i3plus/pojo/aps/bean/ShippingTime.java | 8 +-- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 2 +- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 8 +-- .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 6 +- .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 6 +- .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 8 +-- .../cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 1 + .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 37 +++------- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 6 +- .../i3plus/pojo/aps/common/BeanRelationUtil.java | 83 +++++++++------------- .../pojo/aps/converter/CustomDateDeserializer.java | 2 +- .../estsh/i3plus/pojo/aps/holders/EResource.java | 4 +- .../estsh/i3plus/pojo/aps/tool/APSDoubleTool.java | 3 - .../src/main/resources/relations/Resource.xml | 2 + 46 files changed, 131 insertions(+), 145 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index 1d24b39..5371a20 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("副资源设置时间") public class AssistResourceSetTime extends BaseAPS { private static final long serialVersionUID = 901172392855536686L; + @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index b22eb80..e0de8b4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -36,6 +36,7 @@ import java.util.List; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class BaseOrder extends BaseAPS { private static final long serialVersionUID = -2571085172798608026L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -121,7 +122,7 @@ public class BaseOrder extends BaseAPS { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EBaseOrder.Material, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java index e5ff2f6..f649237 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseRule.java @@ -25,6 +25,7 @@ import javax.persistence.MappedSuperclass; @ExcludeImportExport public class BaseRule extends BaseAPS { private static final long serialVersionUID = -1818853814377611968L; + @Column(name="CODE") @ApiParam(value ="规则编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 0d537d2..4b402e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("数据集成数据连接信息") public class DataLink extends BaseAPS { private static final long serialVersionUID = 8324774871058505466L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index 8d7733d..710b92c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -32,6 +32,7 @@ import javax.persistence.Table; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class DayShift extends BaseAPS { private static final long serialVersionUID = 7964370027924366093L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index 3a905d3..499e986 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -27,8 +27,8 @@ import javax.persistence.Table; @Table(name = "APS_EXPORT_DETAIL") @Api("数据导出明细") public class ExportDetail extends BaseAPS { - private static final long serialVersionUID = -8898414164032180539L; + @Column(name="OUT_NAME") @ApiParam(value ="外部表名") private String outName; @@ -62,7 +62,7 @@ public class ExportDetail extends BaseAPS { } public void setProject(ExportProject project) { - this.projectId = project != null ? project.getId() : 0l; + this.projectId = project != null ? project.getId() : 0L; BeanRelation.set(this, EExportDetail.Project, project); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index 98bc0d9..d81c7ac 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -51,7 +51,7 @@ public class ExportProject extends BaseAPS { } public void setLink(DataLink link) { - this.linkId = link != null ? link.getId() : 0l; + this.linkId = link != null ? link.getId() : 0L; BeanRelation.set(this, EExportProject.Link, link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java index 7d7c3e8..7abcf74 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExpressionRecord.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Api("表达式记录") public class ExpressionRecord extends BaseAPS { private static final long serialVersionUID = 4038954046132896632L; + @Column(name="BEAN_NAME") @ApiParam(value ="表名") private String beanName; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index d7d9033..b8daf9f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -34,6 +34,7 @@ import java.sql.JDBCType; @ExcludeImportExport public class FieldInfo extends BaseAPS { private static final long serialVersionUID = -6195036426929675850L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index 0287a35..f9b13e9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -31,8 +31,8 @@ import java.util.List; @Table(name="APS_FURNACE_PLAN") @Api("炉资源计划") public class FurnacePlan extends BaseAPS { - private static final long serialVersionUID = 6816465736285211114L; + @Column(name="CAPACITY", columnDefinition = "decimal(18,8)") @ApiParam(value ="已占用的能力") private Double capacity; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 294ec49..a529eb1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("排程运算规则") public class HeuristicRule extends BaseRule { private static final long serialVersionUID = -4856714428377308150L; + @Column(name="WORK_FILTER") @ApiParam(value ="工作筛选") private String workFilter; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index e8f1d60..0e17bda 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -35,7 +35,6 @@ import java.util.List; @Api("数据导入明细") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ImportDetail extends BaseAPS { - private static final long serialVersionUID = 1264030397500660450L; @Column(name="NAME") @@ -125,7 +124,7 @@ public class ImportDetail extends BaseAPS { } public void setProject(ImportProject project) { - this.projectId = project != null ? project.getId() : 0l; + this.projectId = project != null ? project.getId() : 0L; BeanRelation.set(this, EImportDetail.Project, project); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index cb0d6e4..c178867 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -80,7 +80,7 @@ public class ImportField extends BaseAPS { } public void setImportDetail(ImportDetail detail) { - this.importDetailId = detail != null ? detail.getId() : 0l; + this.importDetailId = detail != null ? detail.getId() : 0L; BeanRelation.set(this, EImportField.ImportDetail, detail); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 35aaf50..62dd6ab 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -29,6 +29,7 @@ import java.util.List; @Api("数据导入明细集合") public class ImportProject extends BaseAPS { private static final long serialVersionUID = -1899074765155621438L; + @Column(name="NAME") @ApiParam(value ="标识名") private String name; @@ -49,7 +50,7 @@ public class ImportProject extends BaseAPS { } public void setLink(DataLink link) { - this.linkId = link != null ? link.getId() : 0l; + this.linkId = link != null ? link.getId() : 0L; BeanRelation.set(this, EImportProject.Link, link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java index 69d804f..df30bf1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -63,7 +63,7 @@ public class InsertedOrder extends BaseOrder { } public void setProductRouting(ProductRouting routing) { - this.productRoutingId = routing != null ? routing.getId() : 0l; + this.productRoutingId = routing != null ? routing.getId() : 0L; BeanRelation.set(this, EInsertedOrder.ProductRouting, routing); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java index 2f8136f..62d1a22 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java @@ -44,7 +44,7 @@ public class InterMediateDetail extends BaseAPS { public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); } public void setResult(InterMediateResult result) { - this.resultId = result != null ? result.getId() : 0; + this.resultId = result != null ? result.getId() : 0L; BeanRelation.set(this, EInterMediateDetail.Result, result); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java index 87d59be..95a95d5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java @@ -51,14 +51,14 @@ public class InterMediateResult extends BaseAPS { } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EInterMediateResult.Work, work); } public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); } public void setResource(Resource resource) { - this.resourceId = resource != null ? resource.getId() : 0l; + this.resourceId = resource != null ? resource.getId() : 0L; BeanRelation.set(this, EInterMediateResult.Resource, resource); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index e214454..7f452ee 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -25,6 +25,7 @@ import javax.persistence.Table; @Api("物料运算规则") public class MatCalcRule extends BaseRule { private static final long serialVersionUID = 2102986260688118982L; + @Column(name="MATERIAL_FILTER") @ApiParam(value ="物料筛选") private String materialFilter; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index bb8c32d..bd9e959 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -37,6 +37,7 @@ import java.util.List; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Material extends BaseAPS { private static final long serialVersionUID = -7928225487946173108L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java index 7724a6c..0b9b1b5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java @@ -48,7 +48,7 @@ public class MaterialDeliveryPromise extends BaseBean { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EMaterialDeliveryPromise.Material, material); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index d77217c..b199355 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -26,6 +26,7 @@ import javax.persistence.Table; @Api("物料设置时间") public class MaterialSetTime extends BaseAPS { private static final long serialVersionUID = -7996431489447641539L; + @Column(name="RES_CODE") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true, mainkey = true) @@ -45,9 +46,4 @@ public class MaterialSetTime extends BaseAPS { @ApiParam(value ="设置时间") @FieldAnnotation(notEmpty = true) private String time; - -// @Column(name="PRIORITY") -// @ApiParam(value ="优先级") -// @FieldAnnotation(defaultValue = "10", mainkey = true) -// private Integer priority; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 2d389fa..47937e7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -30,6 +30,7 @@ import java.util.List; @Api("工序输入") public class OperInput extends BaseAPS { private static final long serialVersionUID = 6653235155693766804L; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @@ -75,7 +76,7 @@ public class OperInput extends BaseAPS { } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EOperInput.Operation, oper); } @@ -84,7 +85,7 @@ public class OperInput extends BaseAPS { } public void setInputMaterial(Material material) { - this.inputMaterialId = material != null ? material.getId() : 0l; + this.inputMaterialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EOperInput.InputMaterial, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index e17e69d..1ce057f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -29,6 +29,7 @@ import java.util.List; @Api("工序输出") public class OperOutput extends BaseAPS { private static final long serialVersionUID = 3185682762290147209L; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @@ -59,7 +60,7 @@ public class OperOutput extends BaseAPS { } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EOperOutput.Operation, oper); } @@ -68,7 +69,7 @@ public class OperOutput extends BaseAPS { } public void setOutputMaterial(Material material) { - this.outputMaterialId = material != null ? material.getId() : 0l; + this.outputMaterialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EOperOutput.OutputMaterial, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index e054949..f8f154b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -30,6 +30,7 @@ import java.util.List; @Api("工序资源") public class OperResource extends BaseAPS { private static final long serialVersionUID = -8683889582369342606L; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) @@ -88,7 +89,7 @@ public class OperResource extends BaseAPS { } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EOperResource.Operation, oper); } @@ -97,7 +98,7 @@ public class OperResource extends BaseAPS { } public void setResource(Resource res) { - this.resourceId = res != null ? res.getId() : 0l; + this.resourceId = res != null ? res.getId() : 0L; BeanRelation.set(this, EOperResource.Resource, res); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 5ead088..9697136 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -96,7 +96,7 @@ public class Operation extends BaseAPS { } public void setProductRouting(ProductRouting routing) { - this.productRoutingId = routing != null ? routing.getId() : 0l; + this.productRoutingId = routing != null ? routing.getId() : 0L; BeanRelation.set(this, EOperation.ProductRouting, routing); } @@ -120,7 +120,7 @@ public class Operation extends BaseAPS { } public void setStandOperation(StandOperation std) { - this.standOperationId = std != null ? std.getId() : 0l; + this.standOperationId = std != null ? std.getId() : 0L; BeanRelation.set(this, EOperation.StandOperation, std); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index b4cdff2..c42834e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -69,7 +69,7 @@ public class OrderFeedback extends BaseAPS { } public void setOrder(BaseOrder order) { - this.orderId = order != null ? order.getId() : 0l; + this.orderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EOrderFeedback.Order, order); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java index b5dad6b..c93dc74 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderTree.java @@ -25,6 +25,7 @@ import java.util.Date; @ExcludeImportExport public class OrderTree extends BaseAPS { private static final long serialVersionUID = -7505923374791695738L; + @ApiParam(value ="物料编码") private String material; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index e5ade8e..36954ae 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -33,6 +33,7 @@ import java.util.List; @ExcludeImportExport public class ParentWork extends BaseAPS { private static final long serialVersionUID = 8792781216193806606L; + @Column(name="count", columnDefinition = "decimal(18,8)") @ApiParam(value ="数量") private Double count; @@ -57,7 +58,7 @@ public class ParentWork extends BaseAPS { } public void setProductOrder(ProductOrder order) { - this.productOrderId = order != null ? order.getId() : 0l; + this.productOrderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EParentWork.ProductOrder, order); } @@ -66,7 +67,7 @@ public class ParentWork extends BaseAPS { } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EParentWork.Operation, oper); } 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 5ed25cd..8d8922d 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 @@ -27,7 +27,6 @@ import javax.persistence.Table; @Table(name = "APS_PLAN_FEEDBACK") @Api("工作反馈") public class PlanFeedback extends BaseAPS { - private static final long serialVersionUID = 2520555825093741381L; @Column(name="WORK_ID") @@ -52,7 +51,7 @@ public class PlanFeedback extends BaseAPS { } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EPlanFeedback.Work, work); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 8bdaf48..ce9fff2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -31,6 +31,7 @@ import java.util.List; @Api("生产订单") public class ProductOrder extends BaseOrder { private static final long serialVersionUID = 6900226668783662736L; + @Column(name="EST") @ApiParam(value ="最早开始时间") private Date est; @@ -113,7 +114,7 @@ public class ProductOrder extends BaseOrder { } public void setProductRouting(ProductRouting routing) { - this.productRoutingId = routing != null ? routing.getId() : 0l; + this.productRoutingId = routing != null ? routing.getId() : 0L; BeanRelation.set(this, EProductOrder.ProductRouting, routing); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index a109c6a..dae30aa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -34,6 +34,7 @@ import java.util.List; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class ProductRouting extends BaseAPS { private static final long serialVersionUID = 4905294866468216722L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -67,7 +68,7 @@ public class ProductRouting extends BaseAPS { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EProductRouting.Material, material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 63692bd..724f347 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -99,18 +99,28 @@ public class Resource extends BaseAPS { @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer EfficiencyEffect; - @ApiParam(value ="是否存在任务冲突") - @FieldAnnotation(property = false) - @Transient - private boolean hasConflict; + @Column(name="BIND_RESOURCE_ID") + @ApiParam(value ="绑定资源") + @FieldAnnotation(relation = "Order", modify = false) + private Long bindResourceId; public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); } public void setWorkShop(WorkShop workShop) { - this.workShopId = workShop != null ? workShop.getId() : 0l; + this.workShopId = workShop != null ? workShop.getId() : 0L; BeanRelation.set(this, EResource.WorkShop, workShop); } @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); } + + public Resource getBindResource() { return BeanRelation.get(this, EResource.BindResource); } + + public void setResource(Resource bindResource) { + this.bindResourceId = bindResource != null ? bindResource.getId() : 0L; + BeanRelation.set(this, EResource.BindResource, bindResource); + } + + @JsonBackReference + public List getSubBindResources() { return BeanRelation.list(this, EResource.SubBindResources); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index bc0ec95..129ab70 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -61,28 +61,28 @@ public class ShippingTime extends BaseAPS { public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } public void setPrevRes(Resource res) { - this.prevResId = res != null ? res.getId() : 0l; + this.prevResId = res != null ? res.getId() : 0L; BeanRelation.set(this, EShippingTime.PrevRes, res); } public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); } public void setPostRes(Resource res) { - this.postResId = res != null ? res.getId() : 0l; + this.postResId = res != null ? res.getId() : 0L; BeanRelation.set(this, EShippingTime.PostRes, res); } public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);} public void setPrevStand(StandOperation stand) { - this.prevStandId = stand != null ? stand.getId() : 0l; + this.prevStandId = stand != null ? stand.getId() : 0L; BeanRelation.set(this, EShippingTime.PrevStand, stand); } public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); } public void setPostStand(StandOperation stand) { - this.postStandId = stand != null ? stand.getId() : 0l; + this.postStandId = stand != null ? stand.getId() : 0L; BeanRelation.set(this, EShippingTime.PostStand, stand); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index c8d64bc..37c68b5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -96,7 +96,7 @@ public class StandOperation extends BaseAPS { public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); } public void setWorkShop(WorkShop workShop) { - this.workShopId = workShop != null ? workShop.getId() : 0l; + this.workShopId = workShop != null ? workShop.getId() : 0L; BeanRelation.set(this, EStandOperation.WorkShop, workShop); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 7aa6f20..5a61846 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -194,7 +194,7 @@ public class Work extends BaseAPS { } public void setOrder(BaseOrder order) { - this.orderId = order != null ? order.getId() : 0l; + this.orderId = order != null ? order.getId() : 0L; BeanRelation.set(this, EWork.Order, order); } @@ -203,7 +203,7 @@ public class Work extends BaseAPS { } public void setOperation(Operation oper) { - this.operationId = oper != null ? oper.getId() : 0l; + this.operationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EWork.Operation, oper); } @@ -212,7 +212,7 @@ public class Work extends BaseAPS { } public void setOriginOperation(Operation oper) { - this.originOperationId = oper != null ? oper.getId() : 0l; + this.originOperationId = oper != null ? oper.getId() : 0L; BeanRelation.set(this, EWork.OriginOperation, oper); } @@ -221,7 +221,7 @@ public class Work extends BaseAPS { } public void setParentWork(ParentWork parentWork) { - this.parentWorkId = parentWork != null ? parentWork.getId() : 0l; + this.parentWorkId = parentWork != null ? parentWork.getId() : 0L; BeanRelation.set(this, EWork.ParentWork, parentWork); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 4390af5..045862a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -65,7 +65,7 @@ public class WorkInput extends BaseAPS { } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkInput.Work, work); } @@ -79,7 +79,7 @@ public class WorkInput extends BaseAPS { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EWorkInput.Material, material); } @@ -88,7 +88,7 @@ public class WorkInput extends BaseAPS { } public void setOperInput(OperInput input) { - this.operInputId = input != null ? input.getId() : 0l; + this.operInputId = input != null ? input.getId() : 0L; BeanRelation.set(this, EWorkInput.OperInput, input); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 7f04aba..7a2fade 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -67,7 +67,7 @@ public class WorkOutput extends BaseAPS { } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkOutput.Work, work); } @@ -81,7 +81,7 @@ public class WorkOutput extends BaseAPS { } public void setMaterial(Material material) { - this.materialId = material != null ? material.getId() : 0l; + this.materialId = material != null ? material.getId() : 0L; BeanRelation.set(this, EWorkOutput.Material, material); } @@ -90,7 +90,7 @@ public class WorkOutput extends BaseAPS { } public void setOperOutput(OperOutput output) { - this.operOutputId = output != null ? output.getId() : 0l; + this.operOutputId = output != null ? output.getId() : 0L; BeanRelation.set(this, EWorkOutput.OperOutput, output); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 7c845e8..c324886 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -102,14 +102,14 @@ public class WorkResource extends BaseAPS { @Column(name="RES_CAPACITY_ID") @ApiParam(value ="设备能力id") @FieldAnnotation(property = false) - private Long resCapacityId = 0l; + private Long resCapacityId = 0L; public Work getWork() { return BeanRelation.get(this, EWorkResource.Work); } public void setWork(Work work) { - this.workId = work != null ? work.getId() : 0l; + this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EWorkResource.Work, work); } @@ -118,7 +118,7 @@ public class WorkResource extends BaseAPS { } public void setResource(Resource res) { - this.resourceId = res != null ? res.getId() : 0l; + this.resourceId = res != null ? res.getId() : 0L; BeanRelation.set(this, EWorkResource.Resource, res); } @@ -127,7 +127,7 @@ public class WorkResource extends BaseAPS { } public void setOperResource(OperResource res) { - this.operResourceId = res != null ? res.getId() : 0l; + this.operResourceId = res != null ? res.getId() : 0L; BeanRelation.set(this, EWorkResource.OperResource, res); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index fef2680..2d26e1d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -26,6 +26,7 @@ import java.util.HashMap; @ExcludeImportExport public abstract class BaseAPS extends BaseBean { private static final long serialVersionUID = -8638842158403944318L; + @JsonIgnore @Lob @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index cad44d4..3626a73 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -17,10 +17,10 @@ import java.util.function.Consumer; * @Modify: **/ public class BeanInfo { - private Class cls; + private final Class cls; private BeanInfo superBeanInfo; - private List childsBeanInfos = new ArrayList<>(); - private Map, RelationInfo> relations = new HashMap<>(); + private final List childsBeanInfos = new ArrayList<>(); + private final Map, RelationInfo> relations = new HashMap<>(); public BeanInfo(Class cls) { this.cls = cls; @@ -97,14 +97,6 @@ public class BeanInfo { return (Class)cls; } - public BeanInfo getRelationBeanInfo(Enum holder) { - RelationInfo relaInfo = getRelationInfo(holder); - if (relaInfo != null) { - return relaInfo.getBeanInfo(); - } - return null; - } - public BeanInfo getRelationBeanInfo(String name) { RelationInfo relaInfo = getRelationInfo(name); if (relaInfo != null) { @@ -130,15 +122,6 @@ public class BeanInfo { return RELATION_TYPE.INVALID; } - public RELATION_TYPE getRelationType(String name) { - RelationInfo relaInfo = getRelationInfo(name); - if (relaInfo != null) { - return relaInfo.getType(); - } - - return RELATION_TYPE.INVALID; - } - private void foreach(Consumer fun) { for (Map.Entry, RelationInfo> entry : relations.entrySet()) { fun.accept(entry.getValue()); @@ -150,9 +133,7 @@ public class BeanInfo { public List> getAllHolders() { List> holders = new ArrayList<>(); - foreach((RelationInfo info)->{ - holders.add(info.getHolder()); - }); + foreach((RelationInfo info)-> holders.add(info.getHolder())); return holders; } @@ -176,8 +157,8 @@ public class BeanInfo { return holders; } - private static Map, BeanInfo> beanInfos = new HashMap<>(); - private static Map nameMapBeanInfos = new HashMap<>(); + private static final Map, BeanInfo> beanInfos = new HashMap<>(); + private static final Map nameMapBeanInfos = new HashMap<>(); private static IMainKeyValidatorImpl mainKeyValidator; static { @@ -220,13 +201,11 @@ public class BeanInfo { } public static BeanInfo getBeanInfo(Class cls) { - BeanInfo info = beanInfos.get(cls); - return info; + return beanInfos.get(cls); } public static BeanInfo getBeanInfo(String name) { - BeanInfo info = nameMapBeanInfos.get(name); - return info; + return nameMapBeanInfos.get(name); } public static Class getSuperClass(Class cls) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 2198ec8..63ad8a3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -384,8 +384,8 @@ public class BeanRelation { /** * 按指定路径，递归调用实现。采用广度优先搜索。 */ - private final static void recursionImpl(BaseBean bean, Predicate fun, - Enum[] holders, int index) { + private static void recursionImpl(BaseBean bean, Predicate fun, + Enum[] holders, int index) { if (index >= holders.length) { if (!fun.test((T) bean)) { return; @@ -395,7 +395,7 @@ public class BeanRelation { List relaBeans = list(bean, holders[index]); for (BaseBean relaBean : relaBeans) { - if (relaBean.getId() != bean.getId()) { + if (!relaBean.getId().equals(bean.getId())) { recursionImpl(relaBean, fun, holders, index + 1); } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java index 49e3a5f..5d2e8c0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java @@ -9,7 +9,6 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import java.io.File; -import java.io.FileFilter; import java.io.IOException; import java.io.InputStream; import java.net.JarURLConnection; @@ -24,11 +23,7 @@ public class BeanRelationUtil { static class XMLReader extends DefaultHandler { private BeanInfo firstInfo = null; - private Enum firstHolder = null; - private BeanInfo secondInfo = null; - private Enum secondHolder = null; - private RELATION_TYPE type = RELATION_TYPE.INVALID; - private boolean owner = false; + public void startElement(String uri, String localName, String nodeName, Attributes attributes) throws SAXException { if (nodeName.equalsIgnoreCase("Class")) { final String name = attributes.getValue("name"); @@ -49,8 +44,8 @@ public class BeanRelationUtil { if (firstSignName == null) { throw new SAXException("Relation节点缺少field属性"); } - this.firstHolder = this.firstInfo.getHolder(firstSignName); - if (this.firstHolder == null) { + Enum firstHolder = this.firstInfo.getHolder(firstSignName); + if (firstHolder == null) { throw new SAXException("未定义枚举标识" + firstSignName); } @@ -58,46 +53,44 @@ public class BeanRelationUtil { if (secondFactoryName == null) { throw new SAXException("Relation节点缺少name属性"); } - this.secondInfo = BeanInfo.getBeanInfo(secondFactoryName); - if (this.secondInfo == null) { + BeanInfo secondInfo = BeanInfo.getBeanInfo(secondFactoryName); + if (secondInfo == null) { throw new SAXException("未找到" + secondFactoryName + "的类定义"); } String secondSignName = attributes.getValue("reverse"); + Enum secondHolder = null; if (secondSignName != null) { - this.secondHolder = this.secondInfo.getHolder(secondSignName); - if (this.secondHolder == null) { + secondHolder = secondInfo.getHolder(secondSignName); + if (secondHolder == null) { throw new SAXException(secondFactoryName + "类未定义枚举标识" + secondSignName); } - } else { - this.secondHolder = null; } String typeName = attributes.getValue("type"); if (typeName == null) { throw new SAXException("Relation节点缺少type属性"); } - this.type = RELATION_TYPE.valueOf(typeName); + RELATION_TYPE type = RELATION_TYPE.valueOf(typeName); String ownerName = attributes.getValue("owner"); - if (ownerName == null) { - this.owner = false; - } else { - this.owner = ownerName.equalsIgnoreCase("true") ? true : false; + boolean owner = false; + if (ownerName != null) { + owner = ownerName.equalsIgnoreCase("true"); } - RelationInfo firstData = this.getSignData(firstInfo, this.firstHolder); - firstData.setBeanInfo(this.secondInfo); - firstData.setType(this.type); - firstData.setOwner(this.owner); - firstData.setReverseHolder(this.secondHolder); + RelationInfo firstData = this.getSignData(firstInfo, firstHolder); + firstData.setBeanInfo(secondInfo); + firstData.setType(type); + firstData.setOwner(owner); + firstData.setReverseHolder(secondHolder); - if (this.secondHolder != null) { - RelationInfo secondData = this.getSignData(secondInfo, this.secondHolder); + if (secondHolder != null) { + RelationInfo secondData = this.getSignData(secondInfo, secondHolder); secondData.setBeanInfo(this.firstInfo); secondData.setOwner(false); - secondData.setReverseHolder(this.firstHolder); - switch (this.type) { + secondData.setReverseHolder(firstHolder); + switch (type) { case MULTI_TO_MULTI: secondData.setType(RELATION_TYPE.MULTI_TO_MULTI); break; @@ -165,8 +158,7 @@ public class BeanRelationUtil { } } } - } catch (IOException e) { - return; + } catch (IOException ignored) { } } @@ -176,13 +168,10 @@ public class BeanRelationUtil { return; } - File[] dirFiles = dir.listFiles(new FileFilter() { - - @Override - public boolean accept(File file) { - return file.isDirectory() || file.getName().endsWith(".xml"); - } - }); + File[] dirFiles = dir.listFiles(file -> file.isDirectory() || file.getName().endsWith(".xml")); + if (dirFiles == null) { + return; + } for (File file : dirFiles) { if (file.isDirectory()) { @@ -190,7 +179,7 @@ public class BeanRelationUtil { } else { try { loadXMLConfigure(file.getCanonicalPath()); - } catch (IOException e) { + } catch (IOException ignored) { } } } @@ -215,33 +204,30 @@ public class BeanRelationUtil { /** * 加载本地开发环境中的xml配置文件。 - * @param xmlPath */ private static void loadXMLConfigure(String xmlPath) { SAXParserFactory sf = SAXParserFactory.newInstance(); try { SAXParser sp = sf.newSAXParser(); sp.parse(new InputSource(xmlPath), new XMLReader()); - } catch (ParserConfigurationException | SAXException | IOException e) { + } catch (ParserConfigurationException | SAXException | IOException ignored) { } } /** * 加载jar中的xml配置文件。 - * @param is */ private static void loadXMLConfigure(InputStream is) { SAXParserFactory sf = SAXParserFactory.newInstance(); try { SAXParser sp = sf.newSAXParser(); sp.parse(new InputSource(is), new XMLReader()); - } catch (ParserConfigurationException | SAXException | IOException e) { + } catch (ParserConfigurationException | SAXException | IOException ignored) { } } /** * 将指定包下的类加载到内存中 - * @param packName */ public static List> loadClass(String packName) { List> clses = new ArrayList<>(); @@ -274,13 +260,10 @@ public class BeanRelationUtil { return; } - File[] dirFiles = dir.listFiles(new FileFilter() { - - @Override - public boolean accept(File file) { - return file.isDirectory() || file.getName().endsWith(".class"); - } - }); + File[] dirFiles = dir.listFiles(file -> file.isDirectory() || file.getName().endsWith(".class")); + if (dirFiles == null) { + return; + } for (File file : dirFiles) { if (file.isDirectory()) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java index 027f459..74eb03f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java @@ -20,7 +20,7 @@ public class CustomDateDeserializer extends JsonDeserializer { if (!StringUtils.isEmpty(text)) { try { return DATETIME_FORMATOR.parse(text); - } catch (ParseException e) { + } catch (ParseException ignored) { } } return null; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index b03a61e..70d4432 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -9,5 +9,7 @@ package cn.estsh.i3plus.pojo.aps.holders; **/ public enum EResource { WorkShop, - WorkPlans + WorkPlans, + BindResource, + SubBindResources, } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java index 22a9add..9f3a4e6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java @@ -7,9 +7,6 @@ public class APSDoubleTool { /** * 按指定精度向上取整 - * @param value - * @param pric - * @return */ public static double ceilPric(double value, int pric) { final double digits = Math.pow(10.0, pric); diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml index 889e6c8..285dc24 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml @@ -4,4 +4,6 @@ + + \ No newline at end of file From da300c7ccb2cadcc197bc669ecf2a1ede921add8 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 29 Oct 2021 14:31:25 +0800 Subject: [PATCH 25/86] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=8A=9F=E8=83=BD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 724f347..6d31c89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -116,7 +116,7 @@ public class Resource extends BaseAPS { public Resource getBindResource() { return BeanRelation.get(this, EResource.BindResource); } - public void setResource(Resource bindResource) { + public void setBindResource(Resource bindResource) { this.bindResourceId = bindResource != null ? bindResource.getId() : 0L; BeanRelation.set(this, EResource.BindResource, bindResource); } From 5a73e89e97ffaf91dd9514b68d49c6d98bf97a58 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 5 Nov 2021 09:34:40 +0800 Subject: [PATCH 26/86] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 6 +++++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 0e17bda..2a5a224 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -116,6 +116,10 @@ public class ImportDetail extends BaseAPS { @ApiParam(value ="外部对象筛选") private String outterFilter; + @Column(name="UPDATE_SQL") + @ApiParam(value ="更新外部数据") + private String updateSQL; + @FieldAnnotation(property = false) private transient ImportDataModel model; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index c178867..6b5b511 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -49,6 +49,10 @@ public class ImportField extends BaseAPS { @ApiParam(value = "是否必填", example = "0") private Integer isRequire; + @Column(name="IGNORE_NOT_VALID") + @ApiParam(value = "无效忽略", example = "0") + private Boolean ignoreNotValid; + @Column(name="MAX_LENGTH") @ApiParam(value = "最大长度", example = "0") @FieldAnnotation(defaultValue = "255") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index c42834e..db66293 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -31,7 +31,7 @@ public class OrderFeedback extends BaseAPS { @Column(name="ORDER_ID") @ApiParam(value ="顶层订单号") - @FieldAnnotation(relation = "Order", modify = false) + @FieldAnnotation(mainkey = true, relation = "Order") private Long orderId; @Column(name="ORDER_COUNT") 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 8d8922d..1aedf34 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 @@ -1,9 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -26,12 +29,13 @@ import javax.persistence.Table; @Entity @Table(name = "APS_PLAN_FEEDBACK") @Api("工作反馈") +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class PlanFeedback extends BaseAPS { private static final long serialVersionUID = 2520555825093741381L; @Column(name="WORK_ID") @ApiParam(value ="工作") - @FieldAnnotation(property = false) + @FieldAnnotation(popSearch = true, mainkey = true, relation = "Work") private Long workId; @Column(name="STATUS") 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 81bdc50..97395f8 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 @@ -136,6 +136,9 @@ public class WorkPlan extends BaseAPS { @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse") private Date resProduceEnd; + @ApiParam(value ="调整时间") + private Date adjustDate; + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { From 365c9e927e6fb10dc829d33cffe85a18cae11a9e Mon Sep 17 00:00:00 2001 From: gsz Date: Fri, 5 Nov 2021 13:58:53 +0800 Subject: [PATCH 27/86] =?UTF-8?q?17789=2020065-=E6=8E=92=E7=A8=8B=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E7=9A=84=E9=94=99=E8=AF=AF=E9=9C=80=E8=A6=81=E5=9C=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8A=E8=BF=9B=E8=A1=8C=E6=8F=90=E7=A4=BA?= =?UTF-8?q?-20211009?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java index f40114a..3e9821b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/RuleDetailModel.java @@ -35,6 +35,9 @@ public class RuleDetailModel { @ApiParam(value ="异常消息") private String exception = ""; + @ApiParam(value ="错误信息") + private ImportErrorInfo errorInfo; + public void addProcess() { this.curProcess += 1; } From c8ce17363ba67938ab637dddeb6551b5b138df41 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 10 Nov 2021 20:44:42 +0800 Subject: [PATCH 28/86] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 2 -- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index 6b5b511..7bcc351 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -58,6 +58,10 @@ public class ImportField extends BaseAPS { @FieldAnnotation(defaultValue = "255") private Integer maxLength; + @Column(name="ADD_VALUE") + @ApiParam(value = "累加数值", example = "0") + private Boolean addValue; + @Column(name="VALIDATOR") @ApiParam("校验表达式") private String validator; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index db66293..32fa28f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -56,12 +56,10 @@ public class OrderFeedback extends BaseAPS { @Column(name="ADD_UNQUALIFIED_COUNT") @ApiParam(value ="累加不良数量") - @FieldAnnotation(display = false) private Double addUnqualifiedCount; @Column(name="ADD_QUALIFIED_COUNT") @ApiParam(value ="累加合格数量") - @FieldAnnotation(display = false) private Double addQualifiedCount; public BaseOrder getOrder() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 9892f7c..7da5a30 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -73,4 +73,8 @@ public class SysParam extends BaseAPS { @Column(name="MAX_SPACE_LIMIT_DRAG") @ApiParam(value ="间隔时间限制") private Boolean maxSpaceLimitDrag = true; + + @Column(name="DEFAULT_FEEDBACK") + @ApiParam(value ="自动提交前三道") + private Boolean defaultFeedback = true; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 2d26e1d..de346ba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -33,7 +33,7 @@ public abstract class BaseAPS extends BaseBean { private HashMap customFields = new HashMap<>(); @ApiParam(value ="主键值") - @FieldAnnotation(display = false, modify = false) + @FieldAnnotation(display = false) @Transient private String key; From 0c6803eb864564ea561e10aca8a730c845b361eb Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Tue, 16 Nov 2021 09:49:26 +0800 Subject: [PATCH 29/86] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=8E=8B=E5=AE=9D?= =?UTF-8?q?=E7=8E=89=E5=90=88=E5=B9=B6=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index c96e9a2..ab61c0d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -8,15 +8,11 @@ import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; /** * @Description : 物料子检测项 @@ -82,4 +78,8 @@ public class WmsPartItemCheck extends BaseBean { @ApiParam("最小值") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double min; + + @Column(name = "INPUT_METHOD") + @ApiParam("录入方式") + private Integer inputMethod; } From cf0e1825a342ae12ecde52f9bf28bb0316403aa5 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Tue, 16 Nov 2021 09:50:57 +0800 Subject: [PATCH 30/86] =?UTF-8?q?=E5=90=88=E5=B9=B6jimmy=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 7 +++++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 2 ++ 2 files changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index 1552eba..367b73a7 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -1,7 +1,9 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.annotation.DynamicField; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -124,6 +126,11 @@ public class WmsCSOrderDetails extends BaseBean { @ApiParam("收货批次") public String lotNo = ""; + @Column(name = "package_no") + @ApiParam(value = "包装编号") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) + private String packageNo; + @Transient @ApiParam(value = "实盘数量", example = "1") @AnnoOutputColumn(hidden = true) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 1a810a4..a391528 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -1481,6 +1481,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringLikeEqualPack(wmsCSOrderDetails.getPackageNo(), "packageNo", result); DdlPreparedPack.getNumEqualPack(wmsCSOrderDetails.getTransStatus(), "transStatus", result); DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result); @@ -1507,6 +1508,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result); DdlPreparedPack.getInPackArray(wmsCSFactTrans.getZoneNos(), "zoneNo", result); DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result); + DdlPreparedPack.getStringLikeEqualPack(wmsCSFactTrans.getPackageNo(), "packageNo", result); getStringBuilderPack(wmsCSFactTrans, result); From 6ba8a2f3bb50ab32686660d0c7f155d697ab1e3e Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Tue, 16 Nov 2021 16:44:36 +0800 Subject: [PATCH 31/86] =?UTF-8?q?MES=5F=E5=AE=A2=E6=88=B7JIT=E9=98=9F?= =?UTF-8?q?=E5=88=97=E4=B8=8B=E8=BE=BE=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java index 2cee1b9..42491af 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java @@ -4,16 +4,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.io.Serializable; /** @@ -38,6 +33,10 @@ public class MesJitIssueCfg extends BaseBean implements Serializable { @ApiParam("客户工厂代码") private String custPlantCode; + @Column(name = "PROD_CFG_TYPE_CODE") + @ApiParam("项目代码") + private String prodCfgTypeCode; + @Column(name = "QTY") @ApiParam("配置数量") private Integer qty; From 0cf4d5742d446e1eda7fd32484c451789505f55f Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 20 Nov 2021 16:59:12 +0800 Subject: [PATCH 32/86] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 28 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index 36954ae..87689a5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EParentWork; +import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -43,6 +44,11 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Integer serialNumber = 0; + @Column(name="NEW_SERIAL") + @ApiParam(value ="拆分工作流水号") + @FieldAnnotation(property = false) + private Boolean newSerial = false; + @Column(name="PRODUCT_ORDER_ID") @ApiParam(value ="订单") @FieldAnnotation(property = false) @@ -53,6 +59,28 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; + public int getCodeNumber() { + for (int bitIndex = 0; bitIndex < 10; ++bitIndex) { + int value = 1 << bitIndex; + if ((this.serialNumber & value) == 0) { + this.serialNumber |= value; + newSerial = true; + return bitIndex; + } + } + + return 0; + } + + public void recoverNumber(int value) { + if (newSerial == null || !newSerial) { + return; + } + + value = ~(1 << value); + this.serialNumber &= value; + } + public BaseOrder getProductOrder() { return BeanRelation.get(this, EParentWork.ProductOrder); } 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 57d208b..ace9378 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 @@ -1179,14 +1179,15 @@ public class ApsEnumUtil { public enum SANLUX_OPERATION_TYPE { NORMAL("NORMAL", "正常工序"), FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"), - FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"), + FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间自动牵纱"), FOUR_COATING("FOUR_COATING", "四车间覆胶"), FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"), TWO_SULFIDATION("TWO_SULFIDATION", "二车间硫化"), TWO_MOLDING("TWO_MOLDING", "二车间成型"), TWO_COATING("TWO_COATING", "二车间覆胶"), TWO_WRAPPING("TWO_WRAPPING", "二车间包布"), - TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"); + TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"), + FOUR_MANUF_TRAINBEARER("FOUR_MANUF_TRAINBEARER", "四车间手动牵纱"); private final String value; private final String description; From 64e48bf3508ef9debfd83d75b753f9dc21b45dc1 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Tue, 23 Nov 2021 14:35:31 +0800 Subject: [PATCH 33/86] =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/model/PromptModel.java | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PromptModel.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PromptModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PromptModel.java new file mode 100644 index 0000000..4505546 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PromptModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.List; + +/** + * @Description :资源甘特图警告提示 + * @Reference : + * @Author : pantianhu + * @CreateDate : 2021-11-22 15:51 + * @Modify: + **/ +@Data +@Api("资源甘特图警告提示") +public class PromptModel { + + @ApiParam(value ="同工序跨设备提示") + private List promptMessage; +} + From f74038f88cba9ab380aa7bc208850571c9760e6f Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 24 Nov 2021 15:48:54 +0800 Subject: [PATCH 34/86] =?UTF-8?q?=E5=BC=BA=E6=8F=92=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=89=8D=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 114 +++++++++++++++++---- 1 file changed, 92 insertions(+), 22 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index 87689a5..5ce6ed6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -5,7 +5,6 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EParentWork; -import cn.estsh.i3plus.pojo.aps.tool.APSDoubleTool; import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -44,6 +43,11 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Integer serialNumber = 0; + @Column(name="POST_SERIAL_NUMBER") + @ApiParam(value ="子工作流水号") + @FieldAnnotation(property = false) + private Integer postSerialNumber = 0; + @Column(name="NEW_SERIAL") @ApiParam(value ="拆分工作流水号") @FieldAnnotation(property = false) @@ -59,27 +63,27 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; - public int getCodeNumber() { - for (int bitIndex = 0; bitIndex < 10; ++bitIndex) { - int value = 1 << bitIndex; - if ((this.serialNumber & value) == 0) { - this.serialNumber |= value; - newSerial = true; - return bitIndex; - } - } - - return 0; - } - - public void recoverNumber(int value) { - if (newSerial == null || !newSerial) { - return; - } - - value = ~(1 << value); - this.serialNumber &= value; - } +// public int getCodeNumber() { +// for (int bitIndex = 0; bitIndex < 10; ++bitIndex) { +// int value = 1 << bitIndex; +// if ((this.serialNumber & value) == 0) { +// this.serialNumber |= value; +// newSerial = true; +// return bitIndex; +// } +// } +// +// return 0; +// } +// +// public void recoverNumber(int value) { +// if (newSerial == null || !newSerial) { +// return; +// } +// +// value = ~(1 << value); +// this.serialNumber &= value; +// } public BaseOrder getProductOrder() { return BeanRelation.get(this, EParentWork.ProductOrder); @@ -103,4 +107,70 @@ public class ParentWork extends BaseAPS { public List getWorks() { return BeanRelation.list(this, EParentWork.Works); } + + public int createNew() { + return getPrevNumber() * 10; + } + + public int createContinue(int number) { + number /= 10; + return number * 10 + getPostNumber(); + } + + private int getPrevNumber() { + for (int bitIndex = 1; bitIndex < 10; ++bitIndex) { + int value = 1 << bitIndex; + if ((this.serialNumber & value) == 0) { + this.serialNumber |= value; + this.newSerial = true; + return bitIndex ; + } + } + + return 0; + } + + private int getPostNumber() { + for (int bitIndex = 1; bitIndex < 10; ++bitIndex) { + int value = 1 << bitIndex; + if ((this.postSerialNumber & value) == 0) { + this.postSerialNumber |= value; + return bitIndex; + } + } + + return 0; + } + + public void cycleNumber(int number) { + if (newSerial == null || !newSerial) { + return; + } + + cyclePrevNumber(number); + cyclePostNumber(number); + } + + private void cyclePrevNumber(int number) { + if (number % 10 > 0) { + return; + } + + number /= 10; + number = ~(1 << number); + this.serialNumber &= number; + } + + private void cyclePostNumber(int number) { + number %= 10; + if (number == 0) { + return; + } + if (this.postSerialNumber == null) { + this.postSerialNumber = 0; + } + + number = ~(1 << number); + this.postSerialNumber &= number; + } } From d2bbca3491a74b40ee93f7eec01556c28745d204 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 30 Nov 2021 20:12:43 +0800 Subject: [PATCH 35/86] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=90=8C=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E7=89=A9=E6=96=99=E7=9B=B8=E5=90=8C=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java index 703a137..81474ff 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.model; +import com.fasterxml.jackson.annotation.JsonBackReference; import lombok.Data; import java.util.Date; @@ -17,6 +18,9 @@ public class TimeBlock implements Comparable { private Date end; private boolean onDuty = true; private String shift; + @JsonBackReference + private TimeBlock nextBlock; + private TimeBlock prevBlock; @Override public int compareTo(TimeBlock o) { From 50346624a7d6519727b5853cac326bb1ec0255d8 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 9 Dec 2021 16:32:02 +0800 Subject: [PATCH 36/86] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8C=89=E7=8F=AD?= =?UTF-8?q?=E6=AC=A1=E5=8E=8B=E7=BC=A9=E7=A1=AB=E5=8C=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java | 1 + 2 files changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 5a61846..6370965 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -38,6 +38,7 @@ import java.util.List; @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) public class Work extends BaseAPS { private static final long serialVersionUID = 6471740978550523187L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true, modify = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java index 81474ff..951b401 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/TimeBlock.java @@ -20,6 +20,7 @@ public class TimeBlock implements Comparable { private String shift; @JsonBackReference private TimeBlock nextBlock; + @JsonBackReference private TimeBlock prevBlock; @Override From a4991780312fc46814d73d54d2f87ad5c9b6afe4 Mon Sep 17 00:00:00 2001 From: "rock.yu" Date: Mon, 13 Dec 2021 10:24:08 +0800 Subject: [PATCH 37/86] add lost tag --- modules/i3plus-pojo-screen/pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index fcf61d0..acebf38 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -6,6 +6,8 @@ i3plus-pojo i3plus.pojo 1.0.0.1 + ../../pom.xml + 4.0.0 From 1ad2e71b5c90b9bd0936952ab086f677d58ada1b Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Mon, 13 Dec 2021 20:18:45 +0800 Subject: [PATCH 38/86] =?UTF-8?q?log4j2=E5=8D=87=E7=BA=A7=E7=89=88?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 29 +++++++++ .../pojo/platform/bean/DataSeparatorMessage.java | 32 +++++++++- .../pojo/platform/bean/DataSeparatorRule.java | 68 ++++++++++++++++++++++ .../repository/DataSeparatorRepository.java | 16 +++++ 4 files changed, 143 insertions(+), 2 deletions(-) create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorRule.java create mode 100644 modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/DataSeparatorRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index c5f6fd4..2bd2a28 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -1643,6 +1643,35 @@ public class ImppEnumUtil { } @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DATA_SEPARATOR_STRATEGY{ + MYSQL(10,"mysql","dataSeparatorStrategyMysql","迁移数据到mysql"); + private final int value; + private final String code; + private final String strategyName; + private final String description; + DATA_SEPARATOR_STRATEGY(int value,String code,String strategyName,String description){ + this.value = value; + this.code = code; + this.strategyName = strategyName; + this.description = description; + } + + public String getCode() { + return code; + } + + public static String codeOfStrategyName(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].strategyName; + } + } + return tmp; + } + } + + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum AUTH_LOGIN_STRATEGY { ACCOUNT(10, "Default", "defaultLoginStrategy", "账户密码登录"), E9(20, "E9", "e9LoginStrategy", "泛微单点登录策略"), diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java index fa93b3b..5744d4c 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorMessage.java @@ -18,9 +18,37 @@ public class DataSeparatorMessage implements Serializable { private static final long serialVersionUID = -1; + /** + * 需要迁移数据的 id + */ private Long id; - + /** + * 迁移数据的关联类 + */ private String refClass; - + /** + * 需要迁移到的目的地，eg: mysql,sqlServer,es等 + */ + private String destUrl; + /** + * 目标迁移位置的的账号 + */ + private String userName; + /** + * 目标迁移位置的密码 + */ + private String password; + /** + * 目标迁移的表名 + */ + private String destTableName; + /** + * 迁移的类型，是迁移到es，mysql,sqlserver等 + */ + private String classification; + /** + * 目标库名 + */ + private String databaseName; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorRule.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorRule.java new file mode 100644 index 0000000..9777350 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/DataSeparatorRule.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.platform.bean; + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/12/8 15:33 + * @Modify: + **/ +@Entity +@Data +@Table(name = "DATA_SEPARATOR_RULE") +@Api(value = "迁移数据规则") +public class DataSeparatorRule extends BaseBean { + + + @Column(name = "RULE_COLUMN") + @ApiParam(value = "迁移数据根据的列名") + private String ruleColumn; + + @Column(name = "SYS_SEPARATOR") + @ApiParam(value = "操作符，大于，等于，小于") + private String separator; + + @Column(name = "RULE") + @ApiParam(value = "具体的数字，作为迁移标准") + private String rule; + + + @Column(name = "CLASSIFICATION") + @ApiParam(value = "迁移分类，是迁移到mysql,sqlserver,ES 等做区分") + private String classification; + + @Column(name = "REF_BEAN_NAME") + @ApiParam(value = "迁移的类的名称") + private String refBeanName; + + + @Column(name = "TABLE_NAME_DEST") + @ApiParam(value = "迁移目的地的表名") + private String tableNameDest; + + @Column(name = "IP") + @ApiParam(value = "目标位置的ip") + private String ip; + + @Column(name = "USER_NAME") + @ApiParam(value = "目标库的用户名") + private String userName; + + @Column(name = "PASSWORD") + @ApiParam(value = "目标库的密码") + private String password; + + @Column(name = "DATABASE_NAME") + @ApiParam(value = "目标库名") + private String databaseName; + +} diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/DataSeparatorRepository.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/DataSeparatorRepository.java new file mode 100644 index 0000000..da12ff7 --- /dev/null +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/repository/DataSeparatorRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.platform.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.platform.bean.DataSeparatorRule; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2021/12/7 13:27 + * @Modify: + **/ +@Repository +public interface DataSeparatorRepository extends BaseRepository { +} From 29ae808f7c5358f592d8dfffe1c81166453206a1 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 14 Dec 2021 15:06:45 +0800 Subject: [PATCH 39/86] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E5=8E=8B?= =?UTF-8?q?=E7=BC=A9=E7=A1=AB=E5=8C=96=E5=A2=9E=E5=8A=A0=E5=88=B0=E6=8E=92?= =?UTF-8?q?=E7=A8=8B=E9=80=BB=E8=BE=91=E4=B8=AD=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index a529eb1..6f49931 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -54,6 +54,10 @@ public class HeuristicRule extends BaseRule { @ApiParam(value ="最大等待时间") private String waitingTime; + @Column(name="MAX_SHIFTS") + @ApiParam(value ="最大班次") + private Integer maxShifts; + @Column(name="BATCH_PERIOD") @ApiParam(value ="组炉区间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) From 2418d6d6552c7af15292dc06dbcf4b482d056407 Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 15 Dec 2021 13:53:01 +0800 Subject: [PATCH 40/86] =?UTF-8?q?=E4=BF=AE=E6=94=B9ext-dev=20pojo=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=B8=BA1.0.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 4 ++-- modules/i3plus-pojo-aps/pom.xml | 4 ++-- modules/i3plus-pojo-base/pom.xml | 4 ++-- modules/i3plus-pojo-bsp/pom.xml | 4 ++-- modules/i3plus-pojo-form/pom.xml | 4 ++-- modules/i3plus-pojo-hardswitch/pom.xml | 4 ++-- modules/i3plus-pojo-ics/pom.xml | 4 ++-- modules/i3plus-pojo-jobflow/pom.xml | 4 ++-- modules/i3plus-pojo-lac/pom.xml | 4 ++-- modules/i3plus-pojo-mdm/pom.xml | 4 ++-- modules/i3plus-pojo-mes-pcn/pom.xml | 4 ++-- modules/i3plus-pojo-mes/pom.xml | 4 ++-- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 4 ++-- modules/i3plus-pojo-ptl/pom.xml | 4 ++-- modules/i3plus-pojo-report/pom.xml | 4 ++-- modules/i3plus-pojo-softswitch/pom.xml | 4 ++-- modules/i3plus-pojo-sweb/pom.xml | 4 ++-- modules/i3plus-pojo-wms/pom.xml | 4 ++-- modules/i3plus-pojo-workflow/pom.xml | 4 ++-- pom.xml | 4 ++-- 21 files changed, 41 insertions(+), 41 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index 7fdc84c..9c806e2 100644 --- a/modules/i3plus-pojo-andon/pom.xml +++ b/modules/i3plus-pojo-andon/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 99a4195..b4040ec 100644 --- a/modules/i3plus-pojo-aps/pom.xml +++ b/modules/i3plus-pojo-aps/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -56,4 +56,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 3411cbc..f6d322a 100644 --- a/modules/i3plus-pojo-base/pom.xml +++ b/modules/i3plus-pojo-base/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -70,4 +70,4 @@ - \ No newline at end of file + diff --git a/modules/i3plus-pojo-bsp/pom.xml b/modules/i3plus-pojo-bsp/pom.xml index 254b452..16b7645 100644 --- a/modules/i3plus-pojo-bsp/pom.xml +++ b/modules/i3plus-pojo-bsp/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -54,4 +54,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 37bf889..6a5ec3b 100644 --- a/modules/i3plus-pojo-form/pom.xml +++ b/modules/i3plus-pojo-form/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -53,4 +53,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 048d5cd..fc117f8 100644 --- a/modules/i3plus-pojo-hardswitch/pom.xml +++ b/modules/i3plus-pojo-hardswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..47a62e1 100644 --- a/modules/i3plus-pojo-ics/pom.xml +++ b/modules/i3plus-pojo-ics/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -20,4 +20,4 @@ - \ No newline at end of file + diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1ed6d53..38220d4 100644 --- a/modules/i3plus-pojo-jobflow/pom.xml +++ b/modules/i3plus-pojo-jobflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -46,4 +46,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 93d4237..b415ee3 100644 --- a/modules/i3plus-pojo-lac/pom.xml +++ b/modules/i3plus-pojo-lac/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..63c1e2f 100644 --- a/modules/i3plus-pojo-mdm/pom.xml +++ b/modules/i3plus-pojo-mdm/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -19,4 +19,4 @@ - \ No newline at end of file + diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 0ee0761..4c20447 100644 --- a/modules/i3plus-pojo-mes-pcn/pom.xml +++ b/modules/i3plus-pojo-mes-pcn/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 4519749..e05843d 100644 --- a/modules/i3plus-pojo-mes/pom.xml +++ b/modules/i3plus-pojo-mes/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 07a496b..b817206 100644 --- a/modules/i3plus-pojo-model/pom.xml +++ b/modules/i3plus-pojo-model/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index 657abba..0c26e7f 100644 --- a/modules/i3plus-pojo-platform/pom.xml +++ b/modules/i3plus-pojo-platform/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 504b0e7..34ba9a9 100644 --- a/modules/i3plus-pojo-ptl/pom.xml +++ b/modules/i3plus-pojo-ptl/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -51,4 +51,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26e173f..e73c24b 100644 --- a/modules/i3plus-pojo-report/pom.xml +++ b/modules/i3plus-pojo-report/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 9e00793..18589a2 100644 --- a/modules/i3plus-pojo-softswitch/pom.xml +++ b/modules/i3plus-pojo-softswitch/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index f73c5b2..04d7e98 100644 --- a/modules/i3plus-pojo-sweb/pom.xml +++ b/modules/i3plus-pojo-sweb/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -52,4 +52,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 1bf205d..9a7a5b6 100644 --- a/modules/i3plus-pojo-wms/pom.xml +++ b/modules/i3plus-pojo-wms/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -70,4 +70,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index ca147a4..2b83fd0 100644 --- a/modules/i3plus-pojo-workflow/pom.xml +++ b/modules/i3plus-pojo-workflow/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 ../../pom.xml 4.0.0 @@ -46,4 +46,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index 478033a..9d0cf82 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0.0.1 modules/i3plus-pojo-base @@ -271,4 +271,4 @@ ${project.artifactId}-${project.version} - \ No newline at end of file + From 7e73f33b5cacdaba275e3597df3959a3210c1d18 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 17 Dec 2021 18:53:48 +0800 Subject: [PATCH 41/86] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E5=8F=91MES?= =?UTF-8?q?=E7=9A=84=E5=B7=A5=E4=BD=9C=E5=9D=97=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index 6f49931..a529eb1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -54,10 +54,6 @@ public class HeuristicRule extends BaseRule { @ApiParam(value ="最大等待时间") private String waitingTime; - @Column(name="MAX_SHIFTS") - @ApiParam(value ="最大班次") - private Integer maxShifts; - @Column(name="BATCH_PERIOD") @ApiParam(value ="组炉区间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index e6af6a5..683e517 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -61,6 +61,10 @@ public class ResCalendar extends BaseAPS { @FieldAnnotation(defaultValue = "10") private Integer priority; + @Column(name="SHIFT_NUMBER") + @ApiParam(value ="班次数量") + private Integer shiftNumber; + @JsonBackReference public List getDayShifts() { return BeanRelation.list(this, EResCalendar.DayShifts); From 90ccea73ecb55f5c4e36d1bac56012236f86cb8f Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 27 Dec 2021 15:13:05 +0800 Subject: [PATCH 42/86] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 7da5a30..61723d7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -77,4 +77,8 @@ public class SysParam extends BaseAPS { @Column(name="DEFAULT_FEEDBACK") @ApiParam(value ="自动提交前三道") private Boolean defaultFeedback = true; + + @Column(name="SAME_MATERIAL_INTERVAL") + @ApiParam(value ="相同物料选择间隔") + private String sameMaterialInterval; } From 4ee40a7c85b0ace496f04049ac1007624157549e Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 4 Jan 2022 10:32:43 +0800 Subject: [PATCH 43/86] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=EF=BC=8C=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 2 - .../estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 1 - .../cn/estsh/i3plus/pojo/aps/bean/SupplyOrder.java | 44 ++++++++++++++++++++++ .../pojo/aps/repository/SupplyOrderRepository.java | 10 +++++ 4 files changed, 54 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SupplyOrder.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SupplyOrderRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index e0de8b4..aaf03cc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -110,8 +110,6 @@ public class BaseOrder extends BaseAPS { @FieldAnnotation(modify = false) private Integer delayTime; - private transient Date lastBegin; - @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java index c16400f..0dbcc71 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -28,7 +28,6 @@ import javax.persistence.Table; @Table(name = "APS_SAFE_STOCK_ORDER") @Api("安全库存订单") public class SafeStockOrder extends BaseOrder { - private static final long serialVersionUID = 5944067344390531794L; @Column(name="ORDER_STATUS") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SupplyOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SupplyOrder.java new file mode 100644 index 0000000..b087ae4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SupplyOrder.java @@ -0,0 +1,44 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; +import com.fasterxml.jackson.annotation.JsonIgnore; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @author Jason + * @ClassName: SupplyOrder + * @Description: 补充订单 + * @date 2021-12-30 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_SUPPLY_ORDER") +@Api("补充订单") +public class SupplyOrder extends BaseOrder { + private static final long serialVersionUID = -5829272956141252627L; + + @Column(name="FINISH_COUNT") + @ApiParam(value ="完工数") + @FieldAnnotation(modify = false, defaultValue = "0") + private Double finishCount; + + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false, defaultValue = "0") + private Double qualifiedCount; + + @JsonIgnore + public Work getWork() { + return BeanRelation.get(this, EBaseOrder.Works); + } +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SupplyOrderRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SupplyOrderRepository.java new file mode 100644 index 0000000..08c7680 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/SupplyOrderRepository.java @@ -0,0 +1,10 @@ +package cn.estsh.i3plus.pojo.aps.repository; + + +import cn.estsh.i3plus.pojo.aps.bean.SupplyOrder; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface SupplyOrderRepository extends CrudRepository { +} From c31742fa73630ccc96c1b96066578fcd899fde7d Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 4 Jan 2022 19:14:21 +0800 Subject: [PATCH 44/86] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=EF=BC=8C=E4=B8=B4=E6=97=B6?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 16 ++++++++++++++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 4 ++-- .../cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java | 3 ++- .../src/main/resources/relations/PlanFeedback.xml | 5 +++++ .../src/main/resources/relations/Work.xml | 2 +- 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml 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 1aedf34..9689a0b 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 @@ -38,10 +38,19 @@ public class PlanFeedback extends BaseAPS { @FieldAnnotation(popSearch = true, mainkey = true, relation = "Work") private Long workId; + @Column(name="TOP_ORDER_ID") + @ApiParam(value ="顶层订单") + @FieldAnnotation(popSearch = true, mainkey = true, relation = "Order") + private Long topOrderId; + @Column(name="STATUS") @ApiParam(value ="状态") private ApsEnumUtil.FEED_BACK_STATUS status; + @Column(name="PLAN_COUNT") + @ApiParam(value ="计划完成数量") + private Double planCount; + @Column(name="ACTUAL_COUNT") @ApiParam(value ="实际完成数量") private Double actualCount; @@ -58,4 +67,11 @@ public class PlanFeedback extends BaseAPS { this.workId = work != null ? work.getId() : 0L; BeanRelation.set(this, EPlanFeedback.Work, work); } + + public BaseOrder getTopOrder() { return BeanRelation.get(this, EPlanFeedback.TopOrder); } + + public void setTopOrder(BaseOrder topOrder) { + this.topOrderId = topOrder != null ? topOrder.getId() : 0L; + BeanRelation.set(this, EPlanFeedback.TopOrder, topOrder); + } } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 6370965..b2b1d06 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -252,8 +252,8 @@ public class Work extends BaseAPS { } @JsonBackReference - public PlanFeedback getPlanFeedback() { - return BeanRelation.get(this, EWork.PlanFeedback); + public List getPlanFeedback() { + return BeanRelation.list(this, EWork.PlanFeedback); } @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java index 62bba5c..f49516a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java @@ -8,5 +8,6 @@ package cn.estsh.i3plus.pojo.aps.holders; * @Modify: **/ public enum EPlanFeedback { - Work + Work, + TopOrder, } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml new file mode 100644 index 0000000..fc632b6 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index fe0de7a..23265ff 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -18,7 +18,7 @@ - + From ad887c76b59c614b48bd584865e44f8f48cff827 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 8 Jan 2022 16:03:41 +0800 Subject: [PATCH 45/86] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index aaf03cc..25bd553 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -110,6 +110,11 @@ public class BaseOrder extends BaseAPS { @FieldAnnotation(modify = false) private Integer delayTime; + @Column(name="CHECK_FINISH") + @ApiParam(value ="检验完成") + @FieldAnnotation(property = false) + private Boolean checkFinish; + @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index bd9e959..e90aee0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -149,6 +149,10 @@ public class Material extends BaseAPS { @FieldAnnotation(relation = "WorkShop") private Long workShopId; + @Column(name="BATCH_DAYS") + @ApiParam(value ="合并天数") + private Integer batchDays; + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); From 0c38056604bbcbf5cb7abc00f76f39b6b6fd4e4d Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Mon, 10 Jan 2022 18:53:49 +0800 Subject: [PATCH 46/86] =?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, 13 Jan 2022 11:14:42 +0800 Subject: [PATCH 47/86] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index 5ce6ed6..b0eee50 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -43,6 +43,11 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Integer serialNumber = 0; + @Column(name="CONFIRM_SERIAL") + @ApiParam(value ="下发流水号") + @FieldAnnotation(property = false) + private Integer confirmSerial = 0; + @Column(name="POST_SERIAL_NUMBER") @ApiParam(value ="子工作流水号") @FieldAnnotation(property = false) From aaf5d1c00c3e1bebec19f94af5001f1de9b5e816 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 13 Jan 2022 16:42:30 +0800 Subject: [PATCH 48/86] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index b2b1d06..1ab6cb3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -177,7 +177,7 @@ public class Work extends BaseAPS { private String supplyWorkCode; @ApiParam(value ="工作排序顺序") - private Integer workSeqNumber; + private Integer workSeqNumber; @Column(name="MOULD_ID") @ApiParam(value ="模具能力id") From ec1d0a35406ab0a036adc97820d0008a23ec826c Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 18 Jan 2022 10:37:33 +0800 Subject: [PATCH 49/86] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=9A=84=E5=B7=A5=E4=BD=9C=E4=B8=8D=E5=90=8C?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java | 1 + 2 files changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 1ab6cb3..74c48cd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -184,6 +184,11 @@ public class Work extends BaseAPS { @FieldAnnotation(property = false) private Long mouldId = 0L; + @Column(name="FEEDBACK_SPLIT") + @ApiParam(value ="是否报工拆分") + @FieldAnnotation(modify = false) + private Boolean feedbackSplit; + // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java index 0223427..b09259b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java @@ -27,6 +27,7 @@ public class GanttPlanModel { private Date endDate; private String cls; private String eventColor; + private String style; private String name; private Long workId; private List resIds; From 485b9f2bd03211989f3794b5361d18331b7b5101 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 21 Jan 2022 15:32:19 +0800 Subject: [PATCH 50/86] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E9=87=8D=E6=8E=92?= =?UTF-8?q?=E4=B8=8D=E8=80=83=E8=99=91=E4=BA=A4=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 98 ---------------------- 1 file changed, 98 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index b0eee50..65a056d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -48,16 +48,6 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Integer confirmSerial = 0; - @Column(name="POST_SERIAL_NUMBER") - @ApiParam(value ="子工作流水号") - @FieldAnnotation(property = false) - private Integer postSerialNumber = 0; - - @Column(name="NEW_SERIAL") - @ApiParam(value ="拆分工作流水号") - @FieldAnnotation(property = false) - private Boolean newSerial = false; - @Column(name="PRODUCT_ORDER_ID") @ApiParam(value ="订单") @FieldAnnotation(property = false) @@ -68,28 +58,6 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; -// public int getCodeNumber() { -// for (int bitIndex = 0; bitIndex < 10; ++bitIndex) { -// int value = 1 << bitIndex; -// if ((this.serialNumber & value) == 0) { -// this.serialNumber |= value; -// newSerial = true; -// return bitIndex; -// } -// } -// -// return 0; -// } -// -// public void recoverNumber(int value) { -// if (newSerial == null || !newSerial) { -// return; -// } -// -// value = ~(1 << value); -// this.serialNumber &= value; -// } - public BaseOrder getProductOrder() { return BeanRelation.get(this, EParentWork.ProductOrder); } @@ -112,70 +80,4 @@ public class ParentWork extends BaseAPS { public List getWorks() { return BeanRelation.list(this, EParentWork.Works); } - - public int createNew() { - return getPrevNumber() * 10; - } - - public int createContinue(int number) { - number /= 10; - return number * 10 + getPostNumber(); - } - - private int getPrevNumber() { - for (int bitIndex = 1; bitIndex < 10; ++bitIndex) { - int value = 1 << bitIndex; - if ((this.serialNumber & value) == 0) { - this.serialNumber |= value; - this.newSerial = true; - return bitIndex ; - } - } - - return 0; - } - - private int getPostNumber() { - for (int bitIndex = 1; bitIndex < 10; ++bitIndex) { - int value = 1 << bitIndex; - if ((this.postSerialNumber & value) == 0) { - this.postSerialNumber |= value; - return bitIndex; - } - } - - return 0; - } - - public void cycleNumber(int number) { - if (newSerial == null || !newSerial) { - return; - } - - cyclePrevNumber(number); - cyclePostNumber(number); - } - - private void cyclePrevNumber(int number) { - if (number % 10 > 0) { - return; - } - - number /= 10; - number = ~(1 << number); - this.serialNumber &= number; - } - - private void cyclePostNumber(int number) { - number %= 10; - if (number == 0) { - return; - } - if (this.postSerialNumber == null) { - this.postSerialNumber = 0; - } - - number = ~(1 << number); - this.postSerialNumber &= number; - } } From 0b324d955c126586a91ed751ad4e25d8c28dd713 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 22 Jan 2022 09:43:04 +0800 Subject: [PATCH 51/86] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 16 ------------- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 16 ------------- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 28 ---------------------- 3 files changed, 60 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 9697136..a3166d0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -60,22 +60,6 @@ public class Operation extends BaseAPS { @ApiParam(value ="固定报废数") private Double fixScrapCount; - @Column(name="RATIO") - @ApiParam(value ="分割比例") - private String ratio; - - @Column(name="COUNT") - @ApiParam(value ="分割的工作个数") - private Integer count; - - @Column(name="BATCH", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割批量") - private Double batch; - - @Column(name="REMAINDER", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割余数") - private Double remainder; - @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") @FieldAnnotation(defaultValue = "ES") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 37c68b5..6ba4e9e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -47,22 +47,6 @@ public class StandOperation extends BaseAPS { @FieldAnnotation(defaultValue = "POSITIVE") private ApsEnumUtil.DIRECTION direction; - @Column(name="RATIO") - @ApiParam(value ="分割比例") - private String ratio; - - @Column(name="COUNT") - @ApiParam(value ="分割的工作个数") - private Integer count; - - @Column(name="BATCH", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割批量") - private Double batch; - - @Column(name="REMAINDER", columnDefinition = "decimal(18,8)") - @ApiParam(value ="分割余数") - private Double remainder; - @Column(name="MIN_SPACE_TIME") @ApiParam(value ="最小时间间隔") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) 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 ace9378..c417f45 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 @@ -603,34 +603,6 @@ public class ApsEnumUtil { } /** - * 工作分割类型 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_SPLIT_TYPE { - NONE("NONE", "不分割"), - RATIO("RATIO", "按比例分割"), - COUNT("COUNT", "按数量分割"), - BATCH("BATCH", "按批量分割"), - REMAINDER("REMAINDER", "按余数分割"); - - private final String value; - private final String description; - - WORK_SPLIT_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - public String getValue() { - return value; - } - - public String getDescription() { - return description; - } - } - - /** * 工作状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From fd2cc2da5159322d0f0f662736ec8613c32ec875 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 24 Jan 2022 17:25:14 +0800 Subject: [PATCH 52/86] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/annotation/ClassLevelAnnotation.java | 11 +++++++++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java | 1 + .../main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 4 +++- .../java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java | 2 ++ .../java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java | 3 +++ .../cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java | 2 ++ .../cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java | 4 ++++ .../estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 8 +++----- .../main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java | 6 ++++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java | 5 ++++- .../main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java | 1 + .../java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 3 +++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java | 5 +++++ .../java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 1 + .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 9 +++++++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 7 +++++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 8 +++++++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 7 +++++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java | 10 +++++++++- .../main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java | 8 +++++++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 1 - .../java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 1 + 45 files changed, 167 insertions(+), 13 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ClassLevelAnnotation.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ClassLevelAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ClassLevelAnnotation.java new file mode 100644 index 0000000..dada68b --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ClassLevelAnnotation.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.aps.annotation; + +/** + * @author Jason + * @ClassName: ClassLevelAnnotation + * @Description: TODO(这里用一句话描述这个类的作用) + * @date 2022-01-22 + */ +public @interface ClassLevelAnnotation { + int level(); +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index 25bd553..432e6c6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -120,6 +121,7 @@ public class BaseOrder extends BaseAPS { return BeanRelation.list(this, EBaseOrder.Works); } + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EBaseOrder.Material); } @@ -139,6 +141,7 @@ public class BaseOrder extends BaseAPS { return BeanRelation.list(this, EBaseOrder.PostRelations); } + @JsonIgnore public PriorityType getPriority() { return BeanRelation.get(this, EBaseOrder.Priority); } public void setPriority(PriorityType priority) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index 499e986..c279a98 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EExportDetail; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -57,6 +58,7 @@ public class ExportDetail extends BaseAPS { @FieldAnnotation(relation = "Project") private Long projectId; + @JsonIgnore public ExportProject getProject() { return BeanRelation.get(this, EExportDetail.Project); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java index d81c7ac..6564681 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java @@ -46,6 +46,7 @@ public class ExportProject extends BaseAPS { @ApiParam(value ="当前执行的明细名称") private transient String curDetailName; + @JsonIgnore public DataLink getLink() { return BeanRelation.get(this, EExportProject.Link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index f9b13e9..ed3ecd1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -1,9 +1,11 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EFurnacePlan; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,6 +32,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="APS_FURNACE_PLAN") @Api("炉资源计划") +@ClassLevelAnnotation(level = 1) public class FurnacePlan extends BaseAPS { private static final long serialVersionUID = 6816465736285211114L; @@ -56,6 +59,7 @@ public class FurnacePlan extends BaseAPS { @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); } + @JsonIgnore public FurnacePlan getMergePlan() { return BeanRelation.get(this, EFurnacePlan.MergePlan); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java index d31c13f..9168a5b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnaceSetting.java @@ -29,8 +29,8 @@ import javax.persistence.Table; @Table(name="APS_FURNACE_SETTING") @Api("组炉设置") public class FurnaceSetting extends BaseAPS { - private static final long serialVersionUID = -4566911526487268870L; + @Column(name="RES_CODES") @ApiParam(value ="资源编码") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 2a5a224..7f037ed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -123,6 +124,7 @@ public class ImportDetail extends BaseAPS { @FieldAnnotation(property = false) private transient ImportDataModel model; + @JsonIgnore public ImportProject getProject() { return BeanRelation.get(this, EImportDetail.Project); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java index 7bcc351..991423a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; import cn.estsh.i3plus.pojo.aps.holders.EImportField; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,8 +29,8 @@ import javax.persistence.Transient; @Table(name = "APS_IMPORT_FIELD") @Api("数据导入字段配置") public class ImportField extends BaseAPS { - private static final long serialVersionUID = 8848879008582197564L; + @Column(name="FIELD_NAME") @ApiParam("字段名") private String fieldName; @@ -83,6 +84,7 @@ public class ImportField extends BaseAPS { @FieldAnnotation(relation = "ImportDetail", notEmpty = true) private Long importDetailId; + @JsonIgnore public ImportDetail getImportDetail() { return BeanRelation.get(this, EImportField.ImportDetail); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java index 62dd6ab..e239736 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EImportProject; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,6 +46,7 @@ public class ImportProject extends BaseAPS { @ApiParam(value ="当前执行的明细名称") private transient String curDetailName; + @JsonIgnore public DataLink getLink() { return BeanRelation.get(this, EImportProject.Link); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java index df30bf1..07b060d 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -27,6 +28,7 @@ import javax.persistence.Table; @Entity @Table(name = "APS_INSERTED_ORDER") @Api("插单管理") +@ClassLevelAnnotation(level = 3) public class InsertedOrder extends BaseOrder { private static final long serialVersionUID = -5036380772996107234L; @@ -58,6 +60,7 @@ public class InsertedOrder extends BaseOrder { @ApiParam(value ="备注") private String remark; + @JsonIgnore public ProductRouting getProductRouting() { return BeanRelation.get(this, EInsertedOrder.ProductRouting); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java index 62d1a22..804ba93 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateDetail.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EInterMediateDetail; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -41,6 +42,7 @@ public class InterMediateDetail extends BaseAPS { @ApiParam(value ="评估值") private Double evaluateValue; + @JsonIgnore public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); } public void setResult(InterMediateResult result) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java index 95a95d5..a0c99a1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InterMediateResult.java @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EInterMediateResult; import cn.estsh.i3plus.pojo.aps.holders.EWorkInput; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -46,6 +47,7 @@ public class InterMediateResult extends BaseAPS { @ApiParam(value ="评估值") private Double evaluateValue; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EInterMediateResult.Work); } @@ -55,6 +57,7 @@ public class InterMediateResult extends BaseAPS { BeanRelation.set(this, EInterMediateResult.Work, work); } + @JsonIgnore public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); } public void setResource(Resource resource) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java index 46955d4..ea01d99 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -30,6 +31,7 @@ import java.util.List; @Entity @Table(name = "APS_INVENTORY") @Api("库存") +@ClassLevelAnnotation(level = 3) public class Inventory extends BaseOrder { private static final long serialVersionUID = 2378846162007550439L; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index e90aee0..e1af484 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; @@ -12,6 +13,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,6 +37,7 @@ import java.util.List; @Table(name = "APS_MATERIAL") @Api("物料") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +@ClassLevelAnnotation(level = 1) public class Material extends BaseAPS { private static final long serialVersionUID = -7928225487946173108L; @@ -208,6 +211,7 @@ public class Material extends BaseAPS { return BeanRelation.listByClass(this, ProductOrder.class, EMaterial.Orders); } + @JsonIgnore public WorkShop getWorkShop() { return BeanRelation.get(this, EMaterial.WorkShop); } public void setWorkShop(WorkShop workShop) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java index 0b9b1b5..4a85de9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.holders.EMaterialDeliveryPromise; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -43,6 +44,7 @@ public class MaterialDeliveryPromise extends BaseBean { @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EMaterialDeliveryPromise.Material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index 47937e7..d08d131 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOperInput; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,6 +30,7 @@ import java.util.List; @Entity @Table(name = "APS_OPER_INPUT") @Api("工序输入") +@ClassLevelAnnotation(level = 4) public class OperInput extends BaseAPS { private static final long serialVersionUID = 6653235155693766804L; @@ -71,6 +74,7 @@ public class OperInput extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; + @JsonIgnore public Operation getOperation() { return BeanRelation.get(this, EOperInput.Operation); } @@ -80,6 +84,7 @@ public class OperInput extends BaseAPS { BeanRelation.set(this, EOperInput.Operation, oper); } + @JsonIgnore public Material getInputMaterial() { return BeanRelation.get(this, EOperInput.InputMaterial); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index 1ce057f..a8e55bb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -1,10 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOperOutput; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,6 +29,7 @@ import java.util.List; @Entity @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") +@ClassLevelAnnotation(level = 4) public class OperOutput extends BaseAPS { private static final long serialVersionUID = 3185682762290147209L; @@ -55,6 +58,7 @@ public class OperOutput extends BaseAPS { @FieldAnnotation(defaultValue = "0.0") private Double fixScrapCount; + @JsonIgnore public Operation getOperation() { return BeanRelation.get(this, EOperOutput.Operation); } @@ -64,6 +68,7 @@ public class OperOutput extends BaseAPS { BeanRelation.set(this, EOperOutput.Operation, oper); } + @JsonIgnore public Material getOutputMaterial() { return BeanRelation.get(this, EOperOutput.OutputMaterial); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index f8f154b..306a24f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOperResource; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,6 +30,7 @@ import java.util.List; @Entity @Table(name = "APS_OPER_RESOURCE") @Api("工序资源") +@ClassLevelAnnotation(level = 4) public class OperResource extends BaseAPS { private static final long serialVersionUID = -8683889582369342606L; @@ -84,6 +87,7 @@ public class OperResource extends BaseAPS { @ApiParam(value ="资源使用配套号") private String userMatchNumber; + @JsonIgnore public Operation getOperation() { return BeanRelation.get(this, EOperResource.Operation); } @@ -93,6 +97,7 @@ public class OperResource extends BaseAPS { BeanRelation.set(this, EOperResource.Operation, oper); } + @JsonIgnore public Resource getResource() { return BeanRelation.get(this, EOperResource.Resource); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index a3166d0..730a894 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOperation; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,6 +30,7 @@ import java.util.List; @Entity @Table(name = "APS_OPERATION") @Api("工序") +@ClassLevelAnnotation(level = 3) public class Operation extends BaseAPS { private static final long serialVersionUID = 4394179144091116858L; @@ -75,6 +78,7 @@ public class Operation extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; + @JsonIgnore public ProductRouting getProductRouting() { return BeanRelation.get(this, EOperation.ProductRouting); } @@ -99,6 +103,7 @@ public class Operation extends BaseAPS { return BeanRelation.list(this, EOperation.OperResources); } + @JsonIgnore public StandOperation getStandOperation() { return BeanRelation.get(this, EOperation.StandOperation); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java index 32fa28f..a995c89 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EOrderFeedback; import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -62,6 +63,7 @@ public class OrderFeedback extends BaseAPS { @ApiParam(value ="累加合格数量") private Double addQualifiedCount; + @JsonIgnore public BaseOrder getOrder() { return BeanRelation.get(this, EOrderFeedback.Order); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java index 65a056d..a7a006e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EParentWork; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -31,6 +33,7 @@ import java.util.List; @Table(name = "APS_PARENT_WORK") @Api("父工作") @ExcludeImportExport +@ClassLevelAnnotation(level = 5) public class ParentWork extends BaseAPS { private static final long serialVersionUID = 8792781216193806606L; @@ -58,6 +61,7 @@ public class ParentWork extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; + @JsonIgnore public BaseOrder getProductOrder() { return BeanRelation.get(this, EParentWork.ProductOrder); } @@ -67,6 +71,7 @@ public class ParentWork extends BaseAPS { BeanRelation.set(this, EParentWork.ProductOrder, order); } + @JsonIgnore public Operation getOperation() { return BeanRelation.get(this, EParentWork.Operation); } 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..7f27f05 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 @@ -8,6 +8,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -59,6 +60,7 @@ public class PlanFeedback extends BaseAPS { @ApiParam(value ="备注") private String remark; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EPlanFeedback.Work); } @@ -68,6 +70,7 @@ public class PlanFeedback extends BaseAPS { BeanRelation.set(this, EPlanFeedback.Work, work); } + @JsonIgnore public BaseOrder getTopOrder() { return BeanRelation.get(this, EPlanFeedback.TopOrder); } public void setTopOrder(BaseOrder topOrder) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java index f9e9ffa..9c7aa50 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; @@ -23,6 +24,7 @@ import javax.persistence.Table; @Entity @Table(name = "APS_PRIORITY_TYPE") @Api("优先级") +@ClassLevelAnnotation(level = 0) public class PriorityType extends BaseAPS { private static final long serialVersionUID = 445577901076659576L; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index ce9fff2..ec2805c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java @@ -1,11 +1,13 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EProductOrder; import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,6 +31,7 @@ import java.util.List; @Entity @Table(name = "APS_PRODUCT_ORDER") @Api("生产订单") +@ClassLevelAnnotation(level = 3) public class ProductOrder extends BaseOrder { private static final long serialVersionUID = 6900226668783662736L; @@ -109,6 +112,7 @@ public class ProductOrder extends BaseOrder { @FieldAnnotation(property = false) private Long srcInsertedOrder; + @JsonIgnore public ProductRouting getProductRouting() { return BeanRelation.get(this, EProductOrder.ProductRouting); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index dae30aa..786ee6e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; @@ -8,6 +9,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EProductRouting; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -32,6 +34,7 @@ import java.util.List; @Table(name = "APS_PRODUCT_ROUTING") @Api("工艺路线") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +@ClassLevelAnnotation(level = 2) public class ProductRouting extends BaseAPS { private static final long serialVersionUID = 4905294866468216722L; @@ -63,6 +66,7 @@ public class ProductRouting extends BaseAPS { @FieldAnnotation(defaultValue = "10") private Integer priority; + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EProductRouting.Material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java index f1a6064..88b4590 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -26,8 +27,10 @@ import javax.persistence.Table; @Entity @Table(name = "APS_PURCHASE_ORDER") @Api("采购订单") +@ClassLevelAnnotation(level = 3) public class PurchaseOrder extends BaseOrder { private static final long serialVersionUID = 4699381603433121631L; + @Column(name="SPECIFY_TOP_ORDER") @ApiParam(value ="指定顶层订单") private String specifyTopOrder; @@ -50,11 +53,6 @@ public class PurchaseOrder extends BaseOrder { @FieldAnnotation(modify = false) private String calcLeadTime; -// @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)") -// @ApiParam(value ="多余量") -// @FieldAnnotation(modify = false) -// private Double excessCount; - @Column(name="AUTO_SUPPLY") @ApiParam(value ="物料计算时自动补充") @FieldAnnotation(defaultValue = "true") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index 683e517..ec346f0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -35,6 +35,7 @@ import java.util.List; @Api("日历") public class ResCalendar extends BaseAPS { private static final long serialVersionUID = 8338930205816433211L; + @Lob @Column(name="RES_CODES") @ApiParam(value ="资源编码") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 6d31c89..56f200c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; @@ -9,6 +10,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -33,8 +35,10 @@ import java.util.List; @Table(name = "APS_RESOURCE") @Api("资源") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +@ClassLevelAnnotation(level = 1) public class Resource extends BaseAPS { private static final long serialVersionUID = 3304084329600816457L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -104,6 +108,7 @@ public class Resource extends BaseAPS { @FieldAnnotation(relation = "Order", modify = false) private Long bindResourceId; + @JsonIgnore public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); } public void setWorkShop(WorkShop workShop) { @@ -114,6 +119,7 @@ public class Resource extends BaseAPS { @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); } + @JsonIgnore public Resource getBindResource() { return BeanRelation.get(this, EResource.BindResource); } public void setBindResource(Resource bindResource) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index 282ae40..b8f4475 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.ERuleDetail; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,8 +30,8 @@ import javax.persistence.Table; @Api("规则明细") @ExcludeImportExport public class RuleDetail extends BaseAPS { - private static final long serialVersionUID = -6433950357039396107L; + @Column(name="TYPE") @ApiParam(value ="规则类型") private String type; @@ -49,6 +50,7 @@ public class RuleDetail extends BaseAPS { @FieldAnnotation(relation = "Rule", display = false) private Long ruleId; + @JsonIgnore public RuleGroup getRuleGroup() { return BeanRelation.get(this, ERuleDetail.RuleGroup); } public void setRuleGroup(RuleGroup ruleGroup) { @@ -56,6 +58,7 @@ public class RuleDetail extends BaseAPS { BeanRelation.set(this, ERuleDetail.RuleGroup, ruleGroup); } + @JsonIgnore public BaseRule getRule() { return BeanRelation.get(this, ERuleDetail.Rule); } public void setRule(BaseRule rule) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java index eb2a239..9ae936a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleGroup.java @@ -32,6 +32,7 @@ import java.util.List; @ExcludeImportExport public class RuleGroup extends BaseAPS { private static final long serialVersionUID = 4741897751041891075L; + @Column(name="CODE") @ApiParam(value ="编码") private String code; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java index 0dbcc71..c7a02ba 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -27,6 +28,7 @@ import javax.persistence.Table; @Entity @Table(name = "APS_SAFE_STOCK_ORDER") @Api("安全库存订单") +@ClassLevelAnnotation(level = 4) public class SafeStockOrder extends BaseOrder { private static final long serialVersionUID = 5944067344390531794L; @@ -55,6 +57,7 @@ public class SafeStockOrder extends BaseOrder { return BeanRelation.get(this, EBaseOrder.Works); } + @JsonIgnore public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); } public void setInventory(Inventory inventory) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 346d1ef..7c5a35c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; @@ -27,8 +28,10 @@ import java.util.Date; @Entity @Table(name = "APS_SALES_ORDER") @Api("销售订单") +@ClassLevelAnnotation(level = 3) public class SalesOrder extends BaseOrder { private static final long serialVersionUID = -511784925441907538L; + @Column(name="LOW_EST") @ApiParam(value ="底阶最早开始时间") private Date lowEst; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java index 0046368..c57c970 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SerialNumber.java @@ -26,8 +26,8 @@ import java.util.Date; @Api("流水号") @ExcludeImportExport public class SerialNumber extends BaseAPS { - private static final long serialVersionUID = 312483211086701109L; + @Column(name="S_NUMBER") @ApiParam(value ="销售订单流水号") private Integer sNumber = 0; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index 129ab70..205e038 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EShippingTime; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -58,6 +59,7 @@ public class ShippingTime extends BaseAPS { @FieldAnnotation(defaultValue = "10") private Integer priority; + @JsonIgnore public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } public void setPrevRes(Resource res) { @@ -65,6 +67,7 @@ public class ShippingTime extends BaseAPS { BeanRelation.set(this, EShippingTime.PrevRes, res); } + @JsonIgnore public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); } public void setPostRes(Resource res) { @@ -72,6 +75,7 @@ public class ShippingTime extends BaseAPS { BeanRelation.set(this, EShippingTime.PostRes, res); } + @JsonIgnore public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);} public void setPrevStand(StandOperation stand) { @@ -79,6 +83,7 @@ public class ShippingTime extends BaseAPS { BeanRelation.set(this, EShippingTime.PrevStand, stand); } + @JsonIgnore public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); } public void setPostStand(StandOperation stand) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 6ba4e9e..ccde55a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; @@ -8,6 +9,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EStandOperation; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -30,8 +32,10 @@ import javax.persistence.Table; @Table(name = "APS_STAND_OPERATION") @Api("标准工序") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +@ClassLevelAnnotation(level = 1) public class StandOperation extends BaseAPS { private static final long serialVersionUID = -6869403951765771775L; + @Column(name="CODE") @ApiParam(value ="编码") @FieldAnnotation(popSearch = true, mainkey = true) @@ -77,6 +81,7 @@ public class StandOperation extends BaseAPS { @ApiParam(value ="工序类型") private ApsEnumUtil.SANLUX_OPERATION_TYPE type = ApsEnumUtil.SANLUX_OPERATION_TYPE.NORMAL; + @JsonIgnore public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); } public void setWorkShop(WorkShop workShop) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 61723d7..52eaede 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -27,6 +27,7 @@ import java.util.Date; @Api("系统参数") public class SysParam extends BaseAPS { private static final long serialVersionUID = 3115620726438869596L; + @Column(name="BASE_TIME") @ApiParam(value ="基准时间") private Date baseTime; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 74c48cd..512a232 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; @@ -11,6 +12,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -36,6 +38,7 @@ import java.util.List; @Table(name = "APS_WORK") @Api("工作") @MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +@ClassLevelAnnotation(level = 6) public class Work extends BaseAPS { private static final long serialVersionUID = 6471740978550523187L; @@ -195,6 +198,7 @@ public class Work extends BaseAPS { // 排程时确定工作是正向排程还是逆向排程。 private transient boolean positive = true; + @JsonIgnore public BaseOrder getOrder() { return BeanRelation.get(this, EWork.Order); } @@ -204,6 +208,7 @@ public class Work extends BaseAPS { BeanRelation.set(this, EWork.Order, order); } + @JsonIgnore public Operation getOperation() { return BeanRelation.get(this, EWork.Operation); } @@ -213,6 +218,7 @@ public class Work extends BaseAPS { BeanRelation.set(this, EWork.Operation, oper); } + @JsonIgnore public Operation getOriginOperation() { return BeanRelation.get(this, EWork.OriginOperation); } @@ -222,6 +228,7 @@ public class Work extends BaseAPS { BeanRelation.set(this, EWork.OriginOperation, oper); } + @JsonIgnore public ParentWork getParentWork() { return BeanRelation.get(this, EWork.ParentWork); } @@ -272,6 +279,7 @@ public class Work extends BaseAPS { @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); } + @JsonIgnore public Resource getSpecifyResource() { return BeanRelation.get(this, EWork.SpecifyResource); } @@ -291,6 +299,7 @@ public class Work extends BaseAPS { @JsonBackReference public List getDynSplitWorks() { return BeanRelation.list(this, EWork.DynSplitWorks); } + @JsonIgnore public Work getOriginWork() { return BeanRelation.get(this, EWork.OriginWork); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 045862a..412a04f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -1,10 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkInput; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,8 +30,10 @@ import java.util.List; @Entity @Table(name = "APS_WORK_INPUT") @Api("工作输入") +@ClassLevelAnnotation(level = 7) public class WorkInput extends BaseAPS { private static final long serialVersionUID = 2654389476284740183L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") @@ -60,6 +64,7 @@ public class WorkInput extends BaseAPS { @FieldAnnotation(property = false) private Long operInputId; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkInput.Work); } @@ -74,6 +79,7 @@ public class WorkInput extends BaseAPS { return BeanRelation.list(this, EWorkInput.WorkRelations); } + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EWorkInput.Material); } @@ -83,6 +89,7 @@ public class WorkInput extends BaseAPS { BeanRelation.set(this, EWorkInput.Material, material); } + @JsonIgnore public OperInput getOperInput() { return BeanRelation.get(this, EWorkInput.OperInput); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 7a2fade..fcb9cab 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -1,10 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkOutput; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -29,9 +31,10 @@ import java.util.List; @Entity @Table(name = "APS_WORK_OUTPUT") @Api("工作输出") +@ClassLevelAnnotation(level = 7) public class WorkOutput extends BaseAPS { - private static final long serialVersionUID = 6031001499619328313L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") @@ -62,6 +65,7 @@ public class WorkOutput extends BaseAPS { @FieldAnnotation(property = false) private Long operOutputId; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkOutput.Work); } @@ -76,6 +80,7 @@ public class WorkOutput extends BaseAPS { return BeanRelation.list(this, EWorkOutput.WorkRelations); } + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EWorkOutput.Material); } @@ -85,6 +90,7 @@ public class WorkOutput extends BaseAPS { BeanRelation.set(this, EWorkOutput.Material, material); } + @JsonIgnore public OperOutput getOperOutput() { return BeanRelation.get(this, EWorkOutput.OperOutput); } 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 97395f8..9a24c86 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 @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; @@ -7,6 +8,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -35,6 +37,7 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name="APS_WORK_PLAN") @Api("工作计划") +@ClassLevelAnnotation(level = 8) public class WorkPlan extends BaseAPS { private static final long serialVersionUID = 5489548115780676195L; @@ -139,6 +142,7 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="调整时间") private Date adjustDate; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { @@ -146,6 +150,7 @@ public class WorkPlan extends BaseAPS { BeanRelation.set(this, EWorkPlan.Work, work); } + @JsonIgnore public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); } public void setResource(Resource resource) { @@ -153,6 +158,7 @@ public class WorkPlan extends BaseAPS { BeanRelation.set(this, EWorkPlan.Resource, resource); } + @JsonIgnore public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); } public void setWorkResource(WorkResource workResource) { @@ -160,6 +166,7 @@ public class WorkPlan extends BaseAPS { BeanRelation.set(this, EWorkPlan.WorkResource, workResource); } + @JsonIgnore public FurnacePlan getFurnacePlan() { return BeanRelation.get(this, EWorkPlan.FurnacePlan); } public void setFurnacePlan(FurnacePlan plan) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index a4a9d20..f94d8de 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,8 +28,8 @@ import javax.persistence.Table; @Table(name = "APS_Work_Relation") @Api("工作关联") public class WorkRelation extends BaseAPS { - private static final long serialVersionUID = -5824884364328962956L; + @Column(name="MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(relation = "Material", modify = false) @@ -97,6 +98,7 @@ public class WorkRelation extends BaseAPS { @FieldAnnotation(property = false) private Long workOutputId; + @JsonIgnore public WorkInput getWorkInput() { return BeanRelation.get(this, EWorkRelation.WorkInput); } @@ -106,6 +108,7 @@ public class WorkRelation extends BaseAPS { BeanRelation.set(this, EWorkRelation.WorkInput, input); } + @JsonIgnore public WorkOutput getWorkOutput() { return BeanRelation.get(this, EWorkRelation.WorkOutput); } @@ -115,6 +118,7 @@ public class WorkRelation extends BaseAPS { BeanRelation.set(this, EWorkRelation.WorkOutput, output); } + @JsonIgnore public Work getPrevWork() { return BeanRelation.get(this, EWorkRelation.PrevWork); } @@ -124,6 +128,7 @@ public class WorkRelation extends BaseAPS { BeanRelation.set(this, EWorkRelation.PrevWork, work); } + @JsonIgnore public Work getPostWork() { return BeanRelation.get(this, EWorkRelation.PostWork); } @@ -133,6 +138,7 @@ public class WorkRelation extends BaseAPS { BeanRelation.set(this, EWorkRelation.PostWork, work); } + @JsonIgnore public BaseOrder getPrevOrder() { return BeanRelation.get(this, EWorkRelation.PrevOrder); } @@ -142,6 +148,7 @@ public class WorkRelation extends BaseAPS { BeanRelation.set(this, EWorkRelation.PrevOrder, order); } + @JsonIgnore public BaseOrder getPostOrder() { return BeanRelation.get(this, EWorkRelation.PostOrder); } @@ -151,6 +158,7 @@ public class WorkRelation extends BaseAPS { BeanRelation.set(this, EWorkRelation.PostOrder, order); } + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EWorkRelation.Material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index c324886..21f062b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -1,10 +1,12 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWorkResource; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,9 +29,10 @@ import javax.validation.constraints.Min; @Entity @Table(name = "APS_WORK_RESOURCE") @Api("工作资源") +@ClassLevelAnnotation(level = 7) public class WorkResource extends BaseAPS { - private static final long serialVersionUID = 4791940404968841144L; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(relation = "Work") @@ -104,6 +107,7 @@ public class WorkResource extends BaseAPS { @FieldAnnotation(property = false) private Long resCapacityId = 0L; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EWorkResource.Work); } @@ -113,6 +117,7 @@ public class WorkResource extends BaseAPS { BeanRelation.set(this, EWorkResource.Work, work); } + @JsonIgnore public Resource getResource() { return BeanRelation.get(this, EWorkResource.Resource); } @@ -122,6 +127,7 @@ public class WorkResource extends BaseAPS { BeanRelation.set(this, EWorkResource.Resource, res); } + @JsonIgnore public OperResource getOperResource() { return BeanRelation.get(this, EWorkResource.OperResource); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java index 273641d..4369823 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import io.swagger.annotations.Api; @@ -23,6 +24,7 @@ import javax.persistence.Table; @Entity @Table(name = "APS_WORK_SHOP") @Api("车间") +@ClassLevelAnnotation(level = 0) public class WorkShop extends BaseAPS { private static final long serialVersionUID = 5627016086816721284L; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index de346ba..90d39a9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -27,7 +27,6 @@ import java.util.HashMap; public abstract class BaseAPS extends BaseBean { private static final long serialVersionUID = -8638842158403944318L; - @JsonIgnore @Lob @FieldAnnotation(property = false) private HashMap customFields = new HashMap<>(); 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 c417f45..034e2bc 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 @@ -365,6 +365,7 @@ public class ApsEnumUtil { POST_SET_TIME("POST_SET_TIME", "后设置时间"), WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"), WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"), + WAIT_END_SUB_LEFT("WAIT_END_SUB_LEFT", "工作结束时间减去左边界"), RES_BALANCE("RES_BALANCE", "资源均衡度"), SAME_MATERIAL("SAME_MATERIAL", "相同物料"), SAME_ORDER("SAME_ORDER", "相同订单"), From 0183e4b27bfb51a0aecbbdb2b0b004f3c4346ccc Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 11 Feb 2022 13:20:11 +0800 Subject: [PATCH 53/86] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 52eaede..4f12d7c 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -82,4 +82,8 @@ public class SysParam extends BaseAPS { @Column(name="SAME_MATERIAL_INTERVAL") @ApiParam(value ="相同物料选择间隔") private String sameMaterialInterval; + + @Column(name="MERGE_RATIO") + @ApiParam(value ="合并余数需求比列") + private Integer mergeRatio; } From 145f94c7a3b4508d557a036a5d5c8110cffe6105 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 17 Feb 2022 10:02:11 +0800 Subject: [PATCH 54/86] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 2 - .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 4 +- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 191 +++++++++++++-------- 3 files changed, 118 insertions(+), 79 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index e1af484..12b6322 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -6,9 +6,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.MainKey; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder; import cn.estsh.i3plus.pojo.aps.holders.EMaterial; -import cn.estsh.i3plus.pojo.aps.holders.EResource; import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index 63ad8a3..b770cbd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -12,7 +12,6 @@ import java.util.function.Predicate; * @Reference : * @Author : jason.niu * @CreateDate : 2019-09-17 - * @Modify: **/ public class BeanRelation { Map, Map, List>>> caches = new HashMap<>(); @@ -56,7 +55,8 @@ public class BeanRelation { public static Map, List> get(BaseBean bean) { Map, List> temp = get().caches.get(bean.getClass()).get(bean.getId()); if (temp == null) { - synchronized (bean.getClass()) { + synchronized (BaseBean.class) { + temp = get().caches.get(bean.getClass()).get(bean.getId()); if (temp == null) { temp = createRelation(bean.getClass()); get().caches.get(bean.getClass()).put(bean.getId(), temp); 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 034e2bc..69983dc 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 @@ -9,6 +9,11 @@ import com.fasterxml.jackson.annotation.JsonFormat; **/ public class ApsEnumUtil { + public interface Enumerator { + String getValue(); + String getDescription(); + } + /** * 日历中选择星期的多选枚举 */ @@ -52,8 +57,7 @@ public class ApsEnumUtil { /** * 物料类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MATERIAL_TYPE { + public enum MATERIAL_TYPE implements Enumerator { PRODUCT("PRODUCT", "成品"), HALF_PRODUCT("HALF_PRODUCT", "半成品"), RAW_MATERIAL("RAW_MATERIAL", "原材料"), @@ -68,10 +72,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -80,8 +86,7 @@ public class ApsEnumUtil { /** * 物料报表统计类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MATERIAL_REPORT_TYPE { + public enum MATERIAL_REPORT_TYPE implements Enumerator { PURCHASE("PURCHASE", "采购"), PRODUCE("PRODUCE", "生产"), INVENTORY("INVENTORY", "库存"); @@ -94,10 +99,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -106,8 +113,7 @@ public class ApsEnumUtil { /** * 报表时间间隔 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum REPORT_TIME_SPAN { + public enum REPORT_TIME_SPAN implements Enumerator { ONE_HOUR("ONE_HOUR", "1小时"), EIGHT_HOUR("EIGHT_HOUR", "8小时"), TWELVE_HOUR("TWELVE_HOUR", "12小时"), @@ -123,10 +129,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -135,8 +143,7 @@ public class ApsEnumUtil { /** * 备料类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PREPARE_TYPE { + public enum PREPARE_TYPE implements Enumerator { NO("NO", "不备料"), SELF_MAKE("SELF_MAKE", "自制"), // 自制 PURCHASE("PURCHASE", "采购"); // 采购 @@ -149,10 +156,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -161,8 +170,7 @@ public class ApsEnumUtil { /** * 补充类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum REPLENISHMENT_TYPE { + public enum REPLENISHMENT_TYPE implements Enumerator { NO("NO", "不补充"), BATCH("BATCH", "批量补充"), ONEBYONE("ONEBYONE", "一对一补充"); @@ -175,10 +183,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -224,8 +234,7 @@ public class ApsEnumUtil { /** * 排程方向 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DIRECTION { + public enum DIRECTION implements Enumerator { POSITIVE("POSITIVE", "正向"), REVERSE("REVERSE", "逆向"); @@ -237,10 +246,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -249,8 +260,7 @@ public class ApsEnumUtil { /** * 则管理中规则的类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RULE_TYPE { + public enum RULE_TYPE implements Enumerator { CANCEL_PLAN("CANCEL_PLAN", "取消计划"), MAT_CALC("MAT_CALC", "物料运算"), HEURISTIC("HEURISTIC", "排程运算"), @@ -265,10 +275,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -277,8 +289,7 @@ public class ApsEnumUtil { /** * 资源区分 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RESOURCE_CLASS { + public enum RESOURCE_CLASS implements Enumerator { LIMITLESS("LIMITLESS", "无限能力"), SINGLE("SINGLE", "单资源"), BATCH("BATCH", "炉资源"); @@ -291,10 +302,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -303,8 +316,7 @@ public class ApsEnumUtil { /** * 资源类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RESOURCE_TYPE { + public enum RESOURCE_TYPE implements Enumerator { MAIN("MAIN", "主资源"), ASS("ASS", "副资源"); @@ -316,10 +328,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -398,8 +412,7 @@ public class ApsEnumUtil { /** * 订单删除限制 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_DEL_LIMIT { + public enum ORDER_DEL_LIMIT implements Enumerator { NONE("NONE", "不限制"), NO_PO("NO_PO", "未计划"), NO_PLAN("NO_PLAN", "计划完毕"), @@ -414,10 +427,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -426,8 +441,7 @@ public class ApsEnumUtil { /** * 生产时间计算方法 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RES_COMB_TIME_TYPE { + public enum RES_COMB_TIME_TYPE implements Enumerator { MAIN_RESOURCE("MAIN_RESOURCE", "主资源"), MAX_ASS_RESOURCE("MAX_ASS_RESOURCE", "副资源最大值"), MIN_ASS_RESOURCE("MIN_ASS_RESOURCE", "副资源最小值"), @@ -444,10 +458,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -456,8 +472,7 @@ public class ApsEnumUtil { /** * 工艺路径有效性判断类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ROUTING_VALID_TYPE { + public enum ROUTING_VALID_TYPE implements Enumerator { ORDER_CALC_LET("ORDER_CALC_LET", "与订单的最晚结束时刻计算值做比较"), CALC_LET_LT("CALC_LET_LT", "与最晚结束时刻计算值-提前期做比较"), BASE_TIME("BASE_TIME", "与基准时刻做比较"); @@ -470,10 +485,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -482,8 +499,7 @@ public class ApsEnumUtil { /** * 使用类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USE_TYPE { + public enum USE_TYPE implements Enumerator { MAIN("MAIN", "主资源"), FIRST_ASS("FIRST_ASS", "第一套副资源"), SECOND_ASS("SECOND_ASS", "第二套副资源"), @@ -500,10 +516,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -512,8 +530,7 @@ public class ApsEnumUtil { /** * 工作计划类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_PLAN_TYPE { + public enum WORK_PLAN_TYPE implements Enumerator { MAIN_PLAN("MAIN_PLAN", "主资源计划"), ASS_PLAN("ASS_PLAN", "副资源计划"), BATCH_PLAN("BATCH_PLAN", "炉资源计划"); @@ -526,10 +543,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -538,8 +557,7 @@ public class ApsEnumUtil { /** * 工作关联类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_RELATION_TYPE { + public enum WORK_RELATION_TYPE implements Enumerator { INNER("INNER", "订单内关联"), OUTER("OUTER", "订单间关联"); @@ -551,10 +569,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -563,8 +583,7 @@ public class ApsEnumUtil { /** * 工作排序规则 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_SORT_RULE { + public enum WORK_SORT_RULE implements Enumerator { ORDER_LET("ORDER_LET", "订单最晚结束时刻计算值"), ORDER_PRIORITY("ORDER_PRIORITY", "订单优先级"), ORDER_EST("ORDER_EST", "订单最早开始时刻"), @@ -594,10 +613,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -606,8 +627,7 @@ public class ApsEnumUtil { /** * 工作状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_STATUS { + public enum WORK_STATUS implements Enumerator { NOPLAN("NOPLAN", "未计划"), PLANDONE("PLANDONE", "计划完毕"), INDICATIONDONE("INDICATIONDONE", "锁定"), @@ -623,10 +643,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -635,8 +657,7 @@ public class ApsEnumUtil { /** * 工作种类 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum WORK_TYPE { + public enum WORK_TYPE implements Enumerator { // 工作不参与排程，比如销售订单的工作 FICTITIOUS("FICTITIOUS", "虚拟工作"), // 动态虚拟工作为不计算生产时间。 @@ -652,10 +673,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -664,8 +687,7 @@ public class ApsEnumUtil { /** * 动态设置时间影响类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DYNAMIC_SET_TYPE { + public enum DYNAMIC_SET_TYPE implements Enumerator { PREV_SET("PREV_SET", "只对前设置影响"), POST_SET("POST_SET", "只对后设置影响"), ALL("ALL", "对前后设置都产生影响"); @@ -678,10 +700,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -690,8 +714,7 @@ public class ApsEnumUtil { /** * 动态设置事件取值方式 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DYNAMIC_SET_CALC { + public enum DYNAMIC_SET_CALC implements Enumerator { MIN("MIN", "取最小值"), MAX("MAX", "取最大值"), SUM("SUM", "求和"); @@ -704,10 +727,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -716,8 +741,7 @@ public class ApsEnumUtil { /** * 接续方式 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CONSTRAINT_TYPE { + public enum CONSTRAINT_TYPE implements Enumerator { ES("ES", "前工序结束，后工序开始"), SS("SS", "前工序开始，后工序开始"), EE("EE", "前工序结束，后工序结束"), @@ -731,10 +755,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -743,8 +769,7 @@ public class ApsEnumUtil { /** * 加班日历类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum CALENDAR_TYPE { + public enum CALENDAR_TYPE implements Enumerator { ENABLE("ENABLE", "加班"), DISABLE("DISABLE", "下班"); @@ -756,10 +781,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -768,8 +795,7 @@ public class ApsEnumUtil { /** * 导入类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum IMPORT_DETAIL_TYPE { + public enum IMPORT_DETAIL_TYPE implements Enumerator { REPLACE("REPLACE", "替代导入"), DIFF("DIFF", "差分导入"); @@ -781,10 +807,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -793,11 +821,10 @@ public class ApsEnumUtil { /** * 计划类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum PLAN_TYPE { - PREV_SET("", "前设置"), - PRODUCE("", "生产"), - POST_SET("", "后设置"); + public enum PLAN_TYPE implements Enumerator { + PREV_SET("PREV_SET", "前设置"), + PRODUCE("PRODUCE", "生产"), + POST_SET("POST_SET", "后设置"); private final String value; private final String description; @@ -807,10 +834,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -819,8 +848,7 @@ public class ApsEnumUtil { /** * 数据连接类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum DATA_LINK_TYPE { + public enum DATA_LINK_TYPE implements Enumerator { EXCEL("EXCEL", "EXCEL"), MYSQL("MYSQL", "MySql"), ORACLE("ORACLE", "Oracle"), @@ -834,10 +862,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -846,8 +876,7 @@ public class ApsEnumUtil { /** * 字段的编辑类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum EDIT_TYPE { + public enum EDIT_TYPE implements Enumerator { NONE("NONE", "未知"), BOOLEAN("BOOLEAN", "布尔, 开关编辑"), CHAR("CHAR", "字符, 文本框编辑"), @@ -876,10 +905,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -888,8 +919,7 @@ public class ApsEnumUtil { /** * 字段类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FIELD_TYPE { + public enum FIELD_TYPE implements Enumerator { NONE("NONE", "未知"), BOOLEAN("BOOLEAN", "布尔"), CHAR("CHAR", "字符"), @@ -915,10 +945,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -927,8 +959,7 @@ public class ApsEnumUtil { /** * 资源符合时间间隔类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum RESOURCE_LOAD_SPAN { + public enum RESOURCE_LOAD_SPAN implements Enumerator { ONE_HOUR("ONE_HOUR", "1小时"), TWO_HOUR("TWO_HOUR", "2小时"), SIX_HOUR("SIX_HOUR", "6小时"), @@ -946,10 +977,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -958,8 +991,7 @@ public class ApsEnumUtil { /** * 订单状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum ORDER_STATUS { + public enum ORDER_STATUS implements Enumerator { NOPLAN("NOPLAN", "未计划"), PLANDONE("PLANDONE", "计划完毕"), INDICATIONDONE("INDICATIONDONE", "指示完毕"), @@ -975,10 +1007,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -987,8 +1021,7 @@ public class ApsEnumUtil { /** * 销售订单状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SALES_ORDER_STATUS { + public enum SALES_ORDER_STATUS implements Enumerator { WAITING("WAITING", "待处理"), CHANGE("CHANGE", "改带"), COMMIT("COMMIT", "确认"); @@ -1001,10 +1034,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1013,8 +1048,7 @@ public class ApsEnumUtil { /** * 销售订单拆分下发 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SALES_ORDER_SPLIT_STATUS { + public enum SALES_ORDER_SPLIT_STATUS implements Enumerator { NONE("NONE", "不拆分下发"), SPLIT_MAIN("SPLIT_MAIN", "拆分下发（主）"), SPLIT_CHILD("SPLIT_CHILD", "拆分下发（子）"); @@ -1027,10 +1061,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1039,8 +1075,7 @@ public class ApsEnumUtil { /** * 库存订单状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SAFE_STOCK_ORDER_STATUS { + public enum SAFE_STOCK_ORDER_STATUS implements Enumerator { UNCOMMIT("UNCOMMIT", "待处理"), COMMIT("COMMIT", "确认"); @@ -1052,10 +1087,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1064,8 +1101,7 @@ public class ApsEnumUtil { /** * 插单状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum INSERTED_ORDER_STATUS { + public enum INSERTED_ORDER_STATUS implements Enumerator { UNCOMMIT("UNCOMMIT", "待处理"), COMMIT("COMMIT", "确认"); @@ -1077,10 +1113,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1089,8 +1127,7 @@ public class ApsEnumUtil { /** * 插单状态 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum FEED_BACK_STATUS { + public enum FEED_BACK_STATUS implements Enumerator { UNCOMMIT("UNCOMMIT", "未提交"), COMMIT("COMMIT", "提交"); @@ -1102,10 +1139,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } @@ -1114,8 +1153,7 @@ public class ApsEnumUtil { /** * 订单类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum APS_ORDER_TYPE { + public enum APS_ORDER_TYPE implements Enumerator { SALES_ORDER("SALES_ORDER", "S", "销售订单"), PRODUCT_ORDER("PRODUCT_ORDER", "M", "生产订单"), PURCHASE_ORDER("PURCHASE_ORDER", "P", "采购订单"), @@ -1134,12 +1172,14 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } public String getPrefix() { return prefix; } + @Override public String getDescription() { return description; } @@ -1148,8 +1188,7 @@ public class ApsEnumUtil { /** * 工序类型 */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum SANLUX_OPERATION_TYPE { + public enum SANLUX_OPERATION_TYPE implements Enumerator { NORMAL("NORMAL", "正常工序"), FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"), FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间自动牵纱"), @@ -1170,10 +1209,12 @@ public class ApsEnumUtil { this.description = description; } + @Override public String getValue() { return value; } + @Override public String getDescription() { return description; } From ff2a588a7cddbd9b4d66141fc791327251d8e81d Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Thu, 17 Feb 2022 18:28:12 +0800 Subject: [PATCH 55/86] =?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; From 3a467129082512fba7f2fc37d30bcd88a7d51329 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 25 Feb 2022 16:39:23 +0800 Subject: [PATCH 56/86] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=9D=8E=E4=BF=8A?= =?UTF-8?q?=E7=94=9F=E4=BB=A3=E7=A0=81--#19995=2019081-WMS=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E6=8C=82=E6=8E=89-PDA=E6=97=A0=E6=B3=95=E4=BD=BF?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java index 7d44dc5..f3d5507 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsVendorPart.java @@ -72,7 +72,8 @@ public class WmsVendorPart extends BaseBean { private String vendorName; @Column(name = "GRADE") - @ApiParam("供应商等级") + @ApiParam("加严") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String grade; @Column(name = "REMARK") From 1c26e8803cd6d8b8e6627a06eb736e3a1d633952 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 2 Mar 2022 11:31:16 +0800 Subject: [PATCH 57/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=98=E5=8E=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java index e40a718..14c7802 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java @@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -51,5 +52,6 @@ public class ResGanttTable extends BaseAPS { private transient ApsEnumUtil.EDIT_TYPE editType; @ApiParam(value ="枚举项内容") + @JsonIgnore private transient Enum[] enumItems; } From b4873a4740119b9d76d0fd53d74ffb358f527612 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 4 Mar 2022 10:31:39 +0800 Subject: [PATCH 58/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=98=E5=8E=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java index 14c7802..595ff9a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java @@ -52,6 +52,5 @@ public class ResGanttTable extends BaseAPS { private transient ApsEnumUtil.EDIT_TYPE editType; @ApiParam(value ="枚举项内容") - @JsonIgnore private transient Enum[] enumItems; } From a1d17f45c26ce2131a0ca54b6872c8923f2399e2 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 8 Mar 2022 16:23:00 +0800 Subject: [PATCH 59/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=87=E4=BB=BD?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=98=E5=8E=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 786ee6e..11507d3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -66,6 +66,11 @@ public class ProductRouting extends BaseAPS { @FieldAnnotation(defaultValue = "10") private Integer priority; + @Column(name="ROUTING_CHANGE") + @ApiParam(value ="工艺路径变更") + @FieldAnnotation(display = false) + private Boolean routingChange; + @JsonIgnore public Material getMaterial() { return BeanRelation.get(this, EProductRouting.Material); From 0c1bb120efef0a6d7770fc9ea5d578a36ca24a04 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Fri, 11 Mar 2022 11:20:13 +0800 Subject: [PATCH 60/86] =?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 8ff044cbd01c66642309228c7ad53c506554d4af Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 14 Mar 2022 21:46:22 +0800 Subject: [PATCH 61/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=87=E4=BB=BD=E8=BF=98=E5=8E=9F=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index b770cbd..7b07ac9 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -40,6 +40,12 @@ public class BeanRelation { return relation; } + public static void clear() { + for (Map.Entry, Map, List>>> entry : get().caches.entrySet()) { + entry.getValue().clear(); + } + } + private static Map, List> createRelation(Class cls) { Map, List> result = new HashMap<>(); BeanInfo beanInfo = BeanInfo.getBeanInfo(cls); From cdd2eda3accfd638ff8ad7c90b8a849ae00ca1b2 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Thu, 17 Mar 2022 14:23:48 +0800 Subject: [PATCH 62/86] =?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 63/86] =?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); } From e4b9d076f2702b210b33bcb0a2e74a16f899f3e6 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Mar 2022 13:15:46 +0800 Subject: [PATCH 64/86] =?UTF-8?q?=E6=A0=B8=E5=BF=83=E5=8C=85=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/bean/HeuristicOptimize.java | 63 ---------------------- .../estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 6 +-- .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 6 --- .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 5 -- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 14 ++--- .../repository/HeuristicOptimizeRepository.java | 9 ---- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 29 +--------- 7 files changed, 11 insertions(+), 121 deletions(-) delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java deleted file mode 100644 index decdc04..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java +++ /dev/null @@ -1,63 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.bean; - -import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; -import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; -import io.swagger.annotations.Api; -import io.swagger.annotations.ApiParam; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Lob; -import javax.persistence.Table; - -/** - * @Description : 排程优化规则 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2021-03-24 - * @Modify: - **/ -@Data -@EqualsAndHashCode(callSuper = true) -@Entity -@Table(name = "APS_HEURISTIC_OPTIMIZE") -@Api("排程优化规则") -public class HeuristicOptimize extends BaseRule { - private static final long serialVersionUID = -464821596740369199L; - - @Column(name="WORK_FILTER") - @ApiParam(value ="工作筛选") - private String workFilter; - - @Lob - @Column(name="WORK_SORT") - @ApiParam(value ="工作排序") - private String workSort; - - @Column(name="RES_FILTER") - @ApiParam(value ="资源筛选") - private String resFilter; - - @Lob - @Column(name="RES_SELECT") - @ApiParam(value ="资源选择") - private String resSelect; - - @Column(name="WAITING_TIME") - @ApiParam(value ="最大等待时间") - private String waitingTime; - - @Column(name="OPTIMIZE_INTERVAL") - @ApiParam(value ="优化间隔") - private String optimizeInterval; - - @Column(name="MAX_WAITING_LIMIT") - @ApiParam(value ="最大等待时间限制") - private Boolean maxWaitingLimit; - - @Column(name="MAX_WAITING_ADJUST") - @ApiParam(value ="最大等待时间调整") - private Boolean maxWaitingAdjust; -} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java index a529eb1..2173165 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java @@ -31,9 +31,9 @@ public class HeuristicRule extends BaseRule { @ApiParam(value ="工作筛选") private String workFilter; - @Column(name="RES_FILTER") - @ApiParam(value ="资源筛选") - private String resFilter; +// @Column(name="RES_FILTER") +// @ApiParam(value ="资源筛选") +// private String resFilter; @Lob @Column(name="WORK_SORT") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index 7f452ee..e674109 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -68,10 +68,4 @@ public class MatCalcRule extends BaseRule { @Column(name="BATCH_SUPPLY") @ApiParam(value ="批量补充") private Boolean batchSupply; - - @Column(name="ASSIGN_LIMIT") - @ApiParam(value ="物料分配制约") - @FieldAnnotation(multiEnumClass = ApsEnumUtil.MATERIAL_ASSIGN_LIMIT.class) - private Integer assignLimit; - } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index 4f12d7c..ac6b52f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -37,11 +37,6 @@ public class SysParam extends BaseAPS { @FieldAnnotation(defaultValue = "20") private Integer maxInterruptCount = 20; - @Column(name="TYPE") - @ApiParam(value ="工艺路径有效判断类型") - @FieldAnnotation(defaultValue = "CALC_LET_LT") - private ApsEnumUtil.ROUTING_VALID_TYPE type; - @Column(name="RULE_GROUP_ID") @ApiParam(value ="规则组id") @FieldAnnotation(display = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 512a232..e786510 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -132,10 +132,10 @@ public class Work extends BaseAPS { @ApiParam(value ="已分割的工作是否固定") private Boolean fixSplit; - @Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)") - @ApiParam(value ="需要的前工作数量") - @FieldAnnotation(display = false, modify = false) - private Double needPrevCount; +// @Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)") +// @ApiParam(value ="需要的前工作数量") +// @FieldAnnotation(display = false, modify = false) +// private Double needPrevCount; @Column(name="SCH_FAILED") @ApiParam(value ="是否排程失败") @@ -175,9 +175,9 @@ public class Work extends BaseAPS { @ApiParam(value ="动态拆分工作ID") private Long originWorkId; - @Column(name="SUPPLY_WORK_CODE") - @ApiParam(value ="补满模工作编码") - private String supplyWorkCode; +// @Column(name="SUPPLY_WORK_CODE") +// @ApiParam(value ="补满模工作编码") +// private String supplyWorkCode; @ApiParam(value ="工作排序顺序") private Integer workSeqNumber; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java deleted file mode 100644 index fe72851..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/HeuristicOptimizeRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.repository; - -import cn.estsh.i3plus.pojo.aps.bean.HeuristicOptimize; -import org.springframework.data.repository.CrudRepository; -import org.springframework.stereotype.Repository; - -@Repository -public interface HeuristicOptimizeRepository extends CrudRepository { -} 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 a42ca6c..5451650 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 @@ -378,7 +378,7 @@ public class ApsEnumUtil { PRODUCE_TIME("PRODUCE_TIME", "生产时间"), POST_SET_TIME("POST_SET_TIME", "后设置时间"), WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"), - WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"), +// WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"), WAIT_END_SUB_LEFT("WAIT_END_SUB_LEFT", "工作结束时间减去左边界"), RES_BALANCE("RES_BALANCE", "资源均衡度"), SAME_MATERIAL("SAME_MATERIAL", "相同物料"), @@ -470,33 +470,6 @@ public class ApsEnumUtil { } /** - * 工艺路径有效性判断类型 - */ - public enum ROUTING_VALID_TYPE implements Enumerator { - ORDER_CALC_LET("ORDER_CALC_LET", "与订单的最晚结束时刻计算值做比较"), - CALC_LET_LT("CALC_LET_LT", "与最晚结束时刻计算值-提前期做比较"), - BASE_TIME("BASE_TIME", "与基准时刻做比较"); - - private final String value; - private final String description; - - ROUTING_VALID_TYPE(String value, String description) { - this.value = value; - this.description = description; - } - - @Override - public String getValue() { - return value; - } - - @Override - public String getDescription() { - return description; - } - } - - /** * 使用类型 */ public enum USE_TYPE implements Enumerator { From 18400f3c7e28fbbd1c7aca4dd38cb372c5f975fb Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 23 Mar 2022 16:44:58 +0800 Subject: [PATCH 65/86] =?UTF-8?q?sweb=E7=BB=9F=E4=B8=80=E7=99=BB=E5=BD=95-?= =?UTF-8?q?-=E6=B7=BB=E5=8A=A0platform=E6=9E=9A=E4=B8=BE=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/CommonEnumUtil.java | 66 +++++++++++++++++++++- 1 file changed, 65 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 947138e..2b48693 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -94,7 +94,12 @@ public class CommonEnumUtil { /** * 智能调度系统 */ - LEO(50, 8234, 0, 106000000L, "impp-leo", "智能调度系统"); + LEO(50, 8234, 0, 106000000L, "impp-leo", "智能调度系统"), + + /** + * SWEB调用 + */ + SWEB_VENDOR(666,8810,0,0,"sweb-vendor","供应商客户端服务"); /** * 产品ID @@ -1059,7 +1064,66 @@ public class CommonEnumUtil { return tmp; } } + /** + * 客户端授权子系统标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum AUTH_PLATFORM { + PC_IMPP_CORE(10, "PC-IMPP", "PC平台管理端"), + PC_WMS_SWEB(20, "PC-SWEB", "PC_SWEB后台管理端"); + + + private int value; + private String name; + private String description; + + AUTH_PLATFORM() { + } + + AUTH_PLATFORM(int value, String name, String description) { + this.value = value; + this.name = name; + this.description = description; + } + + public int getValue() { + return value; + } + public String getDescription() { + return description; + } + + public String getName() { + return name; + } + + public static AUTH_PLATFORM valueOf(int val) { + AUTH_PLATFORM tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i]; + } + } + return tmp; + } + + /** + * -1 未识别操作系统 + * + * @param desc + * @return + */ + public static int descOf(String desc) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (values()[i].name.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } +} /** * 用户登录状态 */ From 317d1c6129312c13dcd359a72d4a671ee66d2c31 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 25 Mar 2022 15:43:26 +0800 Subject: [PATCH 66/86] =?UTF-8?q?sweb=E4=BE=9B=E5=BA=94=E5=95=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A9=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sweb/modelbean/SwebUpdateVendorPwdModel.java | 29 ++++++++++++++++++++++ .../pojo/sweb/modelbean/SwebVerifyVendorModel.java | 24 ++++++++++++++++++ 2 files changed, 53 insertions(+) create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebUpdateVendorPwdModel.java create mode 100644 modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebVerifyVendorModel.java diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebUpdateVendorPwdModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebUpdateVendorPwdModel.java new file mode 100644 index 0000000..be530c7 --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebUpdateVendorPwdModel.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/3/24 16:20 + * @Modify: + **/ +@Data +@ApiModel("供应商自助修改密码") +public class SwebUpdateVendorPwdModel { + + @ApiModelProperty("供应商登录名") + private String loginName; + + @ApiModelProperty("供应商邮箱") + private String email; + + @ApiModelProperty("供应商新密码") + private String password; + + @ApiModelProperty("验证码") + private String authCode; +} diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebVerifyVendorModel.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebVerifyVendorModel.java new file mode 100644 index 0000000..2111b3b --- /dev/null +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/modelbean/SwebVerifyVendorModel.java @@ -0,0 +1,24 @@ +package cn.estsh.i3plus.pojo.sweb.modelbean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/3/23 22:54 + * @Modify: + **/ +@Data +@ApiModel(value = "供应商验证对象") +public class SwebVerifyVendorModel { + + @ApiModelProperty(value = "供应商登录名") + private String loginName; + + @ApiModelProperty(value = "供应商邮箱") + private String email; + +} From 42a4d10770f41a726a3b24e662d4c922351a04f7 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 25 Mar 2022 15:53:03 +0800 Subject: [PATCH 67/86] =?UTF-8?q?sweb=E4=BE=9B=E5=BA=94=E5=95=86=E8=87=AA?= =?UTF-8?q?=E5=8A=A9=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/model/common/ImppEmail.java | 29 ++++++++++++++++++++++ .../estsh/i3plus/pojo/model/common/UserModel.java | 21 ++++++++++++++++ .../pojo/model/platform/UserDetailModel.java | 5 +++- .../estsh/i3plus/pojo/platform/bean/SysUser.java | 6 +++++ 4 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppEmail.java create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/UserModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppEmail.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppEmail.java new file mode 100644 index 0000000..b29e63c --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/ImppEmail.java @@ -0,0 +1,29 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/3/24 1:00 + * @Modify: + **/ +@Data +@ApiModel(value = "平台发送邮件model") +public class ImppEmail { + + @ApiModelProperty(value = "邮箱") + private String email; + + @ApiModelProperty(value = "消息内容") + private String content; + + @ApiModelProperty(value = "subject") + private String subject; + + @ApiModelProperty(value = "nick") + private String nick; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/UserModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/UserModel.java new file mode 100644 index 0000000..77a1f67 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/common/UserModel.java @@ -0,0 +1,21 @@ +package cn.estsh.i3plus.pojo.model.common; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : Castle + * @CreateDate : 2022/3/24 15:24 + * @Modify: + **/ +@Data +@ApiModel(value = "供应商忘记密码") +public class UserModel { + @ApiModelProperty("登录名") + private String loginName; + @ApiModelProperty("新密码") + private String password; +} diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java index 5054632..901f40b 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/platform/UserDetailModel.java @@ -163,6 +163,9 @@ public class UserDetailModel extends BaseBean { @ApiParam(value ="登录次数") private Integer userLoginNum; + @ApiParam(value = "登录平台权限") + private String authPlatform; + public SysUser getSysUser(){ SysUser user = new SysUser(); user.setId(!StringUtils.isBlank(this.userId) ? Long.parseLong(this.userId) : null); @@ -176,7 +179,7 @@ public class UserDetailModel extends BaseBean { user.setLanguageCode(this.userLanguageCode); user.setOrganizeCode(this.organizeCode); user.setUserLoginNum(this.userLoginNum); - + user.setAuthPlatform(this.authPlatform); return user; } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java index 2e48409..ca1d071 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysUser.java @@ -97,6 +97,12 @@ public class SysUser extends BaseBean { @ApiParam(value = "账号最后登录时间") private String userLoginLastDateTime; + /** + * 枚举类型 + */ + @Column(name = "AUTH_PLATFORM") + @ApiParam(value = "账号授权的应用列表") + private String authPlatform; /********************************** 关系信息 ********************************/ @Column(name = "DEPARTMENT_ID") From 0c7f2ccccb2deee1346467282cb65ee2aee2a2b4 Mon Sep 17 00:00:00 2001 From: Dominic_Xiao <1003069915@qq.com> Date: Sat, 2 Apr 2022 10:10:23 +0800 Subject: [PATCH 68/86] =?UTF-8?q?=E4=BA=8C=E8=BD=A6=E9=97=B4=E6=A8=A1?= =?UTF-8?q?=E5=85=B7=E9=80=89=E6=8B=A9=E8=B5=84=E6=BA=90=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/PlanFeedback.java | 30 ++++++++++++---------- 1 file changed, 16 insertions(+), 14 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 28b3300..12041dd 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 @@ -34,30 +34,30 @@ import javax.persistence.Table; public class PlanFeedback extends BaseAPS { private static final long serialVersionUID = 2520555825093741381L; - @Column(name="WORK_ID") - @ApiParam(value ="工作") + @Column(name = "WORK_ID") + @ApiParam(value = "工作") @FieldAnnotation(popSearch = true, mainkey = true, relation = "Work") private Long workId; - @Column(name="TOP_ORDER_ID") - @ApiParam(value ="顶层订单") - @FieldAnnotation(popSearch = true, relation = "Order") + @Column(name = "TOP_ORDER_ID") + @ApiParam(value = "顶层订单") + @FieldAnnotation(popSearch = true, mainkey = true, relation = "Order") private Long topOrderId; - @Column(name="STATUS") - @ApiParam(value ="状态") + @Column(name = "STATUS") + @ApiParam(value = "状态") private ApsEnumUtil.FEED_BACK_STATUS status; - @Column(name="PLAN_COUNT") - @ApiParam(value ="计划完成数量") + @Column(name = "PLAN_COUNT") + @ApiParam(value = "计划完成数量") private Double planCount; - @Column(name="ACTUAL_COUNT") - @ApiParam(value ="实际完成数量") + @Column(name = "ACTUAL_COUNT") + @ApiParam(value = "实际完成数量") private Double actualCount; - @Column(name="REMARK") - @ApiParam(value ="备注") + @Column(name = "REMARK") + @ApiParam(value = "备注") private String remark; @JsonIgnore @@ -71,7 +71,9 @@ public class PlanFeedback extends BaseAPS { } @JsonIgnore - public BaseOrder getTopOrder() { return BeanRelation.get(this, EPlanFeedback.TopOrder); } + public BaseOrder getTopOrder() { + return BeanRelation.get(this, EPlanFeedback.TopOrder); + } public void setTopOrder(BaseOrder topOrder) { this.topOrderId = topOrder != null ? topOrder.getId() : 0L; From 810a6c2cd714dbad8df9ece1138f9a501e242806 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 8 Apr 2022 22:53:47 +0800 Subject: [PATCH 69/86] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=94=E7=BB=84?= =?UTF-8?q?=E5=B8=A6=E7=BB=84=E7=82=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java index ed3ecd1..ff0c36b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java @@ -44,9 +44,9 @@ public class FurnacePlan extends BaseAPS { @ApiParam(value ="容量限制") private Double capacityLimit; - @Column(name="MIN_PRODUCT_BATCH") - @ApiParam(value ="最小加工批量") - private Integer minProductBatch; + @Column(name="REMAIN_CAPACITY") + @ApiParam(value ="剩余可组炉容量") + private Double remainCapacity; @Column(name="FIX_PLAN") @ApiParam(value ="固定组炉的计划") From 0a2b6bccd14511e48a8ee8511fba82be7b3edc84 Mon Sep 17 00:00:00 2001 From: backo880607 Date: Sat, 16 Apr 2022 11:09:51 +0800 Subject: [PATCH 70/86] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=8F=AD=E6=AC=A1=E6=97=B6=E9=97=B4=E6=AE=B5?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java index c5bcd46..121b8bf 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/validator/ShiftTimeValidator.java @@ -15,7 +15,7 @@ public class ShiftTimeValidator implements ConstraintValidator Date: Sun, 17 Apr 2022 03:54:53 +0800 Subject: [PATCH 71/86] =?UTF-8?q?=E6=B7=BB=E5=8A=A0token=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java | 6 +++++- .../main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java index 2ba35cf..7c2a3fc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/BaseToken.java @@ -22,13 +22,17 @@ public class BaseToken implements AuthenticationToken { this.languageCode = languageCode; } - public BaseToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { + public BaseToken(String loginName, String loginPwd, String languageCode, Integer loginPlatform) { this.loginName = loginName; this.loginPwd = loginPwd; this.languageCode = languageCode; this.loginPlatform = loginPlatform; } + public BaseToken(String loginName) { + this.loginName = loginName; + } + //身份 @Override public Object getPrincipal() { diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java index 9d6cf59..4c1ee78 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/shirotoken/UserToken.java @@ -13,7 +13,11 @@ public class UserToken extends BaseToken { super(loginName, loginPwd, languageCode); } - public UserToken(String loginName, String loginPwd, String languageCode,Integer loginPlatform) { - super(loginName, loginPwd, languageCode,loginPlatform); + public UserToken(String loginName, String loginPwd, String languageCode, Integer loginPlatform) { + super(loginName, loginPwd, languageCode, loginPlatform); + } + + public UserToken(String loginName) { + super(loginName); } } From fbd74baacb68d55a7bf2130ed569716ceea13c8c Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Mon, 18 Apr 2022 11:34:32 +0800 Subject: [PATCH 72/86] =?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 --- .../cn/estsh/i3plus/pojo/aps/bean/ProductLine.java | 51 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 13 ++++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 3 ++ .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 4 ++ .../estsh/i3plus/pojo/aps/holders/EResource.java | 1 + .../estsh/i3plus/pojo/aps/model/MouldRecord.java | 19 ++++++++ .../pojo/aps/repository/ProductLineRepository.java | 16 +++++++ .../src/main/resources/relations/Resource.xml | 2 + .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 29 ++++++++++++ 9 files changed, 138 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MouldRecord.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductLineRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java new file mode 100644 index 0000000..997df13 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java @@ -0,0 +1,51 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description :产线 + * @Reference : + * @Author : pantianhu + * @CreateDate : 2022-03-29 11:26 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_PRODUCT_LINE") +@Api("产线信息") +@ClassLevelAnnotation(level = 0) +public class ProductLine extends BaseAPS { + private static final long serialVersionUID = 6900226668783322736L; + + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="NAME") + @ApiParam(value ="名称") + @FieldAnnotation(popSearch = true) + private String name; + + @Column(name="TYPE") + @ApiParam(value ="产线类型") + private ApsEnumUtil.SANLUX_PRODUCT_TYPE type; + + @Column(name="PRODUCT_QUALITY") + @ApiParam(value ="指定品质") + private String productQuality; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index 56f200c..495d597 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -108,6 +108,11 @@ public class Resource extends BaseAPS { @FieldAnnotation(relation = "Order", modify = false) private Long bindResourceId; + @Column(name="PRODUCT_LINE_ID") + @ApiParam(value ="生产线") + @FieldAnnotation(relation = "ProductLine") + private Long productLineId; + @JsonIgnore public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); } @@ -116,6 +121,14 @@ public class Resource extends BaseAPS { BeanRelation.set(this, EResource.WorkShop, workShop); } + @JsonIgnore + public ProductLine getProductLine() { return BeanRelation.get(this, EResource.ProductLine); } + + public void setProductLine(ProductLine productLine) { + this.productLineId = productLine != null ? productLine.getId() : 0L; + BeanRelation.set(this, EResource.ProductLine, productLine); + } + @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index e786510..5dce5e3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -182,6 +182,9 @@ public class Work extends BaseAPS { @ApiParam(value ="工作排序顺序") private Integer workSeqNumber; + @ApiParam(value ="工作品质顺序") + private Integer workSeqQuality; + @Column(name="MOULD_ID") @ApiParam(value ="模具能力id") @FieldAnnotation(property = false) 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..b7f3790 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,10 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="模具编码") private String mouldCode; + @Column(name="LINE_PRIORITY") + @ApiParam(value ="产线优先级") + private String linePriority; + @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/EResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java index 70d4432..14634d6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResource.java @@ -12,4 +12,5 @@ public enum EResource { WorkPlans, BindResource, SubBindResources, + ProductLine } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MouldRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MouldRecord.java new file mode 100644 index 0000000..4432fbf --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/MouldRecord.java @@ -0,0 +1,19 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import lombok.Data; + +import java.util.Date; +import java.util.Map; + +/** + * @Description : + * @Reference : + * @Author : pantianhu + * @CreateDate : 2022-02-25 11:22 + * @Modify: + **/ +@Data +public class MouldRecord { + private Date shifTime; + private Map mouldMap; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductLineRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductLineRepository.java new file mode 100644 index 0000000..d69ec0e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ProductLineRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ProductLine; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description :产线信息 + * @Reference : + * @Author : pantianhu + * @CreateDate : 2022-04-01 9:46 + * @Modify: + **/ +@Repository +public interface ProductLineRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml index 285dc24..49c7e9b 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Resource.xml @@ -6,4 +6,6 @@ + + \ No newline at end of file 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 5451650..dd8e083 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 @@ -1197,4 +1197,33 @@ public class ApsEnumUtil { return description; } } + + /** + * 产线类型 + */ + public enum SANLUX_PRODUCT_TYPE implements Enumerator { + ONE_LINE("ONE_LINE", "汽车带1号线"), + TWO_LINE("TWO_LINE", "汽车带2号线"), + THREE_LINE("THREE_LINE", "汽车带3号线"), + SEVEN_LINE("SEVEN_LINE", "汽车带7号线"), + EIGHT_LINE("EIGHT_LINE", "汽车带8号线"); + + private final String value; + private final String description; + + SANLUX_PRODUCT_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + @Override + public String getValue() { + return value; + } + + @Override + public String getDescription() { + return description; + } + } } From e2f8c1c0fd4d1414033eea40b66ebe227a946796 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Wed, 20 Apr 2022 17:08:08 +0800 Subject: [PATCH 73/86] =?UTF-8?q?=E6=B1=BD=E8=BD=A6=E5=B8=A6=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 5dce5e3..4c2125f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -195,6 +195,14 @@ public class Work extends BaseAPS { @FieldAnnotation(modify = false) private Boolean feedbackSplit; + @Column(name="MOULD_NUM") + @ApiParam(value ="模具数量") + private Integer mouldNum; + + @Column(name="MOULD_CODE") + @ApiParam(value ="模具编码") + private String mouldCode; + // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; From 52aafa0bf4952b43e37c077c47cf781a271a1496 Mon Sep 17 00:00:00 2001 From: backo880607 Date: Tue, 26 Apr 2022 18:05:09 +0800 Subject: [PATCH 74/86] =?UTF-8?q?=E5=9B=9B=E8=BD=A6=E9=97=B4=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E6=8B=86=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index ccde55a..6f08046 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -67,6 +67,11 @@ public class StandOperation extends BaseAPS { // 刷新计划时将一天时间按块分割，后工作在本工作的下一时间块中排程。 private String flushTimeBlock; + @Column(name="BASE_TIME_LIMIT") + @ApiParam(value ="基准时间限制") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String baseTimeLimit; + @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") From 8084d7d11a9acb739ee0892289e6111cddc04ace Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Wed, 27 Apr 2022 14:20:10 +0800 Subject: [PATCH 75/86] =?UTF-8?q?=E6=B7=BB=E5=8A=A0soft=5Ftype=EF=BC=8Ceam?= =?UTF-8?q?=5Fpad?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 1332433..33ff8cb 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -96,6 +96,10 @@ public class CommonEnumUtil { * 智能调度系统 */ LEO(50, 8234, 0, 106000000L, "impp-leo", "智能调度系统"), + /** + * EAM_PAD + */ + EAM_PAD(109, 8500, 28, 211000000L, "eam-pad", "设备信息管理服务pad"), /** * SWEB调用 From 11ecbe124ae2da88238c3443eed1bb3d32bc23ed Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Tue, 17 May 2022 10:40:54 +0800 Subject: [PATCH 76/86] =?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/ProductLine.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java index 997df13..96321d5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductLine.java @@ -48,4 +48,8 @@ public class ProductLine extends BaseAPS { @Column(name="PRODUCT_QUALITY") @ApiParam(value ="指定品质") private String productQuality; + + @Column(name="SHIFT_LIMIT_NUM") + @ApiParam(value ="多楔带限制模数") + private Integer shiftLimitNum; } From f7f1b464033c8125e061521220d6173e9012d5e7 Mon Sep 17 00:00:00 2001 From: backo880607 Date: Wed, 18 May 2022 15:07:36 +0800 Subject: [PATCH 77/86] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92=E4=B8=8B=E7=8F=AD=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 6f08046..e11de37 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -72,6 +72,11 @@ public class StandOperation extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String baseTimeLimit; + @Column(name="OVER_SHIFT_SPLIT_LIMIT") + @ApiParam(value ="跨班次时间限制") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String overShiftSplitLimit; + @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") From 9d070c974cfad7d5b308cded009e786ad2f5e782 Mon Sep 17 00:00:00 2001 From: backo880607 Date: Tue, 24 May 2022 14:09:50 +0800 Subject: [PATCH 78/86] =?UTF-8?q?=E4=BA=8C=E8=BD=A6=E9=97=B4=E6=8E=92?= =?UTF-8?q?=E7=A8=8B=E9=80=BB=E8=BE=91=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/model/PlanRecord.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java index 0aa3d16..dba969e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/PlanRecord.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.pojo.aps.model; -import cn.estsh.i3plus.pojo.aps.bean.FurnacePlan; -import cn.estsh.i3plus.pojo.aps.bean.Resource; -import cn.estsh.i3plus.pojo.aps.bean.WorkPlan; -import cn.estsh.i3plus.pojo.aps.bean.WorkResource; +import cn.estsh.i3plus.pojo.aps.bean.*; import lombok.Data; /** @@ -19,6 +16,7 @@ public class PlanRecord { * 需要插入的工作计划 */ private WorkPlan plan; + private Work work; /** * 插入到目标资源 */ From d37904f596c4414b8794ad6b1ed48b34cdaeb76c Mon Sep 17 00:00:00 2001 From: backo880607 Date: Tue, 24 May 2022 14:10:20 +0800 Subject: [PATCH 79/86] =?UTF-8?q?=E4=BA=8C=E8=BD=A6=E9=97=B4=E6=8E=92?= =?UTF-8?q?=E7=A8=8B=E9=80=BB=E8=BE=91=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/common/BaseAPS.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java index 90d39a9..320ed77 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java @@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.annotations.ApiParam; +import io.swagger.models.auth.In; import lombok.Data; import javax.persistence.Column; @@ -79,6 +80,8 @@ public abstract class BaseAPS extends BaseBean { return Double.valueOf((String) value); } else if(value.getClass() == Double.class) { return (Double)value; + } else if (value.getClass() == Integer.class) { + return ((Integer)value).doubleValue(); } return null; } From 2bfb08f143cbddb825b2d35e28ab177aa075976c Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Sun, 5 Jun 2022 13:55:40 +0800 Subject: [PATCH 80/86] =?UTF-8?q?=E5=90=88=E5=B9=B6=E7=8E=8B=E5=AE=9D?= =?UTF-8?q?=E7=8E=89-wmsStockSn=20-=E5=A2=9E=E5=8A=A0=E6=9E=84=E9=80=A0?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java index b85857b..bceef8b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java @@ -1173,4 +1173,26 @@ public class WmsStockSn extends BaseBean { this.queueGroupNo = queueGroupNo; this.remark = remark; } + + + public WmsStockSn(String organizeCode, String batchNo, String sn, String workCenterCode, String partNo, + String partNameRdd, String shippingFlag,Double qty, String leftCode, String createUser, String createDatetime, + String modifyUser, String modifyDatetime) { + this.organizeCode = organizeCode; + this.batchNo = batchNo; + this.sn = sn; + this.workCenterCode = workCenterCode; + this.partNo = partNo; + this.partNameRdd = partNameRdd; + this.shippingFlag = shippingFlag; + this.qty = qty; + this.leftCode = leftCode; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + + + + } } From 58ab257424d7e8bb6d7c0e827cf649d7671bf220 Mon Sep 17 00:00:00 2001 From: backo880607 Date: Fri, 10 Jun 2022 11:20:35 +0800 Subject: [PATCH 81/86] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=AA=E6=8A=A5?= =?UTF-8?q?=E5=B7=A5=E6=8F=90=E4=BA=A4=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 26fabac..9e7c5d9 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -204,6 +204,8 @@ dataSrc ="cn.estsh.i3plus.pojo.wms.bean.WmsLocate", @Transient @ApiParam("库存地代码") private String areaNo; + @ApiParam("单号") + private String orderNo; public WmsTransQuan(){} From df3228d51e18582c7a23f1d5daa9655cc70bcce6 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Thu, 14 Jul 2022 14:50:25 +0800 Subject: [PATCH 82/86] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BF=8A=E7=94=9F--?= =?UTF-8?q?=E5=B9=BF=E4=B8=9C=E5=B7=A5=E5=8D=95=E6=8B=89=E5=8A=A8=E9=9C=80?= =?UTF-8?q?=E8=A6=81'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java index 6e91f92..f52b279 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/BlockSoftSwitchEnumUtil.java @@ -136,6 +136,7 @@ public class BlockSoftSwitchEnumUtil { /* Restful */ CLIENT_RESTFUL_IMPP(SUIT_MODE.CLIENT,CASE_TYPE.RESTFUL,120001,"Client REST客户端适配器"), SERVER_RESTFUL_IMPP(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,220001,"Client REST服务端适配器"), + CLIENT_RESTFUL_LEO(SUIT_MODE.SERVER,CASE_TYPE.RESTFUL,120002,"Client REST客户端调用webservice适配器"), /* Socket */ SERVER_SOCKET_HELLO(SUIT_MODE.SERVER ,CASE_TYPE.SOCKET,210001,"Socket Server Hello测试服务"), From fa24089d9a2365957489499b2baf9315f46a7b79 Mon Sep 17 00:00:00 2001 From: "andly.pan" Date: Fri, 29 Jul 2022 13:33:15 +0800 Subject: [PATCH 83/86] =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/bean/DeleteOrderHistory.java | 35 ++++++++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/InsertedOrder.java | 5 ++++ .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 5 ++++ .../repository/DeleteOrderHistoryRepository.java | 16 ++++++++++ 4 files changed, 61 insertions(+) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DeleteOrderHistory.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DeleteOrderHistoryRepository.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DeleteOrderHistory.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DeleteOrderHistory.java new file mode 100644 index 0000000..797aa47 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DeleteOrderHistory.java @@ -0,0 +1,35 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.annotation.MainKey; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.validator.InsertGroup; +import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :删除订单历史表 + * @Reference : + * @Author : pantianhu + * @CreateDate : 2022-07-13 11:03 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_DELETE_ORDER_HISTORY") +@Api("删除订单历史表") +@MainKey(groups = {InsertGroup.class, UpdateGroup.class}) +public class DeleteOrderHistory extends BaseBean { + @Column(name="TOP_ORDER") + @ApiParam(value ="顶层订单号") + private String topOrder; +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java index 07b060d..81037a3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java @@ -60,6 +60,11 @@ public class InsertedOrder extends BaseOrder { @ApiParam(value ="备注") private String remark; + @Column(name="FORCE_COUNT") + @ApiParam(value ="强制完成数量") + @FieldAnnotation(modify = false, defaultValue = "0") + private Double forceCount; + @JsonIgnore public ProductRouting getProductRouting() { return BeanRelation.get(this, EInsertedOrder.ProductRouting); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 7c5a35c..25cc0f3 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java @@ -93,6 +93,11 @@ public class SalesOrder extends BaseOrder { @FieldAnnotation(property = false) private Integer serialNumber = 0; + @Column(name="FORCE_COUNT") + @ApiParam(value ="强制完成数量") + @FieldAnnotation(modify = false, defaultValue = "0") + private Double forceCount; + @JsonIgnore public Work getWork() { return BeanRelation.get(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DeleteOrderHistoryRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DeleteOrderHistoryRepository.java new file mode 100644 index 0000000..8192d0e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/DeleteOrderHistoryRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.DeleteOrderHistory; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : pantianhu + * @CreateDate : 2022-07-13 11:29 + * @Modify: + **/ +@Repository +public interface DeleteOrderHistoryRepository extends JpaRepository { +} From 59b84c38a2755ef1488b7d7bfe3e89f6a48a80c2 Mon Sep 17 00:00:00 2001 From: "dominic.xiao@estsh.com" Date: Tue, 2 Aug 2022 23:13:44 +0800 Subject: [PATCH 84/86] =?UTF-8?q?=E5=8C=97=E4=BA=AC=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java index c3b4d99..d50846d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCustProdLine.java @@ -5,15 +5,11 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Inheritance; -import javax.persistence.InheritanceType; import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; +import javax.persistence.*; import java.io.Serializable; /** @@ -60,4 +56,8 @@ public class MesCustProdLine extends BaseBean implements Serializable { @Column(name = "DOCK_NO") @ApiParam("dock") private String dockNo; + + @Column(name = "ZONE_NO") + @ApiParam("区域代码") + private String zoneNo; } From 9d3e7f01f0c7765aacfdcd47152fba2b75144e26 Mon Sep 17 00:00:00 2001 From: "dominic.xiao@estsh.com" Date: Fri, 5 Aug 2022 16:40:57 +0800 Subject: [PATCH 85/86] =?UTF-8?q?24518=2021020-MES-=E5=AE=A2=E6=88=B7JIS?= =?UTF-8?q?=E9=A2=84=E8=A3=85=E9=98=9F=E5=88=97-=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BB=A3=E7=A0=81=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6-20220812?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index 34e5995..0a7af47 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -3348,6 +3348,9 @@ public class MesHqlPack { if (!StringUtils.isEmpty(queueJitPlan.getVinCode())) { DdlPreparedPack.getStringLikerPack(queueJitPlan.getVinCode(), "vinCode", packBean); } + if (!StringUtils.isEmpty(queueJitPlan.getProdCfgTypeCode())) { + DdlPreparedPack.getStringLikerPack(queueJitPlan.getProdCfgTypeCode(), "prodCfgTypeCode", packBean); + } if (queueJitPlan.getStatus() != null) { DdlPreparedPack.getNumEqualPack(queueJitPlan.getStatus(), "status", packBean); } From 8277abb2b905c7494540d8740b798616ce585390 Mon Sep 17 00:00:00 2001 From: "castle.zang" Date: Fri, 19 Aug 2022 19:07:02 +0800 Subject: [PATCH 86/86] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BF=8A=E7=94=9F--?= =?UTF-8?q?=E5=B9=BF=E4=B8=9C24997=20=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=8A=A5=E8=A1=A8=E5=A2=9E=E5=8A=A0=E7=AE=B1?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 2494f18..89b7ded 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -206,6 +206,10 @@ public class WmsASNMaster extends BaseBean { @ApiParam(value = "窗口结束时间") public String windowEndTime; + @Transient + @ApiParam(value = "箱数") + public Integer boxQty; + public WmsASNMaster() { }