From c43eba89f33a804eef55c89e9e502ed86bba3100 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 22 Jun 2021 09:00:38 +0800 Subject: [PATCH 01/36] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=89=E5=8A=9B?= =?UTF-8?q?=E5=A3=AB=E6=8D=A2=E6=A8=A1=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java | 5 +++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicRule.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 9 +++++---- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 2 ++ 5 files changed, 16 insertions(+), 8 deletions(-) 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 index a8db480..5c06333 100644 --- 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 @@ -31,6 +31,11 @@ public class HeuristicOptimize extends BaseRule { @ApiParam(value ="工作筛选") private String workFilter; + @Lob + @Column(name="WORK_SORT") + @ApiParam(value ="工作排序") + private String workSort; + @Column(name="RES_FILTER") @ApiParam(value ="资源筛选") private String resFilter; 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 a4091af..cdadeb0 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 @@ -58,6 +58,10 @@ public class HeuristicRule extends BaseRule { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String batchPeriod; + @Column(name="WORK_GROUP_INTERVAL") + @ApiParam(value ="工作分组间隔") + private String workGroupInterval; + @Column(name="REVER_FLUSH_PLAN") @ApiParam(value ="逆向刷新计划") private Boolean reverFlushPlan = false; 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 2c0ea75..25594d0 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,10 +46,10 @@ 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="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 ="单次补充数量") @@ -65,6 +65,7 @@ public class Inventory extends BaseOrder { @Column(name="LAST_SUPPLY") @ApiParam(value ="最后补充时间") + @FieldAnnotation(modify = false) private Date lastSupply; @JsonIgnore 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 626de94..e214454 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 @@ -29,10 +29,6 @@ public class MatCalcRule extends BaseRule { @ApiParam(value ="物料筛选") private String materialFilter; - @Column(name="ROUTING_FILTER") - @ApiParam(value ="工艺路线筛选") - private String routingFilter; - @Column(name="INPUT_FILTER") @ApiParam(value ="输入筛选") private String inputFilter; 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 866ebe5..1008891 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 @@ -174,6 +174,8 @@ public class Work extends BaseAPS { private transient boolean hasOptimized = false; + private transient boolean positive = true; + public BaseOrder getOrder() { return BeanRelation.get(this, EWork.Order); } From 0a148e40356e1c55c81bc20d66ced9aae13e50ea Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Tue, 22 Jun 2021 14:51:41 +0800 Subject: [PATCH 02/36] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A8=E6=A3=80?= =?UTF-8?q?=E6=9E=9A=E4=B8=BE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index ce8d025..8c9ad8d 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1840,7 +1840,8 @@ public class WmsEnumUtil { CLOSE(40, "已关闭"), CANCEL(50, "已取消"), REJECT(60, "全部退货"), - SPECIAL(70, "全部特采"); + SPECIAL(70, "全部特采"), + SECOND_JUDGMENT(80, "二次判定"); private int value; private String description; From fc8619208a2f905fa463aef5287d63b7fd824735 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 22 Jun 2021 18:29:42 +0800 Subject: [PATCH 03/36] pom --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-bsp/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-ics/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/pom.xml | 2 +- modules/i3plus-pojo-mdm/pom.xml | 2 +- modules/i3plus-pojo-mes-pcn/pom.xml | 2 +- modules/i3plus-pojo-mes/pom.xml | 2 +- modules/i3plus-pojo-model/pom.xml | 2 +- modules/i3plus-pojo-platform/pom.xml | 2 +- modules/i3plus-pojo-ptl/pom.xml | 2 +- modules/i3plus-pojo-report/pom.xml | 2 +- modules/i3plus-pojo-screen/pom.xml | 2 +- modules/i3plus-pojo-softswitch/pom.xml | 2 +- modules/i3plus-pojo-sweb/pom.xml | 2 +- modules/i3plus-pojo-wms/pom.xml | 2 +- modules/i3plus-pojo-workflow/pom.xml | 2 +- pom.xml | 2 +- sonar-project.properties | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index bc7071b..57e0a76 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 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index f902a7c..5730ec1 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 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index 0272934..77a43d2 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 diff --git a/modules/i3plus-pojo-bsp/pom.xml b/modules/i3plus-pojo-bsp/pom.xml index 390e79a..08eae5f 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 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 3937425..096b9c8 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 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index cf1a42a..80590a1 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 diff --git a/modules/i3plus-pojo-ics/pom.xml b/modules/i3plus-pojo-ics/pom.xml index c338f71..11ad913 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 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 1674a47..c169cc4 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 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 7637865..e3f1dc9 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 diff --git a/modules/i3plus-pojo-mdm/pom.xml b/modules/i3plus-pojo-mdm/pom.xml index d98b7d8..46db302 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 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index bf96e57..07a7f33 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 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index a758a6a..28577a8 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 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 4988104..3199116 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 dba12cc..7535ff6 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 diff --git a/modules/i3plus-pojo-ptl/pom.xml b/modules/i3plus-pojo-ptl/pom.xml index 81670b2..1d2c5be 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 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index 26a7311..699688c 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 diff --git a/modules/i3plus-pojo-screen/pom.xml b/modules/i3plus-pojo-screen/pom.xml index 48930f8..fcf61d0 100644 --- a/modules/i3plus-pojo-screen/pom.xml +++ b/modules/i3plus-pojo-screen/pom.xml @@ -5,7 +5,7 @@ i3plus-pojo i3plus.pojo - 1.0-TEST-SNAPSHOT + 1.0.0.1 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index eaf2544..616952a 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 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 0f615b6..7e5e95d 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 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 183a03c..d96d6ec 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 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 0fea52b..8f94fc0 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 diff --git a/pom.xml b/pom.xml index 1bf2019..7029adc 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 diff --git a/sonar-project.properties b/sonar-project.properties index 37d8ae0..a232d36 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -7,7 +7,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo sonar.projectName=i3plus-pojo # defaults to 'not provided' -sonar.projectVersion=1.0-TEST-SNAPSHOT +sonar.projectVersion=1.0.0.1 # Path is relative to the sonar-project.properties file. Defaults to . #sonar.sources=./ From 7109cc8acba51d57af568b8eaf1e838164b1da58 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 24 Jun 2021 10:46:58 +0800 Subject: [PATCH 04/36] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=B8=8B=E5=8F=91=E5=88=B0MES?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 4 ---- .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 8 +++++++ .../i3plus/pojo/aps/model/ScheduleResultModel.java | 28 ++++++++++++++++++++++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 18 ++++++++------ 4 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleResultModel.java 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 d5533c2..968e93e 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 @@ -46,10 +46,6 @@ public class OrderFeedback extends BaseAPS { @ApiParam(value ="库存扣减数量") private Double inventoryCount; - @Column(name="LAST_OPERATION_COUNT") - @ApiParam(value ="硫化报工数量") - private Double lastOperationCount; - @Column(name="UNQUALIFIED_COUNT") @ApiParam(value ="不良数量") private Double unqualifiedCount; 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 a754400..08cbb35 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 @@ -53,4 +53,12 @@ public class SysParam extends BaseAPS { @Column(name="RECORD_RESULT") @ApiParam(value ="记录资源评估结果") private Boolean recordResult; + + @Column(name="SCHEDULE_RESULT") + @ApiParam(value ="记录排程结果") + private Boolean scheduleResult; + + @Column(name="SPLIT_BY_SHIFT") + @ApiParam(value ="按班次分割下发的工作") + private Boolean splitByShift; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleResultModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleResultModel.java new file mode 100644 index 0000000..452fa02 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ScheduleResultModel.java @@ -0,0 +1,28 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.Work; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.util.Date; +import java.util.HashSet; +import java.util.Set; + +/** + * @Description : 排程结果信息 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2020-06-22 + * @Modify: + **/ +@Data +public class ScheduleResultModel { + @ApiParam(value ="排程开始时间") + private Date beginTime; + + @ApiParam(value ="排程结束时间") + private Date endTime; + + @ApiParam(value ="参与排程的工作") + private Set works = new HashSet<>(); +} 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 ec2bba5..250095b 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 @@ -1261,18 +1261,20 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum APS_ORDER_TYPE { - SALES_ORDER("S", "销售订单"), - PRODUCT_ORDER("M", "生产订单"), - PURCHASE_ORDER("P", "采购订单"), - INVENTORY("W", "库存订单"), - SAFE_STOCK_ORDER("Q", "安全库存订单"), - INSERTED_ORDER("I", "插单"); + SALES_ORDER("SALES_ORDER", "S", "销售订单"), + PRODUCT_ORDER("PRODUCT_ORDER", "M", "生产订单"), + PURCHASE_ORDER("PURCHASE_ORDER", "P", "采购订单"), + INVENTORY("INVENTORY", "W", "库存订单"), + SAFE_STOCK_ORDER("SAFE_STOCK_ORDER", "Q", "安全库存订单"), + INSERTED_ORDER("INSERTED_ORDER", "I", "插单"); private String value; + private String prefix; private String description; - APS_ORDER_TYPE(String value, String description) { + APS_ORDER_TYPE(String value, String prefix, String description) { this.value = value; + this.prefix = prefix; this.description = description; } @@ -1280,6 +1282,8 @@ public class ApsEnumUtil { return value; } + public String getPrefix() { return prefix; } + public String getDescription() { return description; } From 65a2e93daec754b11a74ad87bf937e0ef597ba79 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 26 Jun 2021 07:58:33 +0800 Subject: [PATCH 05/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E6=8B=86=E5=88=86=E8=BE=93=E5=85=A5=EF=BC=8C=E8=BE=93=E5=87=BA?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=9B=B4=E6=96=B0=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/FurnacePlan.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java | 12 ++++++++---- .../java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 8 ++++---- .../java/cn/estsh/i3plus/pojo/aps/bean/SafeStockOrder.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 2 +- 8 files changed, 33 insertions(+), 13 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 7aa3c0a..f57b2ac 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 @@ -45,6 +45,10 @@ public class FurnacePlan extends BaseAPS { @ApiParam(value ="最小加工批量") private Integer minProductBatch; + @Column(name="FIX_PLAN") + @ApiParam(value ="固定组炉的计划") + private Boolean fixPlan; + @JsonBackReference public List getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); } } 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 2b43199..a7e3134 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 @@ -48,6 +48,10 @@ public class InsertedOrder extends BaseOrder { @ApiParam(value ="完工数") private Double finishCount; + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="检验合格数量") + private Double qualifiedCount; + @Column(name="REMARK") @ApiParam(value ="备注") private String remark; 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 968e93e..b4cdff2 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 @@ -34,6 +34,10 @@ public class OrderFeedback extends BaseAPS { @FieldAnnotation(relation = "Order", modify = false) private Long orderId; + @Column(name="ORDER_COUNT") + @ApiParam(value ="订单数量") + private Double orderCount; + @Column(name="DELIVER_RATE") @ApiParam(value ="发货百分比") private Double deliverRate; @@ -42,10 +46,6 @@ public class OrderFeedback extends BaseAPS { @ApiParam(value ="成品合格百分比") private Double qualifiedRate; - @Column(name="INVENTORY_COUNT") - @ApiParam(value ="库存扣减数量") - private Double inventoryCount; - @Column(name="UNQUALIFIED_COUNT") @ApiParam(value ="不良数量") private Double unqualifiedCount; 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 14bb66a..46f2e1f 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 @@ -83,10 +83,10 @@ public class ProductOrder 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="EXCESS_COUNT", columnDefinition = "decimal(18,8)") +// @ApiParam(value ="多余量") +// @FieldAnnotation(modify = false) +// private Double excessCount; @Column(name="LACK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="缺少量") @@ -102,6 +102,10 @@ public class ProductOrder extends BaseOrder { @ApiParam(value ="完工数") private Double finishCount; + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="检验合格数量") + private Double qualifiedCount; + @Column(name="PRODUCT_ROUTING_ID") @ApiParam(value ="工艺路线") @FieldAnnotation(property = false) 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 bee905c..f1a6064 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 @@ -50,10 +50,10 @@ 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="EXCESS_COUNT", columnDefinition = "decimal(18,8)") +// @ApiParam(value ="多余量") +// @FieldAnnotation(modify = false) +// private Double excessCount; @Column(name="AUTO_SUPPLY") @ApiParam(value ="物料计算时自动补充") 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 0e9fa45..d1118a1 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 @@ -45,6 +45,10 @@ public class SafeStockOrder extends BaseOrder { @ApiParam(value ="完工数") private Double finishCount; + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="检验合格数量") + 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/bean/SalesOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java index 82607d8..971821b 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 @@ -69,6 +69,10 @@ public class SalesOrder extends BaseOrder { @ApiParam(value ="完工数") private Double finishCount; + @Column(name="QUALIFIED_COUNT") + @ApiParam(value ="检验合格数量") + 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/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index 4125b4d..fa58935 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 @@ -120,7 +120,7 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="打印时间") private Date printTime; - @ApiParam(value ="生产结束时间") + @ApiParam(value ="资源生产结束") @FieldAnnotation(display = false) @Transient @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse") From 39bc94cedaa3268972d4f0f52622c8550354a622 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 28 Jun 2021 18:39:39 +0800 Subject: [PATCH 06/36] =?UTF-8?q?=E6=88=90=E5=93=81=E6=A3=80=E9=AA=8C?= =?UTF-8?q?=E6=8A=A5=E5=B7=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java | 4 ++++ 1 file changed, 4 insertions(+) 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 index 5c06333..c95f55d 100644 --- 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 @@ -45,6 +45,10 @@ public class HeuristicOptimize extends BaseRule { @ApiParam(value ="资源选择") private String resSelect; + @Column(name="WAITING_TIME") + @ApiParam(value ="最大等待时间") + private String waitingTime; + @Column(name="OPTIMIZE_INTERVAL") @ApiParam(value ="优化间隔") private String optimizeInterval; From 4d8240c78cbf53f629fd7837718f2c4e6e3f7865 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 30 Jun 2021 13:26:10 +0800 Subject: [PATCH 07/36] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0=E5=94=AF=E4=B8=80=E7=BA=A6?= =?UTF-8?q?=E6=9D=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java index 8a577f0..30b7a84 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsFile.java @@ -25,8 +25,7 @@ import javax.persistence.*; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Inheritance(strategy = InheritanceType.JOINED) -@Table(name="WMS_FILE", - uniqueConstraints = {@UniqueConstraint(columnNames = {"FILE_NAME", "REF_SRC", "REF_TYPE"})}) +@Table(name="WMS_FILE") @Api("附件信息") public class WmsFile extends BaseBean{ From b0d2a7b71053e98860d2951414bb31c059410824 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 1 Jul 2021 15:30:49 +0800 Subject: [PATCH 08/36] =?UTF-8?q?=E6=9C=89=E5=BA=93=E5=AD=98=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/ProductOrder.java | 5 ----- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 2 ++ modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml | 2 ++ 4 files changed, 6 insertions(+), 7 deletions(-) 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 46f2e1f..2b079df 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 @@ -83,11 +83,6 @@ public class ProductOrder 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="LACK_COUNT", columnDefinition = "decimal(18,8)") @ApiParam(value ="缺少量") @FieldAnnotation(modify = 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 fa58935..2b8979f 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"}, method = "calcPositive") + "PrevPlan.produceBegin", "PrevFurnace.produceBegin"}, method = "calcPositive") private Date produceBegin; @Column(name="PRODUCE_END") @ApiParam(value ="生产结束时间") @FieldAnnotation(modify = false) @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceEnd", - "PostPlan.produceEnd"}, method = "calcReverse") + "PostPlan.produceEnd", "PostFurnace.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/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index 025e156..cec9e5a 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 @@ -7,5 +7,7 @@ public enum EWorkPlan { WorkResource, PrevPlan, PostPlan, + PrevFurnace, + PostFurnace, FurnacePlan, } 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 49eb584..47d45a9 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -4,4 +4,6 @@ + + \ No newline at end of file From 48779edcfc6a1732b3df8eb8a15486ddb707a676 Mon Sep 17 00:00:00 2001 From: "duan.yang" <994300880@qq.com> Date: Thu, 1 Jul 2021 19:58:37 +0800 Subject: [PATCH 09/36] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=87=B3WMS=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: duan.yang <994300880@qq.com> --- .../cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java index 5c9e56f..423e8fd 100644 --- a/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java +++ b/modules/i3plus-pojo-sweb/src/main/java/cn/estsh/i3plus/pojo/sweb/bean/SwebPurchaseOrderSn.java @@ -4,17 +4,12 @@ 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.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 javax.persistence.*; /** * @Description : @@ -116,6 +111,10 @@ public class SwebPurchaseOrderSn extends BaseBean { @Column(name = "IS_SYN") private String isSyn; + @ApiParam("是否同步至WMS") + @Column(name = "IS_SYNC") + private Integer isSync = 2; + @Column(name = "REC_TIME") @ApiParam(value = "收货时间") private String recTime; From ec3bcc751801dce3078b230db2d624293acb4d2a Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 2 Jul 2021 16:46:01 +0800 Subject: [PATCH 10/36] =?UTF-8?q?=E6=9C=89=E5=BA=93=E5=AD=98=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/WorkPlan.java | 8 ++--- .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 35 ---------------------- 2 files changed, 4 insertions(+), 39 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 2b8979f..4e7cb39 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 @@ -120,16 +120,16 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="打印时间") private Date printTime; + @Column(name="HAS_COMINBED") + @ApiParam(value ="是否组炉") + private Boolean hasCominbed = false; + @ApiParam(value ="资源生产结束") @FieldAnnotation(display = false) @Transient @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse") private Date resProduceEnd; - @Transient - @FieldAnnotation(property = false) - private boolean hasCominbed = false; - public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } public void setWork(Work work) { 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 74dfeaf..4dcf88c 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 @@ -394,7 +394,6 @@ public class BeanRelation { * @param index * @param */ - @SuppressWarnings("unchecked") private final static void recursionImpl(BaseBean bean, Predicate fun, Enum[] holders, int index) { if (index >= holders.length) { @@ -411,38 +410,4 @@ public class BeanRelation { } } } - - /** - * 判断target是否为bean为起点的以holders路径上的点。 - * @param bean - * @param target - * @param holders - * @return - */ - public static boolean recursionContains(BaseBean bean, BaseBean target, Enum... holders) { - if (holders.length == 0) { - return false; - } - - return recursionContainsImpl(bean, target, holders, 0); - } - - private final static boolean recursionContainsImpl(BaseBean bean, BaseBean target, - Enum[] holders, int index) { - if (index >= holders.length) { - if (target == bean) { - return true; - } - index = 0; - } - - List relaBeans = list(bean, holders[index]); - for (BaseBean relaBean : relaBeans) { - if (recursionContainsImpl(relaBean, target, holders, index + 1)) { - return true; - } - } - - return false; - } } From 606653ec0c1c53a5c96758c32be8c0a9f46abf6c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 8 Jul 2021 13:54:21 +0800 Subject: [PATCH 11/36] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E8=A1=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E5=8D=95=EF=BC=8C=E7=8F=AD=E6=AC=A1=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 8 ++++++++ 1 file changed, 8 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 6060bdd..45541ec 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 @@ -241,6 +241,14 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String ctNo; + @Column(name="WO_NO") + @ApiParam("ERP工单号") + public String woNo; + + @Column(name = "SHIFT_CODE") + @ApiParam("班次代码") + private String shiftCode; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From 9910420ea8cd0a2414f002b970fb0a2cdc8163a1 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 12 Jul 2021 15:50:31 +0800 Subject: [PATCH 12/36] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E9=99=90=E5=88=B6=E9=97=AE=E9=A2=98=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 | 4 ++++ .../java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 8 +++++++- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 6 ++++++ 5 files changed, 26 insertions(+), 1 deletion(-) 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 5dc8c0c..f4f3b4d 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 @@ -26,4 +26,8 @@ public class CancelPlanRule extends BaseRule { @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/HeuristicOptimize.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java index c95f55d..7e820e8 100644 --- 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 @@ -52,4 +52,8 @@ public class HeuristicOptimize extends BaseRule { @Column(name="OPTIMIZE_INTERVAL") @ApiParam(value ="优化间隔") private String optimizeInterval; + + @Column(name="MAX_WAITING_LIMIT") + @ApiParam(value ="最大等待时间限制") + private Boolean maxWaitingLimit; } 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 7fce6f7..3235ae8 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 @@ -68,6 +68,11 @@ public class StandOperation extends BaseAPS { @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String minSpaceTime; + @Column(name="MAX_SPACE_TIME") + @ApiParam(value ="最大时间间隔") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) + private String maxSpaceTime; + @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/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 1008891..7623752 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 @@ -166,14 +166,20 @@ public class Work extends BaseAPS { @ApiParam(value ="动态拆分工作ID") private Long originWorkId; + @ApiParam(value ="工作左边界") + private Date leftEdge; + + @ApiParam(value ="工作右边界") + private Date rightEdge; + @ApiParam(value ="工作排序顺序") private Integer workSeqNumber; // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; - private transient boolean hasOptimized = false; + // 排程时确定工作是正向排程还是逆向排程。 private transient boolean positive = true; public BaseOrder getOrder() { 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 4e7cb39..2ff8c15 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 @@ -124,6 +124,12 @@ public class WorkPlan extends BaseAPS { @ApiParam(value ="是否组炉") private Boolean hasCominbed = false; + @ApiParam(value ="资源生产开始") + @FieldAnnotation(display = false) + @Transient + @RippleAnnotation(dependence = {"PrevPlan.resProduceBegin"}, method = "calcPositive") + private Date resProduceBegin; + @ApiParam(value ="资源生产结束") @FieldAnnotation(display = false) @Transient From 1ff31386af2313dd6058b5bed0efd2d32c55d6b1 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 22 Jul 2021 18:54:26 +0800 Subject: [PATCH 13/36] =?UTF-8?q?=E8=A7=84=E5=88=99=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=B7=AF=E5=BE=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java | 3 +++ 1 file changed, 3 insertions(+) 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 d60c70e..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 @@ -56,6 +56,9 @@ public class WmsActionResponseBean implements Serializable { @ApiParam("可选项") public List options; + @ApiParam("任务编号") + public String taskNo; + public List getOptions() { if (options == null) { options = new ArrayList<>(); From e5e79230db1159efbd5ad3ef9151a52d26185668 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Fri, 23 Jul 2021 13:16:05 +0800 Subject: [PATCH 14/36] =?UTF-8?q?WmsStockSn=E6=96=B0=E5=A2=9E=E7=AE=B1?= =?UTF-8?q?=E9=87=8D=E9=87=8F=E5=92=8C=E6=89=98=E9=87=8D=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 19 +++++++++++++++++++ 1 file changed, 19 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 45541ec..dbb2a9d 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 @@ -149,6 +149,16 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) private String packageNo; + @Column(name = "CARTON_WEIGHT") + @ApiParam("箱重量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double cartonWeight; + + @Column(name = "PACKAGE_WEIGHT") + @ApiParam("托盘重量") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) + private Double packageWeight; + @Column(name = "UNIT") @ApiParam(value = "单位") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) @@ -633,6 +643,15 @@ public class WmsStockSn extends BaseBean { return inputNCQty == null ? 0L : this.inputNCQty.doubleValue(); } + public Double getCartonWeightVal() { + return this.cartonWeight == null ? 0 : this.cartonWeight; + } + + public Double getPackageWeightVal() { + return this.packageWeight == null ? 0 : this.packageWeight; + } + + public WmsStockSn(Long snCount, Double sumPartQty, String locateNo) { this.snCount = snCount; this.sumPartQty = sumPartQty; From 1de5989099b42796646a42dc0fc6f908da166588 Mon Sep 17 00:00:00 2001 From: jun <337942886@qq.com> Date: Fri, 23 Jul 2021 17:07:40 +0800 Subject: [PATCH 15/36] =?UTF-8?q?=E5=8D=8E=E5=9F=9F=E9=BA=A6=E6=A0=BC?= =?UTF-8?q?=E7=BA=B3=E7=BB=84=E6=89=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index cbcbc49..3f29e83 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -309,6 +309,11 @@ public class WmsPart extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double weight ; + @Column(name = "PRODUCT_PLACE") + @ApiParam(value = "产地", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + private String productPlace ; + public int getIqcVal() { return this.iqc == null ? 0 : this.iqc.intValue(); 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 dbb2a9d..66fd12c 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 @@ -159,6 +159,11 @@ public class WmsStockSn extends BaseBean { @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) private Double packageWeight; + @Column(name = "PRODUCT_PLACE") + @ApiParam(value = "产地", example = "0") + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, isRequire = 2) + private String productPlace; + @Column(name = "UNIT") @ApiParam(value = "单位") @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT) From 13d015e79a9ed0cdfd585f8ea8089764b8c7225e Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 25 Jul 2021 21:00:30 +0800 Subject: [PATCH 16/36] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E9=97=B4=E6=9C=80?= =?UTF-8?q?=E5=A4=A7=E9=97=B4=E9=9A=94=E9=99=90=E5=88=B6=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/HeuristicOptimize.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java | 3 +++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 14 ++++++++++++++ .../main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java | 1 + .../i3plus-pojo-aps/src/main/resources/relations/Work.xml | 2 ++ .../cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 4 ++-- 6 files changed, 26 insertions(+), 2 deletions(-) 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 index 7e820e8..decdc04 100644 --- 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 @@ -56,4 +56,8 @@ public class HeuristicOptimize extends BaseRule { @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/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index c54dc54..b5dbeae 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,6 +18,7 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.persistence.Transient; +import java.util.Date; import java.util.List; /** @@ -127,6 +128,8 @@ public class Resource extends BaseAPS { @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/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 7623752..259a563 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 @@ -152,6 +152,11 @@ public class Work extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; + @Column(name="ORIGIN_OPERATION_ID") + @ApiParam(value ="原始工序") + @FieldAnnotation(property = false) + private Long originOperationId; + @Column(name="PARENT_WORK_ID") @ApiParam(value ="父工作") @FieldAnnotation(property = false) @@ -200,6 +205,15 @@ public class Work extends BaseAPS { BeanRelation.set(this, EWork.Operation, oper); } + public Operation getOriginOperation() { + return BeanRelation.get(this, EWork.OriginOperation); + } + + public void setOriginOperation(Operation oper) { + this.originOperationId = oper != null ? oper.getId() : 0l; + BeanRelation.set(this, EWork.OriginOperation, oper); + } + public ParentWork getParentWork() { return BeanRelation.get(this, EWork.ParentWork); } 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 25c90c3..689d599 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 @@ -9,6 +9,7 @@ public enum EWork { PrevRelations, // 前关联 PostRelations, // 后关联 Operation, // 工序 + OriginOperation, // 原始工序 PlanFeedback, // 工作计划反馈 MainPlan, // 关联的为主资源的计划 WorkPlans, // 关联的工作计划 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 5663143..fe0de7a 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -12,6 +12,8 @@ + + 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 250095b..96546b7 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 @@ -334,7 +334,7 @@ public class ApsEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum RESOURCE_CLASS { LIMITLESS("LIMITLESS", "无限能力"), - SINGLE("SINGLE", "单能力"), + SINGLE("SINGLE", "单资源"), BATCH("BATCH", "炉资源"); private String value; @@ -770,7 +770,7 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum WORK_TYPE { - // 工作不参与排程 + // 工作不参与排程，比如销售订单的工作 FICTITIOUS("FICTITIOUS", "虚拟工作"), // 动态虚拟工作为不计算生产时间。 DYNAMIC_FICTITIOUS("DYNAMIC_FICTITIOUS", "动态虚拟工作"), From f0147d2680cf94398b215f75e02ccb41f4dd5dbd Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 27 Jul 2021 10:32:21 +0800 Subject: [PATCH 17/36] =?UTF-8?q?=E6=8C=89=E8=AE=A2=E5=8D=95=E6=8E=92?= =?UTF-8?q?=E7=A8=8B=EF=BC=8C=E5=AE=8C=E6=88=90=E6=9C=80=E5=A4=A7=E9=97=B4?= =?UTF-8?q?=E9=9A=94=E9=99=90=E5=88=B6=EF=BC=8C=E7=89=B5=E7=BA=B1=E6=8B=86?= =?UTF-8?q?=E4=BD=99=E6=95=B0=E5=88=B0=E6=89=8B=E5=B7=A5=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E6=9C=AA=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/HeuristicRule.java | 4 ---- 1 file changed, 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 cdadeb0..a0b9d60 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 @@ -61,8 +61,4 @@ public class HeuristicRule extends BaseRule { @Column(name="WORK_GROUP_INTERVAL") @ApiParam(value ="工作分组间隔") private String workGroupInterval; - - @Column(name="REVER_FLUSH_PLAN") - @ApiParam(value ="逆向刷新计划") - private Boolean reverFlushPlan = false; } From d0b880c7aae288b83081675305570baf1d88cc28 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 28 Jul 2021 09:22:44 +0800 Subject: [PATCH 18/36] =?UTF-8?q?=E7=89=B5=E7=BA=B1=E6=8B=86=E4=BD=99?= =?UTF-8?q?=E6=95=B0=E5=88=B0=E6=89=8B=E5=B7=A5=E8=AE=BE=E5=A4=87=E5=AE=8C?= =?UTF-8?q?=E6=88=90=E6=9C=80=E5=A4=A7=E9=97=B4=E9=9A=94=E9=99=90=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E7=A1=AB=E5=8C=96=E8=A1=A5=E6=BB=A1=E6=A8=A1=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/aps/bean/ResGanttTable.java | 47 ++++++++++++++++++++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 2 +- .../cn/estsh/i3plus/pojo/aps/model/KPIModel.java | 4 ++ .../aps/repository/ResGanttTableRepository.java | 9 +++++ 4 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResGanttTableRepository.java 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 new file mode 100644 index 0000000..c4c3652 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java @@ -0,0 +1,47 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +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 : jason.niu + * @CreateDate : 2021-07-27 + * @Modify: + **/ +@Data +@EqualsAndHashCode(callSuper = true) +@Entity +@Table(name = "APS_RES_GANTT_TABLE") +@Api("资源甘特图资源表格") +public class ResGanttTable extends BaseAPS { + private static final long serialVersionUID = -8818717728985340196L; + + @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="DISPLAY") + @ApiParam(value ="是否在界面显示") + @FieldAnnotation(defaultValue = "true") + private Boolean display = true; + + @Column(name="ORDER_NUMBER") + @ApiParam(value ="序号") + private Integer orderNumber; +} 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 259a563..4dc3873 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,7 +182,7 @@ public class Work extends BaseAPS { // 排程时，找插入位置的评估值 private transient double evaluateValue = 0; - private transient boolean hasOptimized = false; + private transient boolean supplyCount = false; // 排程时确定工作是正向排程还是逆向排程。 private transient boolean positive = true; 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 b5007f0..7a4c619 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 @@ -22,4 +22,8 @@ public class KPIModel { private String settingTimes; private Integer overdueSalesCount; + + private Integer avaliableResCount; + + private Integer stopResCount; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResGanttTableRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResGanttTableRepository.java new file mode 100644 index 0000000..d5d6928 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ResGanttTableRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.ResGanttTable; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface ResGanttTableRepository extends CrudRepository { +} From 4b21ff885187f743604bca5b7e85a99d11f6b6db Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 28 Jul 2021 10:30:13 +0800 Subject: [PATCH 19/36] =?UTF-8?q?=E5=8D=97=E9=9D=9EE=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=20=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/wms/dto/WmsTmsShipDto.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java index 07661de..669dc3d 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dto/WmsTmsShipDto.java @@ -71,4 +71,10 @@ public class WmsTmsShipDto extends BaseDto implements Serializable { @ApiParam("结束时间") private String createDateTimeEnd; + + @ApiParam("客户号") + private String custNo; + + @ApiParam("客户名称") + private String custName; } From 3a5fad2a743e775afec9a58353735661e9ce1ba1 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 29 Jul 2021 10:32:33 +0800 Subject: [PATCH 20/36] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=A1=AB=E5=8C=96?= =?UTF-8?q?=E8=A1=A5=E6=BB=A1=E6=A8=A1=E6=9C=80=E5=A4=A7=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8=E4=B8=8B=E5=8F=91=E6=9C=AA=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/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 08cbb35..98fd04b 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 @@ -61,4 +61,8 @@ public class SysParam extends BaseAPS { @Column(name="SPLIT_BY_SHIFT") @ApiParam(value ="按班次分割下发的工作") private Boolean splitByShift; + + @Column(name="RES_GANTT_LABEL") + @ApiParam(value ="资源甘特图工作块显示标签") + private String resGanttLabel; } From 9c9af1097393504771493dd75de8f67392eee845 Mon Sep 17 00:00:00 2001 From: Jason Date: Thu, 29 Jul 2021 16:53:10 +0800 Subject: [PATCH 21/36] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=A1=AB=E5=8C=96?= =?UTF-8?q?=E8=A1=A5=E6=BB=A1=E6=A8=A1=E6=9C=80=E5=A4=A7=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E9=99=90=E5=88=B6=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8=E4=B8=8B=E5=8F=91=E6=9C=AA=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/ResGanttTable.java | 3 +++ 1 file changed, 3 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 c4c3652..dd14d5b 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 @@ -44,4 +44,7 @@ public class ResGanttTable extends BaseAPS { @Column(name="ORDER_NUMBER") @ApiParam(value ="序号") private Integer orderNumber; + + @ApiParam(value ="枚举项内容") + private transient Enum[] enumItems; } From 4de836b28abf5a56d0040de4d6e13bfcc01c505d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Thu, 29 Jul 2021 20:37:00 +0800 Subject: [PATCH 22/36] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=A2=9E=E5=8A=A0=E9=80=89=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index c84d7d8..ef4b08e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1882,7 +1882,8 @@ public class WmsEnumUtil { public enum QC_ITEM_STATUS { NORMAL(10, "正常"), CANCELLATION(20, "已处理"), - SPECIAL(30, "部分特采"); + SPECIAL(30, "部分特采"), + XUANBIE(40, "选别"); private int value; private String description; From 0bd75ba2fe56d4b5fe8f647fa59ca135664ce450 Mon Sep 17 00:00:00 2001 From: Jason Date: Sat, 31 Jul 2021 15:38:42 +0800 Subject: [PATCH 23/36] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9C=AA=E5=AE=8C?= =?UTF-8?q?=E5=85=A8=E4=B8=8B=E5=8F=91=E6=9C=80=E5=A4=A7=E9=97=B4=E9=9A=94?= =?UTF-8?q?=E9=99=90=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/DayShift.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResGanttTable.java | 5 +++++ .../src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttPlanModel.java | 1 + 3 files changed, 10 insertions(+) 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 83c965a..bef6a1c 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 @@ -46,4 +46,8 @@ public class DayShift extends BaseAPS { @FieldAnnotation(notEmpty = true) @ShiftTimeAnnotation(groups = {InsertGroup.class, UpdateGroup.class, ImportGroup.class}) private String workTimes; + + @Column(name="COLOR") + @ApiParam(value ="颜色") + private String color; } 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 dd14d5b..e40a718 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 @@ -2,6 +2,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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,6 +46,10 @@ public class ResGanttTable extends BaseAPS { @ApiParam(value ="序号") private Integer orderNumber; + private transient ApsEnumUtil.FIELD_TYPE type; + + private transient ApsEnumUtil.EDIT_TYPE editType; + @ApiParam(value ="枚举项内容") private transient Enum[] enumItems; } 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 4254fba..6e2e3bb 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 @@ -24,4 +24,5 @@ public class GanttPlanModel { private Long workId; private List resIds; private Boolean draggable; + private Boolean furnacePlan = false; } From d1a9fe37cd6eee5607be575dad51ea89e803a36c Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 31 Jul 2021 19:40:59 +0800 Subject: [PATCH 24/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E8=B0=83=E5=B7=AEBUG?= 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 | 6 ++++++ 1 file changed, 6 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 d7dd874..1552eba 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 @@ -241,4 +241,10 @@ public class WmsCSOrderDetails extends BaseBean { this.partNo=partNo; this.partNameRdd = partNameRdd; } + public WmsCSOrderDetails(String organizeCode,String partNo,String locateNo, Double qty) { + this.organizeCode=organizeCode; + this.partNo = partNo; + this.locateNo = locateNo; + this.qty = qty; + } } From c8074d219a6cd5432e3782d239d661911e3deb84 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 3 Aug 2021 19:17:23 +0800 Subject: [PATCH 25/36] =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=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/DayShift.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) 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 bef6a1c..8d7733d 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 @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.validator.ImportGroup; 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; import lombok.Data; @@ -49,5 +50,6 @@ public class DayShift extends BaseAPS { @Column(name="COLOR") @ApiParam(value ="颜色") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.COLOR_PICKER) private String color; } 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 96546b7..9f9e6b2 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 @@ -1037,7 +1037,8 @@ public class ApsEnumUtil { OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"), LIST("LIST", "对象集合，不可编辑。"), MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"), - QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"); + QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"), + COLOR_PICKER("COLOR_PICKER", "颜色选择框"); private String value; private String description; From 4b1228fbbc34b1972d76706a17f58043aca4fd66 Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Wed, 4 Aug 2021 20:26:34 +0800 Subject: [PATCH 26/36] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 2 ++ .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 3 ++- .../main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java | 5 ++--- 3 files changed, 6 insertions(+), 4 deletions(-) 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 bef6a1c..8d7733d 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 @@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.validator.ImportGroup; 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; import lombok.Data; @@ -49,5 +50,6 @@ public class DayShift extends BaseAPS { @Column(name="COLOR") @ApiParam(value ="颜色") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.COLOR_PICKER) private String color; } 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 96546b7..9f9e6b2 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 @@ -1037,7 +1037,8 @@ public class ApsEnumUtil { OBJECT("OBJECT", "关联对象，下来选择关联对象的Code值"), LIST("LIST", "对象集合，不可编辑。"), MULTI_OBJECT("MULTI_OBJECT", "多选对象，弹出框选择，可以选择全部对象，以*表示选择全部"), - QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"); + QUERY_LIST("QUERY_LIST", "通过接口获取下拉选项"), + COLOR_PICKER("COLOR_PICKER", "颜色选择框"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java index 02668f4..b95e375 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepPrintSnModel.java @@ -5,9 +5,6 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; -import javax.persistence.Transient; - /** * @Description: 打印条码工步， 打印信息模板 * @Reference: @@ -159,4 +156,6 @@ public class StepPrintSnModel extends MesProduceSn { private String qcCode; @ApiParam("打印机名称") private String printerName; + @ApiParam("是否DB件") + private String isDb; } From 31344a93175dc3bdc5ea2d06e3d5e6cb156df10d Mon Sep 17 00:00:00 2001 From: "puxiao.liao" Date: Sat, 7 Aug 2021 01:35:28 +0800 Subject: [PATCH 27/36] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index bd936f1..64732dc 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -1846,7 +1846,8 @@ public class WmsEnumUtil { CANCEL(50, "已取消"), REJECT(60, "全部退货"), SPECIAL(70, "全部特采"), - SECOND_JUDGMENT(80, "二次判定"); + SECOND_JUDGMENT(80, "二次判定"), + XUANBIE_JUDGMENT(90, "全部选别"); private int value; private String description; From cc6ab7dc42c9582440faf04c577193f84c96de31 Mon Sep 17 00:00:00 2001 From: gsz Date: Sat, 7 Aug 2021 14:06:05 +0800 Subject: [PATCH 28/36] =?UTF-8?q?=E2=80=9C=E4=BF=AE=E6=94=B9=E9=A1=B9g?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=98=E7=89=B9=E5=9B=BEpojo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttCalendarModel.java | 4 +++- .../i3plus/pojo/aps/model/GanttEventRequest.java | 2 +- .../estsh/i3plus/pojo/aps/model/GanttOrderModel.java | 19 ++++++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) 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 13abdc2..7a80b06 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 @@ -10,7 +10,7 @@ import java.util.Date; @Data public class GanttCalendarModel { - private Long resourceId; + private String resourceId; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) private Date startDate; @@ -21,4 +21,6 @@ public class GanttCalendarModel { //private String timeRangeColor; private String eventColor; private String name; + + private Double percentDone;//完成百分比 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java index 69d1e23..706f7bc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttEventRequest.java @@ -21,7 +21,7 @@ import java.util.List; @Data @Api("甘特图分页查询参数") public class GanttEventRequest { - private Long[] resourceIds; + private String[] resourceIds; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) private Date begin; 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 88cd06c..ce36f12 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 @@ -1,14 +1,31 @@ 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.ArrayList; +import java.util.Date; import java.util.List; @Data public class GanttOrderModel { - private Long id; + private String id; private String code; private String name; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date startDate; + @JsonSerialize(using = CustomDateSerializer.class) + @JsonDeserialize(using = CustomDateDeserializer.class) + private Date endDate; + private String color;//颜色 + private Double percentDone;//完成百分比 + private Boolean expanded;//是否展开树 + private Boolean rollup;//自动把数据相加 在children的上层 当前 + private long duration;//期间 -- + private String unit;//期间单位 -- private List children = new ArrayList<>(); } From cfdcf6aaff4fb32094a0b232cf9c81b72c991f37 Mon Sep 17 00:00:00 2001 From: gsz Date: Sun, 8 Aug 2021 09:25:06 +0800 Subject: [PATCH 29/36] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=94=98=E7=89=B9?= =?UTF-8?q?=E5=9B=BEModel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 ce36f12..21b06ea 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 @@ -15,17 +15,19 @@ public class GanttOrderModel { private String id; private String code; private String name; + private String operationName; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) private Date startDate; @JsonSerialize(using = CustomDateSerializer.class) @JsonDeserialize(using = CustomDateDeserializer.class) private Date endDate; - private String color;//颜色 + private String color; private Double percentDone;//完成百分比 private Boolean expanded;//是否展开树 private Boolean rollup;//自动把数据相加 在children的上层 当前 - private long duration;//期间 -- - private String unit;//期间单位 -- +// private long duration; + private String durationUnit; + private Boolean manuallyScheduled; private List children = new ArrayList<>(); } From d69c8e682b4c66071fee6093f8dbdd08ecda968b Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 8 Aug 2021 10:05:34 +0800 Subject: [PATCH 30/36] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=8B=86=E5=88=86=E4=B8=8B=E5=8F=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 17 ++++++++++++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 4 ++++ .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 26 ++++++++++++++++++++++ 3 files changed, 47 insertions(+) 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 971821b..88c8cfe 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 @@ -61,18 +61,35 @@ public class SalesOrder extends BaseOrder { @FieldAnnotation(defaultValue = "WAITING") private ApsEnumUtil.SALES_ORDER_STATUS orderStatus; + @Column(name="ORDER_SPLIT") + @ApiParam(value ="拆分下发") + @FieldAnnotation(defaultValue = "NONE", modify = false) + private ApsEnumUtil.SALES_ORDER_SPLIT_STATUS orderSplit = ApsEnumUtil.SALES_ORDER_SPLIT_STATUS.NONE; + + @Column(name="CAN_MAT_CALC") + @ApiParam(value ="是否参与物料运算") + @FieldAnnotation(defaultValue = "1") + private Boolean canMatCalc = true; + @Column(name="DELIVER_RATE") @ApiParam(value ="发货百分比") private Double deliverRate; @Column(name="FINISH_COUNT") @ApiParam(value ="完工数") + @FieldAnnotation(modify = false) private Double finishCount; @Column(name="QUALIFIED_COUNT") @ApiParam(value ="检验合格数量") + @FieldAnnotation(modify = false) private Double qualifiedCount; + @Column(name="SERIAL_NUMBER") + @ApiParam(value ="拆分订单流水号") + @FieldAnnotation(property = false) + private Integer serialNumber = 0; + @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/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 4dc3873..e7571fd 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 @@ -171,6 +171,10 @@ public class Work extends BaseAPS { @ApiParam(value ="动态拆分工作ID") private Long originWorkId; + @Column(name="SUPPLY_WORK_CODE") + @ApiParam(value ="补满模工作编码") + private String supplyWorkCode; + @ApiParam(value ="工作左边界") private Date leftEdge; 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 9f9e6b2..f5e3f69 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 @@ -1183,6 +1183,32 @@ public class ApsEnumUtil { } /** + * 销售订单拆分下发 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum SALES_ORDER_SPLIT_STATUS { + NONE("NONE", "不拆分下发"), + SPLIT_MAIN("SPLIT_MAIN", "拆分下发（主）"), + SPLIT_CHILD("SPLIT_CHILD", "拆分下发（子）"); + + private String value; + private String description; + + SALES_ORDER_SPLIT_STATUS(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 1bf2f0057e04c15dde5acc004e38c208e66c1511 Mon Sep 17 00:00:00 2001 From: gsz Date: Mon, 9 Aug 2021 18:42:39 +0800 Subject: [PATCH 31/36] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=8B=86=E5=88=86?= =?UTF-8?q?=E7=94=98=E7=89=B9=E5=9B=BE=E6=A0=B9=E6=8D=AE=E5=8D=95=E5=8F=B7?= =?UTF-8?q?=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/aps/model/GanttOrderModel.java | 3 ++- .../i3plus/pojo/aps/model/GanttTopOrderModel.java | 23 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttTopOrderModel.java 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 21b06ea..dcc25d2 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 @@ -26,8 +26,9 @@ public class GanttOrderModel { private Double percentDone;//完成百分比 private Boolean expanded;//是否展开树 private Boolean rollup;//自动把数据相加 在children的上层 当前 -// private long duration; + private String duration;//持续时间 天/小时/分钟 private String durationUnit; 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/GanttTopOrderModel.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttTopOrderModel.java new file mode 100644 index 0000000..3df04c0 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/GanttTopOrderModel.java @@ -0,0 +1,23 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.SalesOrder; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description : GanttTopOrderModel + * @Author :gsz + * @Date 2021/8/9 15:39 + * @Modify + **/ +@Data +@Getter +@Setter +@NoArgsConstructor +@AllArgsConstructor +public class GanttTopOrderModel { + private String topOrder; + private List salesOrders = new ArrayList<>(); +} From 038d07f3376795a8bc69a3dda31f2aba481e2bf3 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 11 Aug 2021 10:37:06 +0800 Subject: [PATCH 32/36] =?UTF-8?q?BeanRelation=E5=A2=9E=E5=8A=A0lastList?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=8C=87=E5=AE=9A=E4=B8=AD=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=96=B9=E6=B3=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/common/BeanRelation.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) 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 4dcf88c..9057dad 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 @@ -204,10 +204,17 @@ public class BeanRelation { public static List lastList(BaseBean bean, Enum... holders) { List result = new ArrayList<>(); - lastListImpl(result, bean, bean, holders, 0); + lastListImpl(result, bean, bean, null, holders, 0); return result; } - private final static boolean lastListImpl(List result, BaseBean bean, BaseBean self, + + public static List lastList(BaseBean bean, Predicate pred, Enum... holders) { + List result = new ArrayList<>(); + lastListImpl(result, bean, bean, pred, holders, 0); + return result; + } + + private final static boolean lastListImpl(List result, BaseBean bean, BaseBean self, Predicate pred, Enum[] holders, int index) { if (index >= holders.length) { if (self == bean) { @@ -215,15 +222,18 @@ public class BeanRelation { } index = 0; self = bean; + if (pred != null && pred.test((T)bean)) { + return true; + } } boolean bNotLast = true; List nextBeans = list(bean, holders[index]); for (BaseBean nextBean : nextBeans) { - if (lastListImpl(result, nextBean, self, holders, index + 1)) { + if (lastListImpl(result, nextBean, self, pred, holders, index + 1)) { result.add((T)nextBean); - bNotLast = false; } + bNotLast = false; } return index == 0 && bNotLast; } From 258e51aaf114e68af2f88bb68f23c9584898dcd2 Mon Sep 17 00:00:00 2001 From: gsz Date: Wed, 11 Aug 2021 13:49:41 +0800 Subject: [PATCH 33/36] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=8C=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E5=B7=A5=E4=BD=9C=E5=B7=A5=E5=BA=8F=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/aps/model/GanttOrderModel.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) 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 dcc25d2..d486f26 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 @@ -27,7 +27,7 @@ public class GanttOrderModel { private Boolean expanded;//是否展开树 private Boolean rollup;//自动把数据相加 在children的上层 当前 private String duration;//持续时间 天/小时/分钟 - private String durationUnit; +// private String durationUnit; private Boolean manuallyScheduled; private List children = new ArrayList<>(); private List lineModels = new ArrayList<>(); 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 f5e3f69..6154f40 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 @@ -1325,7 +1325,11 @@ public class ApsEnumUtil { FOUR_SULFIDATION("FOUR_SULFIDATION", "四车间硫化"), FOUR_TRAINBEARER("FOUR_TRAINBEARER", "四车间牵纱"), FOUR_COATING("FOUR_COATING", "四车间覆胶"), - FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"); + FOUR_WRAPPING("FOUR_WRAPPING", "四车间包布"), + TWO_SULFIDATION("TWO_SULFIDATION", "二车间硫化"), + TWO_TRAINBEARER("TWO_TRAINBEARER", "二车间牵纱"), + TWO_COATING("TWO_COATING", "二车间覆胶"), + TWO_WRAPPING("TWO_WRAPPING", "二车间包布"); private String value; private String description; From 7db1f3e3a1c7b167577537b7f6dec102e478ad62 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 13 Aug 2021 10:46:42 +0800 Subject: [PATCH 34/36] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Am=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E8=AE=A1=E7=AE=97=E5=87=BD=E6=95=B0=EF=BC=8C=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=B5=AE=E7=82=B9=E6=95=B0=E7=95=8C=E9=9D=A2=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E7=B2=BE=E5=BA=A6=E9=97=AE=E9=A2=98=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/common/BaseAPS.java | 14 ++++++++++++++ .../java/cn/estsh/i3plus/pojo/aps/tool/APSDoubleTool.java | 11 +++++++++++ 2 files changed, 25 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 367390d..e204a88 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 @@ -70,6 +70,20 @@ public abstract class BaseAPS extends BaseBean { return null; } + public Double getCustomDouble(String code) { + Object value = customFields.get(code); + if (value == null) { + return null; + } + + if (value.getClass() == String.class) { + return Double.valueOf((String) value); + } else if(value.getClass() == Double.class) { + return (Double)value; + } + return null; + } + public Boolean getCustomBoolean(String code) { Object value = customFields.get(code); if (value == null) { 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 f7736e5..22a9add 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 @@ -4,4 +4,15 @@ public class APSDoubleTool { public static boolean isZero(Double value) { return (value == null) || (value > -0.0000001 && value < 0.0000001); } + + /** + * 按指定精度向上取整 + * @param value + * @param pric + * @return + */ + public static double ceilPric(double value, int pric) { + final double digits = Math.pow(10.0, pric); + return Math.ceil(value*digits) / digits; + } } From 2fbd42bf28b04355426f40da81ddfad96780788d Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 16 Aug 2021 17:20:25 +0800 Subject: [PATCH 35/36] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=9B=9B=E8=BD=A6?= =?UTF-8?q?=E9=97=B4=E6=88=90=E5=9E=8B=E8=A1=A5=E6=BB=A1=E6=A8=A1=E5=8A=9F?= =?UTF-8?q?=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/HeuristicRule.java | 4 ---- .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.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 a0b9d60..294ec49 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 @@ -57,8 +57,4 @@ public class HeuristicRule extends BaseRule { @ApiParam(value ="组炉区间") @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION) private String batchPeriod; - - @Column(name="WORK_GROUP_INTERVAL") - @ApiParam(value ="工作分组间隔") - private String workGroupInterval; } 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 98fd04b..04a0f31 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 @@ -65,4 +65,8 @@ public class SysParam extends BaseAPS { @Column(name="RES_GANTT_LABEL") @ApiParam(value ="资源甘特图工作块显示标签") private String resGanttLabel; + + @Column(name="FOUR_FIRST_SUPPLY") + @ApiParam(value ="是否牵纱补满模") + private Boolean fourFirstSupply; } From 480f60e63b6bbc77dfeacc14a94c2929eab72320 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 17 Aug 2021 18:28:15 +0800 Subject: [PATCH 36/36] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E9=97=B4=E9=9A=94=E6=97=A0=E6=B3=95=E8=B0=83=E6=95=B4=E6=97=B6?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E6=AD=BB=E5=BE=AA=E7=8E=AF=E9=97=AE?= =?UTF-8?q?=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/aps/bean/SysParam.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 04a0f31..c088593 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 @@ -52,15 +52,15 @@ public class SysParam extends BaseAPS { @Column(name="RECORD_RESULT") @ApiParam(value ="记录资源评估结果") - private Boolean recordResult; + private Boolean recordResult = false; @Column(name="SCHEDULE_RESULT") @ApiParam(value ="记录排程结果") - private Boolean scheduleResult; + private Boolean scheduleResult = false; @Column(name="SPLIT_BY_SHIFT") @ApiParam(value ="按班次分割下发的工作") - private Boolean splitByShift; + private Boolean splitByShift = true; @Column(name="RES_GANTT_LABEL") @ApiParam(value ="资源甘特图工作块显示标签") @@ -68,5 +68,5 @@ public class SysParam extends BaseAPS { @Column(name="FOUR_FIRST_SUPPLY") @ApiParam(value ="是否牵纱补满模") - private Boolean fourFirstSupply; + private Boolean fourFirstSupply = false; }