From 7863325afdf746d494d223acee78ba71524a0af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Tue, 15 Oct 2019 18:39:24 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E8=AF=AF=E6=8B=89?= =?UTF-8?q?=E4=BA=86=E6=B5=8B=E8=AF=95=E7=9A=84=E4=BB=A3=E7=A0=81=EF=BC=8C?= =?UTF-8?q?=E8=BF=98=E5=8E=9F=E5=90=8E=E6=8F=90=E4=BA=A4=EF=BC=8C=E5=9C=A8?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=88=86=E6=94=AF=E6=8B=89=E5=BC=80=E5=8F=91?= =?UTF-8?q?=E5=88=86=E6=94=AF=E7=9A=84=E4=BB=A3=E7=A0=81=E4=B9=9F=E5=BE=97?= =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/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-report/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 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index ebd53c3..f8fa98e 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index b6adafd..4426ba9 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index e97c0bb..d790ef1 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index 90e744d..c6141da 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 0ba3645..23e5bee 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index 6706323..c1e2cb9 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 3681eb6..86d7736 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index e388a1d..09f2c4a 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 62ebe64..82fdbe8 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 39a7704..0798953 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index e310bfd..ec9e100 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index e36fcf7..bd09726 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 81fb02b..4c96781 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 1f622d9..2c24e41 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index bc41914..18c811c 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 93f9732..1171f4e 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-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f355cca..f220aa1 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-DEV-SNAPSHOT + 1.0-TEST-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 14123c008e096b9a6bd9425b305a3db337313e0c Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 16 Oct 2019 15:21:26 +0800 Subject: [PATCH 02/24] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index a507c64..7005067 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -51,7 +51,7 @@ public class MesEquTaskPlan extends BaseBean { @Column(name="DAYS_IN_ADVANCE") @ApiParam("创建提前天数") - private String daysInAdvance; + private Integer daysInAdvance; @Transient @ApiParam(value="生产线") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java index f406591..3464fb4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskPlanModel.java @@ -26,7 +26,7 @@ public class MesEquTaskPlanModel implements Serializable { private String lastTime; @ApiParam("创建提前天数") - private String daysInAdvance; + private Integer daysInAdvance; @ApiParam("生产线") private String workCenterCode; @@ -66,7 +66,7 @@ public class MesEquTaskPlanModel implements Serializable { } - public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, String daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + public MesEquTaskPlanModel(Long id, String equipmentCode, String equipmentName, Integer taskType, Integer taskCycle, String lastTime, Integer daysInAdvance, String workCenterCode, String equipmentCategory, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { this.id = id; this.equipmentCode = equipmentCode; this.equipmentName = equipmentName; From 8a316ff2d5040cb6f56b28a902f5168ac04c0eb0 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 16 Oct 2019 15:34:39 +0800 Subject: [PATCH 03/24] add mrp function to aps --- .../pojo/aps/annotation/FieldAnnotation.java | 15 +++++++++++---- .../pojo/aps/annotation/RippleAnnotation.java | 11 +++++++++-- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 4 ++++ .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 1 - .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 4 ++++ .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 22 +++++++++++++--------- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 12 ++---------- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 12 ++---------- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 16 ++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 8 ++++++++ .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 8 ++++++++ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 18 +++++++++++++++++- .../pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java | 22 ++++++++++++++++++++++ .../i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java | 8 ++++++++ .../i3plus/pojo/aps/model/ResourceCompose.java | 18 ++++++++++++++++++ .../src/main/resources/relations/Work.xml | 4 ++-- .../src/main/resources/relations/WorkResource.xml | 2 +- 17 files changed, 145 insertions(+), 40 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 86caaa2..a8484af 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -5,12 +5,19 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @Description :字段元信息注解 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface FieldAnnotation { boolean property() default true; - boolean modify() default true; - boolean display() default true; - int pric() default 2; - boolean mainkey() default false; + boolean modify() default true; // 是否能修改 + boolean display() default true; // 是否需要在界面显示 + int pric() default 2; // 对于浮点型，界面显示的精度 + boolean mainkey() default false; // 是否为主键 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java index 9b577f0..26bfdf7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/RippleAnnotation.java @@ -5,9 +5,16 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * @Description :字段传播依赖设置 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Target(ElementType.FIELD) @Retention(RetentionPolicy.RUNTIME) public @interface RippleAnnotation { - String[] dependence() default {}; - String method() default ""; + String[] dependence() default {}; // 字段依赖的路径 + String method() default ""; // 字段值计算时调用的方法，方法写在service中. } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java index a6f4432..12c9683 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java @@ -58,6 +58,10 @@ public class BaseOrder extends BaseCode { @ApiParam(value ="接单日期") private Date receiveDate; + @Column(name="SPECIFY_MATERIAL_NUM") + @ApiParam(value ="专料号") + private String specifyMaterialNum; + @Column(name="MATERIAL_ID") @ApiParam(value ="物料") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index fb8b71f..0cfc671 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -4,7 +4,6 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.enums.IMPORT_DETAIL_TYPE; -import cn.estsh.i3plus.pojo.aps.holders.EExportDetail; import cn.estsh.i3plus.pojo.aps.holders.EImportDetail; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; 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 e6935d0..13689af 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 @@ -53,4 +53,8 @@ public class MatCalcRule extends BaseRule { @ApiParam(value ="批量补充") private Boolean batchSupply; + @Column(name="ASSIGN_LIMIT") + @ApiParam(value ="物料分配制约") + private Integer assignLimit; + } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index f3f1368..4483e7e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -72,19 +72,19 @@ public class Material extends BaseCode { @Column(name="IS_AUTO_FIX_PEGGING") @ApiParam(value ="自动补充标识") - private boolean autoFixPegging; + private Boolean autoFixPegging; - @Column(name="MAX_MANUF_BATCH") + @Column(name="MAX_PRODUCT_BATCH") @ApiParam(value ="最大制造批量") - private Double maxManufBatch; + private Double maxProductBatch; - @Column(name="MIN_MANUF_BATCH") + @Column(name="MIN_PRODUCT_BATCH") @ApiParam(value ="最小制造批量") - private Double minManufBatch; + private Double minProductBatch; - @Column(name="MANUF_UNIT_BATCH") + @Column(name="UNIT_PRODUCT_BATCH") @ApiParam(value ="制造批量单位") - private Double manufUnitBatch; + private Double UnitProductBatch; @Column(name="MAX_PUR_BATCH") @ApiParam(value ="最大采购批量") @@ -94,9 +94,9 @@ public class Material extends BaseCode { @ApiParam(value ="最小采购批量") private Double minPurBatch; - @Column(name="PUR_UNIT_BATCH") + @Column(name="UNIT_PUR_BATCH") @ApiParam(value ="采购批量单位") - private Double purUnitBatch; + private Double unitPurBatch; @Column(name="MIN_STOCK_COUNT") @ApiParam(value ="最小库存数量") @@ -110,6 +110,10 @@ public class Material extends BaseCode { @ApiParam(value ="最大库存数量") private Double maxStockCount; + @Column(name="ORDER_BATCH_PERIOD") + @ApiParam(value ="订单合并期间") + private String orderBatchPeriod; + @JsonBackReference public List getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 620909a..e14540e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -50,21 +50,13 @@ public class Operation extends BaseAPS { private String ratio; @Column(name="COUNT") - @ApiParam(value ="分割数量") - private Double count; + @ApiParam(value ="分割的工作个数") + private Integer count; @Column(name="BATCH") @ApiParam(value ="分割批量") private Double batch; - @Column(name="MIN_BATCH") - @ApiParam(value ="最小批量") - private Double minBatch; - - @Column(name="TAIL_DEAL") - @ApiParam(value ="尾数处理") - private TAIL_DEAL tailDeal; - @Column(name="CONS_TYPE") @ApiParam(value ="接续方式") private CONSTRAINT_TYPE consType; 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 4a0d1e5..cabd90a 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 @@ -30,21 +30,13 @@ public class StandOperation extends BaseCode { private String ratio; @Column(name="COUNT") - @ApiParam(value ="分割数量") - private Double count; + @ApiParam(value ="分割的工作个数") + private Integer count; @Column(name="BATCH") @ApiParam(value ="分割批量") private Double batch; - @Column(name="MIN_BATCH") - @ApiParam(value ="最小批量") - private Double minBatch; - - @Column(name="TAIL_DEAL") - @ApiParam(value ="尾数处理方式") - private TAIL_DEAL tailDeal; - @Column(name="DIRECTION") @ApiParam(value ="排程方向") private DIRECTION direction; 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 e7c42df..a9992f3 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 @@ -97,6 +97,22 @@ public class Work extends BaseCode { @ApiParam(value ="计划主资源") private String planResource; + @Column(name="FIX_SPLIT") + @ApiParam(value ="已分割的工作是否重新分割") + private Boolean fixSplit; + + @Column(name="NEED_PREV_COUNT") + @ApiParam(value ="需要的前工作数量") + private Double needPrevCount; + + @Column(name="SCH_FAILED") + @ApiParam(value ="是否排程失败") + private Boolean schFailed; + + @Column(name="FAILED_REASON") + @ApiParam(value ="排程失败原因") + private String failedReason; + @Column(name="ORDER_ID") @ApiParam(value ="订单") @FieldAnnotation(property = false) 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 3b46af2..8b1c8f9 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 @@ -7,6 +7,14 @@ import javax.persistence.MappedSuperclass; import java.util.HashMap; import java.util.Map; +/** + * @Description :APS基类 + * 对于APS所有实体类均需继承该类。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ @Data @MappedSuperclass public abstract class BaseAPS extends BaseBean { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index a0f477b..de0cb5f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -6,6 +6,14 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import java.util.*; import java.util.function.Consumer; +/** + * @Description :APS 实体对象的元信息 + * 包含实体对象之间的关联关系信息。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class BeanInfo { private Class cls; private BeanInfo superBeanInfo; 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 d5fb2b3..1eaa05e 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 @@ -9,6 +9,14 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.function.Predicate; +/** + * @Description :关联关系工具类 + * + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public class BeanRelation { Map, Map, List>>> caches = new HashMap<>(); @@ -74,6 +82,14 @@ public class BeanRelation { } public static T get(BaseBean bean, Predicate pred, Enum holder, Enum... args) { + List nextBeans = list(bean, holder); + for (BaseBean nextEntity : nextBeans) { + T result = getImpl(nextEntity, pred, args, 0); + if (result != null) { + return result; + } + } + return null; } @@ -149,7 +165,7 @@ public class BeanRelation { * @param relaBean */ public static void set(BaseBean bean, Enum holder, BaseBean relaBean) { - if (bean == null) { + if (bean == null || holder == null) { return; } if (relaBean == null) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java new file mode 100644 index 0000000..e068a04 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_ASSIGN_LIMIT.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * 物料分配限制 + * 主要考虑输出订的最晚计算时间不能晚于输入的最晚计算时间 + */ +public enum MATERIAL_ASSIGN_LIMIT { + NONE(0), // 不进行任何制约 + INVENTORY(1), // 库存制约 + PURCHASE(2), // 采购制约 + PRODUCT(4); // 制造制约 + + private int _value; + + MATERIAL_ASSIGN_LIMIT(int value) { + _value = value; + } + + public int value() { + return this._value; + } +} \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java new file mode 100644 index 0000000..95383b4 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SPLIT_TYPE.java @@ -0,0 +1,8 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum WORK_SPLIT_TYPE { + NONE, // 不分割 + RATIO, // 按比例分割 + COUNT, // 按数量分割 + BATCH // 按批量分割 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java new file mode 100644 index 0000000..314ecfa --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/model/ResourceCompose.java @@ -0,0 +1,18 @@ +package cn.estsh.i3plus.pojo.aps.model; + +import cn.estsh.i3plus.pojo.aps.bean.WorkResource; + +import java.util.List; + +/** + * @Description :主副资源配套组合 + * 只允许一个主资源，可以有多个副资源，但同一套号的副资源不能有多个。 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-11 + * @Modify: + **/ +public class ResourceCompose { + public WorkResource resource; + public List assResource; +} 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 3f8ab14..bd8ea37 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -4,7 +4,7 @@ - + @@ -12,6 +12,6 @@ - + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml index 28b6264..1c21db2 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkResource.xml @@ -1,6 +1,6 @@ - + From ce187f9720da92fb0d994482cf5830b81ad1b03f Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Wed, 16 Oct 2019 15:55:42 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java | 4 ++++ .../cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java | 10 +++++++--- .../java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 3 ++- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java index 9b2017c..afd4cb0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCast.java @@ -32,6 +32,10 @@ public class AndonBroadCast extends BaseBean { @ApiParam("广播设备编号") private String targetIds; + @Column(name="GROUP_NO") + @ApiParam("分组号") + private String groupNo; + @Column(name="WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java index dfc769a..750e650 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonBroadCastCfg.java @@ -35,11 +35,15 @@ public class AndonBroadCastCfg extends BaseBean { @ApiParam("安灯类型代码") private String alarmCode; - @Column(name="DEVICE_NUM") - @ApiParam("广播设备编号") - private String targetIds; +// @Column(name="DEVICE_NUM") +// @ApiParam("广播设备编号") +// private String targetIds; @Column(name="WORK_CENTER_CODE") @ApiParam("工作中心") private String workCenterCode; + + @Column(name="GROUP_NO") + @ApiParam("分组号") + private String groupNo; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index fd44ca9..ad97b67 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -91,6 +91,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonBroadCast.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getTargetIds(), "targetIds", packBean); + DdlPreparedPack.getStringEqualPack(andonBroadCast.getGroupNo(), "groupNo", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCast.getDeviceDec(), "deviceDec", packBean); DdlPreparedPack.getNumEqualPack(andonBroadCast.getIsValid(),"isValid",packBean); return packBean; @@ -106,7 +107,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getOrganizeCode(), "organizeCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getWorkCenterCode(), "workCenterCode", packBean); DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getAlarmCode(), "alarmCode", packBean); - DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getTargetIds(), "targetIds", packBean); + DdlPreparedPack.getStringEqualPack(andonBroadCastCfg.getGroupNo(), "groupNo", packBean); DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean); return packBean; } From 6a9924eda60dc4751723319b1376761a78c0d91b Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Wed, 16 Oct 2019 16:09:53 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E3=80=90VDA=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E3=80=91=20FIFO=E6=8E=A8=E8=8D=90=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java | 4 ++-- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java index 5adc7d5..6d68047 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartRouting.java @@ -15,7 +15,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description :存储区 + * @Description :物料线路关系表 * @Reference : * @Author : hansen.ke * @CreateDate : 2018-11-06 11:50 @@ -38,7 +38,7 @@ public class WmsPartRouting extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路编号") private String routingCode; - + public WmsPartRouting(){} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java index 9d5414b..a67bfda 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java @@ -15,7 +15,7 @@ import javax.persistence.Transient; import java.util.List; /** - * @Description :存储区 + * @Description :物流线路规则表 * @Reference : * @Author : hansen.ke * @CreateDate : 2018-11-06 11:50 @@ -82,7 +82,7 @@ public class WmsRoutingRule extends BaseBean { @Column(name = "ROUTING_CODE") @ApiParam(value = "线路代码") private String routingCode; - + public WmsRoutingRule(){} } From 3828b4863cfabbde97b58222069800ea87f88963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 16 Oct 2019 17:36:47 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BF=9D=E8=B4=A8?= =?UTF-8?q?=E6=9C=9F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 2 +- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index aed40c4..c667ec4 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -79,7 +79,7 @@ public class WmsPOMasterDetails extends BaseBean { @Column(name = "RC_QTY", columnDefinition = "decimal(18,8)") @ColumnDefault("0") @ApiParam(value = "收货数量", example = "0") - private Double rcQty; + private Double rcQty = 0d; //private Double getRcQty(){ return this.rcQty == null ? new Double(0) : this.rcQty; } 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 63abadc..b1e3261 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 @@ -163,6 +163,10 @@ public class WmsStockSn extends BaseBean { @AnnoOutputColumn(refClass = WmsEnumUtil.WMS_STOCK_TYPE.class, refForeignKey = "value", value = "description") private Integer snType = 10; + @Column(name = "QUALITY_DATE") + @ApiParam("保质期日期") + private String qualityDate; + @ApiParam(value = "仓库名称") @Transient public String whNameRdd; From 986157043daf7a4cd23a2224b1a14f58bace81b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 16 Oct 2019 21:50:51 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=EF=BC=9A=E6=96=B0=E5=A2=9E=E7=BB=84=E4=BB=B6=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=9A=E5=8F=AF=E9=85=8D=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2?= 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 | 1 + 1 file changed, 1 insertion(+) 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 7860945..fd3c9db 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 @@ -1520,6 +1520,7 @@ public class WmsEnumUtil { CHECKLIST(1, "可选列表"), NUMBER(10, "数字"), STRING(20, "字符串"), + CONFIGURABLE_STR(25, "可配字符串"), OUT_OR_UNNECESSARY(30, "出参或者不必需的参数"); private int value; From 88754f9a71efb17ab05bbec8d1959270e76264c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Wed, 16 Oct 2019 21:52:02 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E6=94=B6=E8=B4=A7=E7=9C=8B=E6=9D=BF?= =?UTF-8?q?=E9=87=8D=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/wms/modelbean/WmsPoAsnRecvModel.java | 35 ++++++++++------------ 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java index 0c43dd0..536f46c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsPoAsnRecvModel.java @@ -16,7 +16,7 @@ import java.time.LocalTime; **/ @Data @Api("供应商收货看板") -public class WmsPoAsnRecvModel extends BaseBean implements Comparable{ +public class WmsPoAsnRecvModel extends BaseBean implements Comparable { @ApiParam("订单号") private String orderNo; @@ -33,9 +33,9 @@ public class WmsPoAsnRecvModel extends BaseBean implements Comparable Date: Thu, 17 Oct 2019 13:04:17 +0800 Subject: [PATCH 09/24] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E5=91=A8=E6=9C=9F?= =?UTF-8?q?=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 229 ++++++++++++++++++++- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 68 ++++++ .../i3plus/pojo/mes/bean/MesEquTaskDetail.java | 61 ++++++ .../estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java | 8 + .../mes/repository/MesEquTaskDetailRepository.java | 16 ++ .../mes/repository/MesEquTaskPlanRepository.java | 2 +- .../pojo/mes/repository/MesEquTaskRepository.java | 16 ++ .../repository/MesEquTaskStandardRepository.java | 2 +- 8 files changed, 399 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 7bbf94e..784251b 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -13,7 +13,234 @@ public class MesEnumUtil { /** - * mes设备作业要求-作业类型 + * mes设备作业任务明细-执行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_ACTION_STATUS { + + PENDING(10, "待处理"), + COMPLETE(20, "已完成"), + CANCEL(30, "取消"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_ACTION_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业任务明细-整体结果 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_FINAL_RESULT { + + YES(10, "合格"), + NO(20, "不合格"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_FINAL_RESULT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业任务明细-维修标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_DETAIL_REPAIR_FLAG { + + FALSE(10, "否"), + TRUE(20, "是"); + + private int value; + private String description; + + MES_EQU_TASK_DETAIL_REPAIR_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_STATUS { + + CREATE(10, "创建"), + LANDED(20, "下达"), + OPEN(30, "开启"), + CLOSE(40, "关闭"), + CANCEL(50, "取消"); + + private int value; + private String description; + + MES_EQU_TASK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业任务来源 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_SOURCE { + + PLAN(10, "周期计划"), + CREATE(20, "手工创建"), + ANDON(30, "ANDON"); + + private int value; + private String description; + + MES_EQU_TASK_SOURCE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes设备作业通知标识 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_EQU_TASK_NOTIFY_FLAG { + + FALSE(10, "未通知"), + TRUE(20, "已通知"); + + private int value; + private String description; + + MES_EQU_TASK_NOTIFY_FLAG(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + } + + /** + * mes导入模块 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum MES_INSERT_EXCEL { diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java new file mode 100644 index 0000000..2ab832c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -0,0 +1,68 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :设备作业任务 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK") +@Api("设备作业任务") +public class MesEquTask extends BaseBean { + + @Column(name="TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name="TASK_TYPE") + @ApiParam("作业类型") + private Integer taskType; + + @Column(name="TASK_STATUS") + @ApiParam("作业状态") + private Integer taskStatus; + + @Column(name="WORK_CENTER_CODE") + @ApiParam(value="生产线") + private String workCenterCode; + + @Column(name="PLAN_TIME") + @ApiParam("计划日期") + private String planTime; + + @Column(name="TASK_SOURCE") + @ApiParam("任务来源") + private Integer taskSource; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="NOTIFY_FLAG") + @ApiParam("通知标识") + private Integer notifyFlag; + + @Column(name="RELATE_TASK") + @ApiParam("关联任务") + private String relateTask; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java new file mode 100644 index 0000000..089895b --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskDetail.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :设备作业任务明细 + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="MES_EQU_TASK_DETAIL") +@Api("设备作业任务明细") +public class MesEquTaskDetail extends BaseBean { + + @Column(name="TASK_NO") + @ApiParam("作业任务编号") + private String taskNo; + + @Column(name="EQUIPMENT_CODE") + @ApiParam("设备代码") + private String equipmentCode; + + @Column(name="EQUIPMENT_NAME") + @ApiParam("设备名称") + private String equipmentName; + + @Column(name="ACTION_STATUS") + @ApiParam("执行状态") + private Integer actionStatus; + + @Column(name="FINAL_RESULT") + @ApiParam("整体结果") + private Integer finalResult; + + @Column(name="MEMO") + @ApiParam("备注") + private String memo; + + @Column(name="REPAIR_FLAG") + @ApiParam("维修标识") + private Integer repairFlag; + + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java index 7005067..222fcdf 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTaskPlan.java @@ -61,4 +61,12 @@ public class MesEquTaskPlan extends BaseBean { @ApiParam(value="设备类别") private String equipmentCategory; + @Transient + @ApiParam("计划日期") + private String planTime; + + @Transient + @ApiParam("作业任务编号") + private String taskNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java new file mode 100644 index 0000000..5452007 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskDetailRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTaskDetail; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskDetailRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java index 33c9dc1..59d6144 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskPlanRepository.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; /** * @Description : * @Reference : - * @Author : 王杰 + * @Author : wangjie * @CreateDate : 2019-10-11 * @Modify: **/ diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java new file mode 100644 index 0000000..6e1ce77 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesEquTask; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : wangjie + * @CreateDate : 2019-10-11 + * @Modify: + **/ +@Repository +public interface MesEquTaskRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java index 49e83b9..488bec3 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesEquTaskStandardRepository.java @@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository; /** * @Description : * @Reference : - * @Author : 王杰 + * @Author : wangjie * @CreateDate : 2019-10-11 * @Modify: **/ From 97763d6b53bde16632643e39e98133937f140dd9 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Thu, 17 Oct 2019 16:06:05 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E5=AE=89=E7=81=AF=E5=B9=BF=E6=92=AD?= =?UTF-8?q?=EF=BC=8C=20=E5=AE=89=E7=81=AF=E7=AE=A1=E7=90=86=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=90=8C=E7=95=8C=E9=9D=A2=EF=BC=8C=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=93=8D=E4=BD=9C=E6=9D=A5=E6=BA=90=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonManageQueue.java | 56 ++++++++++++++++++++-- .../i3plus/pojo/andon/bean/AndonManageRecord.java | 49 +++++++++++++++++++ .../i3plus/pojo/andon/bean/AndonQueueAttach.java | 55 +++++++++++++++++++-- .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 14 ++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 4 +- 5 files changed, 171 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index dbdc07e..ae634b1 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -353,6 +353,59 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "事件统计报表该事件描述的总次数") private int acCodeTime; + @ApiParam(value = "操作来源") + @Transient + private String operationFlag; + + // 安灯附属表 + @Transient + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Transient + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Transient + @ApiParam(value ="客户") + private String customer; + + @Transient + @ApiParam(value ="零件号") + private String partNo; + + @Transient + @ApiParam(value ="零件名称") + private String partName; + + @Transient + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Transient + @ApiParam(value ="批次") + private String lot; + + @Transient + @ApiParam(value ="零件数量") + private Double partNum; + + @Transient + @ApiParam(value ="设备名称") + private String deviceName; + + @Transient + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Transient + @ApiParam(value ="备件名称") + private String backupPartName; + + @Transient + @ApiParam(value ="规格型号") + private String scale; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; @@ -474,9 +527,6 @@ public class AndonManageQueue extends BaseBean { try { List ds = new ArrayList(); ds.add(new AndonManageQueue()); - - - System.out.println(BeanUtils.describe(ds)); } catch (IllegalAccessException e) { e.printStackTrace(); diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index d66158f..f47728f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -272,6 +272,55 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "响应已通知标识") private String signSendFlag; + // 安灯附属表 + @Transient + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Transient + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Transient + @ApiParam(value ="客户") + private String customer; + + @Transient + @ApiParam(value ="零件号") + private String partNo; + + @Transient + @ApiParam(value ="零件名称") + private String partName; + + @Transient + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Transient + @ApiParam(value ="批次") + private String lot; + + @Transient + @ApiParam(value ="零件数量") + private Double partNum; + + @Transient + @ApiParam(value ="设备名称") + private String deviceName; + + @Transient + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Transient + @ApiParam(value ="备件名称") + private String backupPartName; + + @Transient + @ApiParam(value ="规格型号") + private String scale; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java index aaf5666..739613c 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonQueueAttach.java @@ -40,7 +40,56 @@ public class AndonQueueAttach extends BaseBean { @ApiParam(value ="安灯任务编号") private String andonOrderNo; - @Column(name="STATUS_CODE") - @ApiParam(value ="安灯状态") - private String statusCode; +// @Column(name="STATUS_CODE") +// @ApiParam(value ="安灯状态") +// private String statusCode; + + @Column(name="TEMP_CORT_METHOD") + @ApiParam(value ="临时/纠正措施") + private String tempCorrectMethod; + + @Column(name="PRE_CORT_METHOD") + @ApiParam(value ="预防/纠正措施") + private String preCorrectMethod; + + @Column(name="CUSTOMER") + @ApiParam(value ="客户") + private String customer; + + @Column(name="PART_NO") + @ApiParam(value ="零件号") + private String partNo; + + @Column(name="PART_NAME") + @ApiParam(value ="零件名称") + private String partName; + + @Column(name="SCRAP_NUM") + @ApiParam(value ="报废数量") + private Double scrapNum; + + @Column(name="LOT") + @ApiParam(value ="批次") + private String lot; + + @Column(name="PART_NUM") + @ApiParam(value ="零件数量") + private Double partNum; + + @Column(name="DEVICE_NAME") + @ApiParam(value ="设备名称") + private String deviceName; + + @Column(name="IS_CHANGE_BACKUP") + @ApiParam(value ="是否更换备件") + private Integer isChangeBackup; + + @Column(name="BACKUP_PART_NAME") + @ApiParam(value ="备件名称") + private String backupPartName; + + @Column(name="SCALE") + @ApiParam(value ="规格型号") + private String scale; + } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index ad97b67..044f313 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -111,6 +111,20 @@ public class AndonHqlPack { DdlPreparedPack.getNumEqualPack(andonBroadCastCfg.getIsValid(),"isValid",packBean); return packBean; } + + /** + * 安灯附属表 + * @param andonQueueAttach + * @return + */ + public static DdlPackBean getAndonQueueAttach(AndonQueueAttach andonQueueAttach) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonQueueAttach.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonQueueAttach.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(andonQueueAttach.getPartNo(), "partNo", packBean); + DdlPreparedPack.getNumEqualPack(andonQueueAttach.getIsValid(),"isValid",packBean); + return packBean; + } /***************** crish 工作单元呼叫原因配置， 处理方法配置， 处理事件原因配置， 事件现象配置 End ************/ diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index 2193643..ce28bb4 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -462,7 +462,9 @@ public class AndonEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum ALARM_OPERATION_SOURCE{ PHYSICAL("10","物理操作"), - SOFT("20","软件操作"); + SOFT("20","软件操作"), + SCHEDULE("30","队列，定时操作"), + INSERT("40","插入动作"); private String value; private String description; From 48a6cdc39ce21c425a89f6df284800ad3b583e0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Thu, 17 Oct 2019 16:57:53 +0800 Subject: [PATCH 11/24] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=EF=BC=9A=E4=BD=9C=E4=B8=9A=E7=B1=BB=E5=9E=8B=20=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 5 ++++- 1 file changed, 4 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 fd3c9db..01f31a2 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 @@ -792,7 +792,10 @@ public class WmsEnumUtil { VDAINSTOCK("VDAINSTOCK", "VDA入库"), VDAMOVESTOCK("VDAMOVESTOCK", "VDA内部移库"), VDA_FAST_STOCK("VDA_FAST_STOCK", "VDA采购快速入库"), - VDAREPORT("VDAREPORT", "VDA生产报工"); + VDAREPORT("VDAREPORT", "VDA生产报工"), + VDA_FINISH_GOODS("VDA_FINISH_GOODS", "VDA生产快速入库"), + VDA_PICKING_GOODS("VDA_PICKING_GOODS", "VDA生产领料"), + VDA_ONE_PICKING_GOODS("VDA_ONE_PICKING_GOODS", "VDA单箱领料"); private String value; private String description; From 5e7fb00d0cfdb340805f9a1c915089657773a734 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Thu, 17 Oct 2019 18:59:36 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E3=80=90=E7=94=9F=E4=BA=A7=E9=A2=86?= =?UTF-8?q?=E6=96=99=E3=80=91?= 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 | 4 +++- 1 file changed, 3 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 01f31a2..822a771 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 @@ -621,7 +621,9 @@ public class WmsEnumUtil { AMPR(230, "AMPR", "AMPR"), FINISHGOODS(240, "FINISHGOODS", "VDA生产快速入库"), VDA_REPORT(250, "VDA_REPORT", "VDA生产报工"), - VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"); + VDA_PR_INSTOCK(260, "VDA_PR_INSTOCK", "VDA生产推荐入库"), + VDA_PICKING_GOODS(270, "VDA_PICKING_GOODS", "VDA生产领料"), + VDA_ONE_PICKING_GOODS(280, "VDA_ONE_PICKING_GOODS", "VDA单箱领料"); private int value; From 56d74578263a1231d9e5359893c8b0daf3685492 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Thu, 17 Oct 2019 19:16:02 +0800 Subject: [PATCH 13/24] =?UTF-8?q?=E5=B7=A5=E4=BD=8D=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 1 + .../i3plus/pojo/mes/pcn/bean/MesCellFeed.java | 10 +-- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 24 ++++-- .../i3plus/pojo/mes/pcn/bean/MesProductData.java | 95 ++++++++++++++++++++++ .../i3plus/pojo/mes/pcn/bean/MesRawPartSn.java | 4 +- .../pojo/mes/pcn/bean/MesWorkCellMonitorLog.java | 61 ++++++++++++++ .../pcn/repository/MesProductDataRepository.java | 16 ++++ .../MesWorkCellMonitorLogRepository.java | 13 +++ .../cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java | 10 +-- .../estsh/i3plus/pojo/mes/bean/MesProductData.java | 95 ++++++++++++++++++++++ .../pojo/mes/bean/MesWorkCellMonitorLog.java | 61 ++++++++++++++ .../mes/repository/MesProductDataRepository.java | 16 ++++ .../i3plus/pojo/model/mes}/StationRequestBean.java | 10 ++- .../cn/estsh/i3plus/pojo/model/mes/StepModel.java | 12 +++ 14 files changed, 406 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.java rename modules/{i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model => i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes}/StationRequestBean.java (90%) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 7bbf94e..478b538 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -1242,6 +1242,7 @@ public class MesEnumUtil { CUSTOM_COMPONENT("customComponent", "定制内容"), TASK_COMPLETE("taskComplete", "整个扫描完成"), STEP_RAN_STATUS("stepRanStatus", "工步列表执行前"), + RUNNING_INFO("runningInfo", "运行信息"), RENEW_REQUEST_PARAMS("renewRequestParams", "回传刷新StationResultBean"); diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java index 7b4d5df..b73cd80 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesCellFeed.java @@ -14,10 +14,10 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description :mes系统业务动作 + * @Description :工位投料信息 * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 + * @Author : Wynne.Lu + * @CreateDate : 2019-09-17 * @Modify: **/ @Data @@ -54,7 +54,7 @@ public class MesCellFeed extends BaseBean { @Column(name = "RAW_QTY") @ApiParam("特殊批次") - private Long rawQty; + private Double rawQty; @Column(name = "LOT_NO") @ApiParam("关联批次") @@ -64,7 +64,7 @@ public class MesCellFeed extends BaseBean { @ApiParam("供应商代码") private String supplierCode; - public long getRawQtyVal() { + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java index 756aea5..bb74b3e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Author: Wynne.Lu @@ -27,6 +28,7 @@ import javax.persistence.Table; @Api("PLC配置表") public class MesPlc extends BaseBean { + @Column(name = "PLC_CODE") @ApiParam("PLC代码") private String plcCode; @@ -63,23 +65,31 @@ public class MesPlc extends BaseBean { @ApiParam("分组名称") private String groupName; - @Column(name="EQUIPMENT_CODE") + @Column(name = "EQUIPMENT_CODE") @ApiParam("设备代码") private String equipmentCode; @Column(name = "WORK_CENTER_CODE") - @ApiParam("工作中心") + @ApiParam("生产线") private String workCenterCode; @Column(name = "WORK_CELL_CODE") - @ApiParam("工作单元") + @ApiParam("工位") private String workCellCode; - @Column(name = "ENABLED") - @ApiParam("是否启用 0 false 1 true") - private Integer enabled; - @Column(name = "PLC_CFG") @ApiParam("PLC的值的设定") private String plcCfg; + + @Column(name = "ANALYSIS_RULE") + @ApiParam("解析规则") + private String analysisRule; + + @Column(name = "IS_ANALYSIS") + @ApiParam("是否解析") + private String isAnalysis; + + @Transient + @ApiParam("设备名称") + private String equipmentName; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java new file mode 100644 index 0000000..f7d8843 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProductData.java @@ -0,0 +1,95 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :生产数据 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-10-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCT_DATA") +@Api("生产数据") +public class MesProductData extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_DESC") + @ApiParam("物料名称") + private String partDesc; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("字段名称") + private String fieldName; + + @Column(name = "FIELD_VALUE") + @ApiParam("字段值") + private String fieldValue; + + @Column(name = "ROW_NO") + @ApiParam("数据行号") + private String rowNo; + + @Column(name = "GROUP_NO") + @ApiParam("数据组号") + private String groupNo; + +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java index 7f01147..4a2bae6 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRawPartSn.java @@ -46,7 +46,7 @@ public class MesRawPartSn extends BaseBean { @Column(name = "RAW_QTY") @ApiParam("数量") - private Long rawQty; + private Double rawQty; @Column(name = "LOT_NO") @ApiParam("生产批次") @@ -64,7 +64,7 @@ public class MesRawPartSn extends BaseBean { @ApiParam("供应商代码") private String supplierCode; - public long getRawQtyVal() { + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java new file mode 100644 index 0000000..f8eb168 --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesWorkCellMonitorLog.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.pcn.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/16 2:42 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_MONITOR_LOG") +@Api("工位监控异常信息") +public class MesWorkCellMonitorLog extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "WORK_ORDER_NO") + @ApiParam("工单") + private String workOrderNo; + + @Column(name = "STEP_CODE") + @ApiParam("工步") + private String stepCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序") + private String processCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程") + private String routeCOde; + + @Column(name="MESSAGE") + @ApiParam("异常信息") + private String message; +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java new file mode 100644 index 0000000..eb8debf --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesProductDataRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesProductData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProductDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java new file mode 100644 index 0000000..672947b --- /dev/null +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWorkCellMonitorLogRepository.java @@ -0,0 +1,13 @@ +package cn.estsh.i3plus.pojo.mes.pcn.repository; + + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWorkCellMonitorLog; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/9/27 1:58 PM + * @Description: + **/ +public interface MesWorkCellMonitorLogRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java index dccf4fb..5505b11 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCellFeed.java @@ -14,10 +14,10 @@ import javax.persistence.Entity; import javax.persistence.Table; /** - * @Description :mes系统业务动作 + * @Description :工位投料信息 * @Reference : - * @Author : jack.jia - * @CreateDate : 2019-04-12 + * @Author : Wynne.Lu + * @CreateDate : 2019-09-17 * @Modify: **/ @Data @@ -54,7 +54,7 @@ public class MesCellFeed extends BaseBean { @Column(name = "RAW_QTY") @ApiParam("特殊批次") - private Long rawQty; + private Double rawQty; @Column(name = "LOT_NO") @ApiParam("关联批次") @@ -65,7 +65,7 @@ public class MesCellFeed extends BaseBean { private String supplierCode; - public long getRawQtyVal() { + public double getRawQtyVal() { return this.rawQty == null ? 0l : this.rawQty; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java new file mode 100644 index 0000000..ddd2dde --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProductData.java @@ -0,0 +1,95 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description :生产数据 + * @Reference : + * @Author : Wynne.Lu + * @CreateDate : 2019-10-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_PRODUCT_DATA") +@Api("生产数据") +public class MesProductData extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CENTER_NAME") + @ApiParam("工作中心名称") + private String workCenterName; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "WORK_CELL_NAME") + @ApiParam("工作单元名称") + private String workCellName; + + @Column(name="SERIAL_NUMBER") + @ApiParam("产品条码") + private String serialNumber; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "PART_DESC") + @ApiParam("物料名称") + private String partDesc; + + @Column(name = "EQU_CODE") + @ApiParam("设备代码") + private String equCode; + + @Column(name = "EQU_NAME") + @ApiParam("设备名称") + private String equName; + + @Column(name = "OBJECT_CODE") + @ApiParam("对象代码") + private String objectCode; + + @Column(name = "OBJECT_NAME") + @ApiParam("对象名称") + private String objectName; + + @Column(name = "FIELD_CODE") + @ApiParam("字段代码") + private String fieldCode; + + @Column(name = "FIELD_NAME") + @ApiParam("字段名称") + private String fieldName; + + @Column(name = "FIELD_VALUE") + @ApiParam("字段值") + private String fieldValue; + + @Column(name = "ROW_NO") + @ApiParam("数据行号") + private String rowNo; + + @Column(name = "GROUP_NO") + @ApiParam("数据组号") + private String groupNo; + +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java new file mode 100644 index 0000000..2aa0975 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellMonitorLog.java @@ -0,0 +1,61 @@ +package cn.estsh.i3plus.pojo.mes.bean; + + +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Author: Wynne.Lu + * @CreateDate: 2019/10/16 2:42 PM + * @Description: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name = "MES_WORK_CELL_MONITOR_LOG") +@Api("工位监控异常信息") +public class MesWorkCellMonitorLog extends BaseBean { + + @Column(name = "WORK_CENTER_CODE") + @ApiParam("工作中心") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam("工作单元") + private String workCellCode; + + @Column(name = "PART_NO") + @ApiParam("物料号") + private String partNo; + + @Column(name = "workOrderNo") + @ApiParam("工单") + private String workOrderNo; + + @Column(name = "STEP_CODE") + @ApiParam("工步") + private String stepCode; + + @Column(name = "PROCESS_CODE") + @ApiParam("工序") + private String processCode; + + @Column(name = "ROUTE_CODE") + @ApiParam("流程") + private String routeCOde; + + @Column(name="MESSAGE") + @ApiParam("异常信息") + private String message; +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.java new file mode 100644 index 0000000..3f8880c --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/repository/MesProductDataRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.mes.repository; + +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import cn.estsh.i3plus.pojo.mes.bean.MesProductData; +import org.springframework.stereotype.Repository; + +/** + * @Description : + * @Reference : + * @Author : jack.jia + * @CreateDate : 2019-04-02 + * @Modify: + **/ +@Repository +public interface MesProductDataRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java similarity index 90% rename from modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java rename to modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java index da1d6ed..e6e47f3 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StationRequestBean.java @@ -1,11 +1,12 @@ -package cn.estsh.i3plus.pojo.mes.pcn.model; +package cn.estsh.i3plus.pojo.model.mes; + + -import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; -import javax.persistence.Column; import java.io.Serializable; +import java.util.List; /** * @Description : 工位请求bean @@ -64,4 +65,7 @@ public class StationRequestBean implements Serializable { @ApiParam("托盘号") private String tray; + + @ApiParam("工步列表") + private List stepList; } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java index 19bf279..34409f4 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/StepModel.java @@ -47,6 +47,18 @@ public class StepModel implements Serializable { private boolean isComplete; /** + * 工步颜色 + */ + @ApiParam + private String color; + + /** + * 异常信息 + */ + @ApiParam + private String exMsg; + + /** * 工位扫描业务所需使用字段 */ @ApiParam("工步是否跳过") From 5a036f14cb88c0097a1011aebc792b15ca8cd1b8 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 17 Oct 2019 21:16:15 +0800 Subject: [PATCH 14/24] =?UTF-8?q?mes=E8=AE=BE=E5=A4=87=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 +- .../cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java | 18 ++++ .../pojo/mes/model/MesEquTaskDetailModel.java | 105 +++++++++++++++++++++ .../i3plus/pojo/mes/model/MesEquTaskModel.java | 97 +++++++++++++++++++ .../i3plus/pojo/mes/model/MesEquipmentModel.java | 9 ++ 5 files changed, 232 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java create mode 100644 modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java index 6f63bf5..a84a9a3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java @@ -289,10 +289,10 @@ public class MesEnumUtil { } /** - * mes设备作业要求-作业类型 + * mes设备-作业类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_EQU_TASK_STANDARD_TASK_TYPE { + public enum MES_EQU_TASK_TYPE { CHECK(10, "点检"), MAINTAIN(20, "保养"), @@ -301,7 +301,7 @@ public class MesEnumUtil { private int value; private String description; - MES_EQU_TASK_STANDARD_TASK_TYPE(int value, String description) { + MES_EQU_TASK_TYPE(int value, String description) { this.value = value; this.description = description; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java index 2ab832c..c4cf2a1 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesEquTask.java @@ -12,6 +12,8 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; +import java.util.List; /** * @Description :设备作业任务 @@ -65,4 +67,20 @@ public class MesEquTask extends BaseBean { @ApiParam("关联任务") private String relateTask; + @Transient + @ApiParam(value = "设备代码") + private String equipmentCode; + + @Transient + @ApiParam(value = "计划日期起始时间") + private String planTimeStart; + + @Transient + @ApiParam(value = "计划日期结束时间") + private String planTimeEnd; + + @Transient + @ApiParam(value ="明细列表") + private List mesEquTaskDetailList; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java new file mode 100644 index 0000000..e870983 --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskDetailModel.java @@ -0,0 +1,105 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskDetailModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("作业任务编号") + private String taskNo; + + @ApiParam("设备代码") + private String equipmentCode; + + @ApiParam("设备名称") + private String equipmentName; + + @ApiParam("执行状态") + private Integer actionStatus; + + @ApiParam("整体结果") + private Integer finalResult; + + @ApiParam("备注") + private String memo; + + @ApiParam("维修标识") + private Integer repairFlag; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam(value="生产线") + private String workCenterCode; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("有效性") + public Integer isValid; + + @ApiParam("是否已删除") + public Integer isDeleted; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + + @ApiParam("执行状态") + private String actionStatusName; + + @ApiParam("整体结果") + private String finalResultName; + + @ApiParam("维修标识") + private String repairFlagName; + + @ApiParam("作业类型") + private String taskTypeName; + + + public MesEquTaskDetailModel() { + + } + + public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, String workCenterCode) { + this.id = id; + this.taskNo = taskNo; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.workCenterCode = workCenterCode; + } + + public MesEquTaskDetailModel(Long id, String taskNo, String equipmentCode, String equipmentName, Integer actionStatus, Integer finalResult, String memo, Integer repairFlag, Integer taskType, String workCenterCode, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.taskNo = taskNo; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.actionStatus = actionStatus; + this.finalResult = finalResult; + this.memo = memo; + this.repairFlag = repairFlag; + this.taskType = taskType; + this.workCenterCode = workCenterCode; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java new file mode 100644 index 0000000..71f9cea --- /dev/null +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java @@ -0,0 +1,97 @@ +package cn.estsh.i3plus.pojo.mes.model; + +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import java.io.Serializable; + +@Data +public class MesEquTaskModel implements Serializable { + @ApiParam("id") + private Long id; + + @ApiParam("作业任务编号") + private String taskNo; + + @ApiParam("作业类型") + private Integer taskType; + + @ApiParam("作业状态") + private Integer taskStatus; + + @ApiParam(value="生产线") + private String workCenterCode; + + @ApiParam("计划日期") + private String planTime; + + @ApiParam("任务来源") + private Integer taskSource; + + @ApiParam("备注") + private String memo; + + @ApiParam("通知标识") + private Integer notifyFlag; + + @ApiParam("关联任务") + private String relateTask; + + @ApiParam("组织代码") + public String organizeCode; + + @ApiParam("有效性") + public Integer isValid; + + @ApiParam("是否已删除") + public Integer isDeleted; + + @ApiParam("创建用户") + public String createUser; + + @ApiParam("创建日期") + public String createDatetime; + + @ApiParam("修改人") + public String modifyUser; + + @ApiParam("修改日期") + public String modifyDatetime; + + @ApiParam("作业类型") + private String taskTypeName; + + @ApiParam("作业状态") + private String taskStatusName; + + @ApiParam("任务来源") + private String taskSourceName; + + @ApiParam("通知标识") + private String notifyFlagName; + + + public MesEquTaskModel() { + + } + + public MesEquTaskModel(Long id, String taskNo, Integer taskType, Integer taskStatus, String workCenterCode, String planTime, Integer taskSource, String memo, Integer notifyFlag, String relateTask, String organizeCode, Integer isValid, Integer isDeleted, String createUser, String createDatetime, String modifyUser, String modifyDatetime) { + this.id = id; + this.taskNo = taskNo; + this.taskType = taskType; + this.taskStatus = taskStatus; + this.workCenterCode = workCenterCode; + this.planTime = planTime; + this.taskSource = taskSource; + this.memo = memo; + this.notifyFlag = notifyFlag; + this.relateTask = relateTask; + this.organizeCode = organizeCode; + this.isValid = isValid; + this.isDeleted = isDeleted; + this.createUser = createUser; + this.createDatetime = createDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; + } +} diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java index 5e09c06..e68233c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java @@ -102,6 +102,15 @@ public class MesEquipmentModel implements Serializable { } + public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) { + this.id = id; + this.equipmentCode = equipmentCode; + this.equipmentName = equipmentName; + this.status = status; + this.workCenterCode = workCenterCode; + this.equipmentCategory = equipmentCategory; + } + public MesEquipmentModel(Long wcId, Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String workCellCode, String areaCode) { this.wcId = wcId; this.id = id; From 16839f69119a7a6ae1bbc9e2e624ea97765908db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Fri, 18 Oct 2019 09:38:57 +0800 Subject: [PATCH 15/24] =?UTF-8?q?=E6=88=90=E5=93=81=E5=86=B2=E9=94=80+?= =?UTF-8?q?=E6=8A=9B=E5=BC=82=E5=B8=B8=E6=96=B9=E6=B3=95=E5=B0=81=E8=A3=85?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/WmsWriteOffModel.java | 22 +++++++++++ .../estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java | 46 +++++++++++----------- 2 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java new file mode 100644 index 0000000..a72ed67 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java @@ -0,0 +1,22 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; + +/** + * @Description 冲销Model + * @Reference + * @Author dragon + * @CreateDate 2019/10/18 1:18 + * @Modify + */ +@Data +public class WmsWriteOffModel implements Serializable { + private static final long serialVersionUID = -5490167040159056107L; + private String locateNo; + private List snList; + private List> summaryList; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java index 8c3b8a2..3f75fd5 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java @@ -42,7 +42,7 @@ public class WmsMoveMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer orderStatus; @Column(name = "REMARK") @@ -58,7 +58,7 @@ public class WmsMoveMaster extends BaseBean { @ApiParam(value = "错误信息") private String errorMessage; - @Column(name="IS_URGENT") + @Column(name = "IS_URGENT") @ApiParam(value = "是否紧急", example = "0") public Integer isUrgent; @@ -68,7 +68,7 @@ public class WmsMoveMaster extends BaseBean { @Column(name = "BUSI_TYPE_CODE") @ApiParam(value = "业务类型编码") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") private Integer busiTypeCode; @Column(name = "REF_ORDER_NO") @@ -81,7 +81,7 @@ public class WmsMoveMaster extends BaseBean { @Transient @ApiParam("状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MOVE_ORDER_STATUS.class, refForeignKey = "value", value = "description") private Integer itemStatus; @Transient @@ -140,7 +140,7 @@ public class WmsMoveMaster extends BaseBean { @ApiParam("交易类型名称") private String transTypeName; - @Column(name="FIX_ID") + @Column(name = "FIX_ID") @ApiParam(value = "设备编号") public String fixId; @@ -164,16 +164,17 @@ public class WmsMoveMaster extends BaseBean { return isSnapshot == null ? 0 : isSnapshot.intValue(); } - public WmsMoveMaster(){}; + public WmsMoveMaster() { + } - public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, - Integer isUrgent,String carNo, Integer busiTypeCode, String refOrderNo, String refSrc,String partNo, Integer itemStatus,String remark, - String organizeCode,String createDatetime,String createUser,String modifyDatetime,String modifyUser,String fixId, + public WmsMoveMaster(String orderNo, Integer orderStatus, String transTypeCode, String errorMessage, + Integer isUrgent, String carNo, Integer busiTypeCode, String refOrderNo, String refSrc, String partNo, Integer itemStatus, String remark, + String organizeCode, String createDatetime, String createUser, String modifyDatetime, String modifyUser, String fixId, Double sumTranQty) { this.orderNo = orderNo; this.orderStatus = orderStatus; this.remark = remark; - this.isUrgent=isUrgent; + this.isUrgent = isUrgent; this.transTypeCode = transTypeCode; this.errorMessage = errorMessage; this.busiTypeCode = busiTypeCode; @@ -182,18 +183,18 @@ public class WmsMoveMaster extends BaseBean { this.refOrderNo = refOrderNo; this.carNo = carNo; this.refSrc = refSrc; - this.organizeCode =organizeCode; - this.createDatetime= createDatetime; + this.organizeCode = organizeCode; + this.createDatetime = createDatetime; this.createUser = createUser; - this.modifyDatetime =modifyDatetime; - this.modifyUser =modifyUser; + this.modifyDatetime = modifyDatetime; + this.modifyUser = modifyUser; this.fixId = fixId; this.transQty = sumTranQty; } - public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus, - String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty,String fixId,Integer busiTypeCode,String refSrc, - String createDatetime,String createUser,String modifyUser,String modifyDatetime) { + public WmsMoveMaster(Long id, String orderNo, String organizeCode, String partNo, String partNameRdd, String transTypeCode, String transTypeName, Integer itemStatus, + String unit, String srcWhNo, String srcZoneNo, String destWhNo, String destZoneNo, Double transQty, Double rejectQty, String fixId, Integer busiTypeCode, String refSrc, + String createDatetime, String createUser, String modifyUser, String modifyDatetime) { this.id = id; this.orderNo = orderNo; this.organizeCode = organizeCode; @@ -212,16 +213,17 @@ public class WmsMoveMaster extends BaseBean { this.fixId = fixId; this.busiTypeCode = busiTypeCode; this.refSrc = refSrc; - this.createDatetime= createDatetime; + this.createDatetime = createDatetime; this.createUser = createUser; - this.modifyUser =modifyUser; - this.modifyDatetime =modifyDatetime; + this.modifyUser = modifyUser; + this.modifyDatetime = modifyDatetime; } - public Double getTransQty(){ + public Double getTransQty() { return this.transQty == null ? 0 : this.transQty.doubleValue(); } - public int getBusiTypeCodeVal(){ + + public int getBusiTypeCodeVal() { return this.busiTypeCode == null ? 0 : this.busiTypeCode.intValue(); } } From 9edfa3d481b54b75c0c5be29780370b5b3968cdd Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 18 Oct 2019 09:56:59 +0800 Subject: [PATCH 16/24] =?UTF-8?q?=E5=AE=89=E7=81=AF=E7=9F=A5=E8=AF=86?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonKnowledgeBase.java | 38 +++++ .../i3plus/pojo/andon/bean/AndonManageQueue.java | 160 +----------------- .../i3plus/pojo/andon/model/BaseManageQueue.java | 180 +++++++++++++++++++++ .../repository/IAndonKnowledgeBaseRepository.java | 16 ++ 4 files changed, 236 insertions(+), 158 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java new file mode 100644 index 0000000..835046b --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonKnowledgeBase.java @@ -0,0 +1,38 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-18-9:13 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_KNOWLEDGE_BASE") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("ANDON知识库") +public class AndonKnowledgeBase extends BaseManageQueue { + @Column(name = "FLOW_STATUS") + @ApiParam(value = "审批状态") + private Integer flowStatus; + + @Column(name = "FLOW_MEMO") + @ApiParam(value = "审批意见") + private String flowMemo; + +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index ae634b1..573ca3e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.andon.bean; +import cn.estsh.i3plus.pojo.andon.model.BaseManageQueue; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; @@ -40,77 +41,11 @@ import java.util.List; @DynamicUpdate @EqualsAndHashCode(callSuper = true) @Api("安灯队列") -public class AndonManageQueue extends BaseBean { - - @Column(name = "ANDON_ORDER_NO") - @ApiParam(value = "安灯队列编号") - private String andonOrderNo; - - @Column(name = "ALARM_CODE") - @ApiParam(value = "安灯类型") - @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") - private String alarmCode; - - @Column(name = "ACTION_CODE") - @ApiParam(value = "安灯动作代码") - private String actionCode; - - @Column(name = "WORK_CENTER_CODE") - @ApiParam(value = "工作中心代码") - private String workCenterCode; - - @Column(name = "WORK_CENTER_NAME_RDD") - @ApiParam(value = "工作中心名称") - private String workCenterNameRdd; - - @Column(name = "WORK_CELL_NAME_RDD") - @ApiParam(value = "工作单元名称") - private String workCellNameRdd; - - @Column(name = "WORK_CELL_CODE") - @ApiParam(value = "工作单元代码") - private String workCellCode; - - @Column(name = "EQUIPMENT_CODE") - @ApiParam(value = "设备代码") - private String equipmentCode; - - @Column(name = "EQUIPMENT_NAME_RDD") - @ApiParam(value = "设备名称") - private String equipmentNameRdd; - - @Column(name = "SHIFT_CODE") - @ApiParam(value = "班次代码") - private String shiftCode; - - @Column(name = "SHIFT_NAME_RDD") - @ApiParam(value = "班次名称") - private String shiftNameRdd; - - @Column(name = "STATUS_CODE") - @ApiParam(value = "安灯状态代码") - private String statusCode; - +public class AndonManageQueue extends BaseManageQueue { @Column(name = "SEQ") @ApiParam(value = "序号", example = "1") private Double seq; - @Column(name = "PRIORITY_LEVEL") - @ApiParam(value = "优先级别", example = "1") - private Integer priorityLevel; - - @Column(name="CALL_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") - @AnnoOutputColumn(hidden = true) - public String callTime; - - @Column(name="CLOSE_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="撤销时间",example = "2018-01-01 01:00:00") - @AnnoOutputColumn(hidden = true) - public String closeTime; - @Transient @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @ApiParam(value="呼叫时间，查询开始时间", example = "2018-01-01 01:00:00") @@ -121,42 +56,14 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value="呼叫时间，查询结束时间", example = "2018-01-01 01:00:00") public String callTimeEnd; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @Column(name="CONFIRM_TIME") - @ApiParam(value = "响应时间", example = "2018-01-01 01:00:00") - @AnnoOutputColumn(hidden = true) - public String confirmTime; - - @Column(name="RESET_TIME") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") - @AnnoOutputColumn(hidden = true) - public String resetTime; - - @Column(name = "CALL_USER") - @ApiParam(value = "呼叫人") - private String callUser; - - @Column(name = "CLOSE_USER") - @ApiParam(value = "撤销人") - private String closeUser; - @Transient @ApiParam(value = "呼叫人名字") private String callUserName; - @Column(name = "CONFIRM_USER") - @ApiParam(value = "响应人") - private String confirmUser; - @Transient @ApiParam(value = "响应人名字") private String confirmUserName; - @Column(name = "RESET_USER") - @ApiParam(value = "解决人") - private String resetUser; - @Column(name = "SOURCE_TYPE") @ApiParam(value = "安灯来源类型") private String sourceType = AndonEnumUtil.ALARM_SOURCE_TYPE.SOFT.getValue(); @@ -187,58 +94,6 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "转呼通知等级") private String scRpLevel; - @Column(name = "AC_CODE") - @ApiParam(value = "呼叫原因代码") - private String acCode; - - @Column(name = "AC_NAME_RDD") - @ApiParam(value = "呼叫原因描述") - private String acNameRdd; - - @Column(name = "AC_DESC") - @ApiParam(value = "呼叫具体原因") - private String acDesc; - - @Column(name = "EC_CODE") - @ApiParam(value = "事件原因代码") - private String ecCode; - - @Column(name = "EC_NAME_RDD") - @ApiParam(value = "事件原因描述") - private String ecNameRdd; - - @Column(name = "EC_DESC") - @ApiParam(value = "事件具体原因") - private String ecDesc; - - @Column(name = "EM_CODE") - @ApiParam(value = "事件方法代码") - private String emCode; - - @Column(name = "EM_NAME_RDD") - @ApiParam(value = "事件方法描述") - private String emNameRdd; - - @Column(name = "CLOSE_CAUSE") - @ApiParam(value = "撤销原因") - private String closeCause; - - @Column(name = "EM_DESC") - @ApiParam(value = "事件具体方法") - private String emDesc; - - @Column(name = "IS_HALT") - @ApiParam(value = "是否停机", example = "1") - private Integer isHalt; - - @Column(name = "HALT_CODE") - @ApiParam(value = "停机类型") - private String haltCode; - - @Column(name = "HALT_DESC") - @ApiParam(value = "停机具体原因") - private String haltDesc; - @Transient @ApiParam(value = "异常时长", example = "0") private Long execptionTime; @@ -288,23 +143,12 @@ public class AndonManageQueue extends BaseBean { private String signSendFlag; /** - * 处理类型：10=标准处理，20=自处理 - */ - @Column(name = "DISPOSAL_TYPE") - @ApiParam(value = "处理类型") - private String disposalType; - - /** * 1 = 是，2 = 否 */ @Transient @ApiParam(value = "是否勾选加入自处理问题库", example = "2") private Integer isDisposal; - @Column(name = "ALARM_DETAIL_CODE") - @ApiParam(value = "安灯子类型代码") - private String alarmDetailCode; - @Column(name = "ALARM_DETAIL_NAME_RDD") @ApiParam(value = "安灯子类型名称") private String alarmDetailNameRdd; diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java new file mode 100644 index 0000000..5585338 --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/model/BaseManageQueue.java @@ -0,0 +1,180 @@ +package cn.estsh.i3plus.pojo.andon.model; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +import javax.persistence.Column; +import javax.persistence.MappedSuperclass; + +/** + * @Description: + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-18-8:36 + * @Modify: + **/ +@Data +@MappedSuperclass +public class BaseManageQueue extends BaseBean { + + @Column(name = "ANDON_ORDER_NO") + @ApiParam(value = "安灯队列编号") + public String andonOrderNo; + + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型") + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") + public String alarmCode; + + @Column(name = "ACTION_CODE") + @ApiParam(value = "安灯动作代码") + public String actionCode; + + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + public String workCenterCode; + + @Column(name = "WORK_CENTER_NAME_RDD") + @ApiParam(value = "工作中心名称") + public String workCenterNameRdd; + + @Column(name = "WORK_CELL_NAME_RDD") + @ApiParam(value = "工作单元名称") + public String workCellNameRdd; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + public String workCellCode; + + @Column(name = "EQUIPMENT_CODE") + @ApiParam(value = "设备代码") + public String equipmentCode; + + @Column(name = "EQUIPMENT_NAME_RDD") + @ApiParam(value = "设备名称") + public String equipmentNameRdd; + + @Column(name = "SHIFT_CODE") + @ApiParam(value = "班次代码") + public String shiftCode; + + @Column(name = "SHIFT_NAME_RDD") + @ApiParam(value = "班次名称") + public String shiftNameRdd; + + @Column(name = "STATUS_CODE") + @ApiParam(value = "安灯状态代码") + public String statusCode; + + @Column(name = "PRIORITY_LEVEL") + @ApiParam(value = "优先级别", example = "1") + public Integer priorityLevel; + + @Column(name="CALL_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="呼叫时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String callTime; + + @Column(name="CLOSE_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="撤销时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String closeTime; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @Column(name="CONFIRM_TIME") + @ApiParam(value = "响应时间", example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String confirmTime; + + @Column(name="RESET_TIME") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + @ApiParam(value="解决时间",example = "2018-01-01 01:00:00") + @AnnoOutputColumn(hidden = true) + public String resetTime; + + @Column(name = "CALL_USER") + @ApiParam(value = "呼叫人") + public String callUser; + + @Column(name = "CLOSE_USER") + @ApiParam(value = "撤销人") + public String closeUser; + + @Column(name = "CONFIRM_USER") + @ApiParam(value = "响应人") + public String confirmUser; + + @Column(name = "RESET_USER") + @ApiParam(value = "解决人") + public String resetUser; + + @Column(name = "CLOSE_CAUSE") + @ApiParam(value = "撤销原因") + public String closeCause; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + public String acCode; + + @Column(name = "AC_NAME_RDD") + @ApiParam(value = "呼叫原因描述") + public String acNameRdd; + + @Column(name = "AC_DESC") + @ApiParam(value = "呼叫具体原因") + public String acDesc; + + @Column(name = "EC_CODE") + @ApiParam(value = "事件原因代码") + public String ecCode; + + @Column(name = "EC_NAME_RDD") + @ApiParam(value = "事件原因描述") + public String ecNameRdd; + + @Column(name = "EC_DESC") + @ApiParam(value = "事件具体原因") + public String ecDesc; + + @Column(name = "EM_CODE") + @ApiParam(value = "事件方法代码") + public String emCode; + + @Column(name = "EM_NAME_RDD") + @ApiParam(value = "事件方法描述") + public String emNameRdd; + + + @Column(name = "EM_DESC") + @ApiParam(value = "事件具体方法") + public String emDesc; + + @Column(name = "IS_HALT") + @ApiParam(value = "是否停机", example = "1") + public Integer isHalt; + + @Column(name = "HALT_CODE") + @ApiParam(value = "停机类型") + public String haltCode; + + @Column(name = "HALT_DESC") + @ApiParam(value = "停机具体原因") + public String haltDesc; + + /** + * 处理类型：10=标准处理，20=自处理 + */ + @Column(name = "DISPOSAL_TYPE") + @ApiParam(value = "处理类型") + public String disposalType; + + @Column(name = "ALARM_DETAIL_CODE") + @ApiParam(value = "安灯子类型代码") + public String alarmDetailCode; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java new file mode 100644 index 0000000..2e3036f --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonKnowledgeBaseRepository.java @@ -0,0 +1,16 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonKnowledgeBase; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; +import org.springframework.stereotype.Repository; + +/** + * @Description: 知识库管理 + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-18-9:16 + * @Modify: + **/ +@Repository +public interface IAndonKnowledgeBaseRepository extends BaseRepository { +} From 9f9874902dd81cddfa4028c14e69884cbba958cf Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 18 Oct 2019 10:21:51 +0800 Subject: [PATCH 17/24] =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/i3plus-pojo-andon/pom.xml | 2 +- modules/i3plus-pojo-aps/pom.xml | 2 +- modules/i3plus-pojo-base/pom.xml | 2 +- modules/i3plus-pojo-form/pom.xml | 2 +- modules/i3plus-pojo-hardswitch/pom.xml | 2 +- modules/i3plus-pojo-jobflow/pom.xml | 2 +- modules/i3plus-pojo-lac/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-report/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 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/modules/i3plus-pojo-andon/pom.xml b/modules/i3plus-pojo-andon/pom.xml index f8fa98e..ebd53c3 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-aps/pom.xml b/modules/i3plus-pojo-aps/pom.xml index 4426ba9..b6adafd 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-base/pom.xml b/modules/i3plus-pojo-base/pom.xml index d790ef1..e97c0bb 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-form/pom.xml b/modules/i3plus-pojo-form/pom.xml index c6141da..90e744d 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-hardswitch/pom.xml b/modules/i3plus-pojo-hardswitch/pom.xml index 23e5bee..0ba3645 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-jobflow/pom.xml b/modules/i3plus-pojo-jobflow/pom.xml index c1e2cb9..6706323 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-lac/pom.xml b/modules/i3plus-pojo-lac/pom.xml index 86d7736..3681eb6 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes-pcn/pom.xml b/modules/i3plus-pojo-mes-pcn/pom.xml index 09f2c4a..e388a1d 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-mes/pom.xml b/modules/i3plus-pojo-mes/pom.xml index 82fdbe8..62ebe64 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-model/pom.xml b/modules/i3plus-pojo-model/pom.xml index 0798953..39a7704 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-platform/pom.xml b/modules/i3plus-pojo-platform/pom.xml index ec9e100..e310bfd 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-report/pom.xml b/modules/i3plus-pojo-report/pom.xml index bd09726..e36fcf7 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-softswitch/pom.xml b/modules/i3plus-pojo-softswitch/pom.xml index 4c96781..81fb02b 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-sweb/pom.xml b/modules/i3plus-pojo-sweb/pom.xml index 2c24e41..1f622d9 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-wms/pom.xml b/modules/i3plus-pojo-wms/pom.xml index 18c811c..bc41914 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/modules/i3plus-pojo-workflow/pom.xml b/modules/i3plus-pojo-workflow/pom.xml index 1171f4e..93f9732 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-DEV-SNAPSHOT ../../pom.xml 4.0.0 diff --git a/pom.xml b/pom.xml index f220aa1..f355cca 100644 --- a/pom.xml +++ b/pom.xml @@ -15,7 +15,7 @@ i3plus.pojo i3plus-pojo pom - 1.0-TEST-SNAPSHOT + 1.0-DEV-SNAPSHOT modules/i3plus-pojo-base modules/i3plus-pojo-platform From 2dc63a9a4e0b0e62d0ac9b643c47be2fb0d70ec5 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Oct 2019 11:15:20 +0800 Subject: [PATCH 18/24] =?UTF-8?q?1=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AD=97=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=9C=A8=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=B8=8D=E6=98=BE=E7=A4=BA=202=EF=BC=9A=E4=B8=BA?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4=E5=80=BC?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/FieldAnnotation.java | 1 + .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 4 ++ .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 14 +++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 63 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/aps/common/BaseAPS.java | 2 + .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 3 ++ .../estsh/i3plus/pojo/aps/common/BeanRelation.java | 4 +- .../pojo/aps/enums/RESOURCE_CHOISE_RULE.java | 4 ++ .../i3plus/pojo/aps/enums/WORK_SORT_RULE.java | 31 +++++++++++ .../i3plus/pojo/aps/holders/EResCalendar.java | 2 + .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 19 +++---- .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 7 +++ .../pojo/aps/repository/IWorkPlanRepository.java | 9 ++++ .../src/main/resources/relations/ResCalendar.xml | 4 ++ .../src/main/resources/relations/WorkInput.xml | 12 ++--- .../src/main/resources/relations/WorkPlan.xml | 9 ++++ 18 files changed, 179 insertions(+), 17 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index a8484af..6a0a0d2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -20,4 +20,5 @@ public @interface FieldAnnotation { boolean display() default true; // 是否需要在界面显示 int pric() default 2; // 对于浮点型，界面显示的精度 boolean mainkey() default false; // 是否为主键 + String defaultValue() default ""; // 字段的默认值 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 817df4a..be169d1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -80,6 +80,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="数据库类型") private JDBCType jdbcType; + @Column(name="DEFAULT_VALUE") + @ApiParam(value ="字段默认值") + private String defaultValue; + @JsonIgnore private transient Class clazz; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index 4483e7e..46880ed 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; @@ -31,10 +32,12 @@ import java.util.List; public class Material extends BaseCode { @Column(name="TYPE") @ApiParam(value ="类型") + @FieldAnnotation(defaultValue = "PRODUCT") private MATERIAL_TYPE type; @Column(name="PREPARE_TYPE") @ApiParam(value ="备料类型") + @FieldAnnotation(defaultValue = "SELF_MAKE") private PREPARE_TYPE prepareType; @Column(name="REPL_TYPE") @@ -68,10 +71,12 @@ public class Material extends BaseCode { @Column(name="LEVEL") @ApiParam(value ="低阶码") @RippleAnnotation(dependence = {"OperOutputs.Operation.ProductRouting.Material"}, method = "calcLevel") + @FieldAnnotation(modify = false) private Integer level; @Column(name="IS_AUTO_FIX_PEGGING") @ApiParam(value ="自动补充标识") + @FieldAnnotation(defaultValue = "true") private Boolean autoFixPegging; @Column(name="MAX_PRODUCT_BATCH") @@ -80,6 +85,7 @@ public class Material extends BaseCode { @Column(name="MIN_PRODUCT_BATCH") @ApiParam(value ="最小制造批量") + @FieldAnnotation(defaultValue = "0.0") private Double minProductBatch; @Column(name="UNIT_PRODUCT_BATCH") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index 7edd19f..2ec0cbc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -1,6 +1,9 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EResCalendar; +import com.fasterxml.jackson.annotation.JsonBackReference; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -8,6 +11,7 @@ import lombok.Data; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import java.util.List; /** * @Description :日历 @@ -40,4 +44,14 @@ public class ResCalendar extends BaseAPS { @Column(name="PRIORITY") @ApiParam(value ="优先级") private Integer priority; + + @JsonBackReference + public List getDayShifts() { + return BeanRelation.list(this, EResCalendar.DayShifts); + } + + @JsonBackReference + public List getResources() { + return BeanRelation.list(this, EResCalendar.Resources); + } } 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 a9992f3..896eb83 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -184,4 +184,6 @@ public class Work extends BaseCode { public List getPlanFeedbacks() { return BeanRelation.list(this, EWork.PlanFeedbacks); } + + public WorkPlan getWorkPlan() { return BeanRelation.get(this, EWork.WorkPlan); } } 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 new file mode 100644 index 0000000..546b590 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -0,0 +1,63 @@ +package cn.estsh.i3plus.pojo.aps.bean; + +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; +import cn.estsh.i3plus.pojo.aps.common.BeanRelation; +import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan; +import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation; +import io.swagger.annotations.Api; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Entity; +import javax.persistence.Table; +import java.util.Date; + +/** + * @Description :工作计划 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-10-17 + * @Modify: + **/ +@Data +@Entity +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Table(name="APS_WORK_PLAN") +@Api("工作计划") +public class WorkPlan extends BaseAPS { + private Date prevSetStart; + private Date prevSetEnd; + private String prevSetTime; + private Date produceStart; + private Date produceEnd; + private String produceTime; + private Date postSetStart; + private Date postSetEnd; + private String postSetTime; + private Date lockStart; + private Date lockEnd; + private String lockTime; + + private Date edgeTime; + + private Long workId; + private Long resourceId; + + public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); } + + public void setWork(Work work) { + this.workId = work != null ? work.getId() : 0l; + BeanRelation.set(this, EWorkPlan.Work, work); + } + + public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); } + + public void setResource(Resource resource) { + this.resourceId = resource != null ? resource.getId() : 0l; + BeanRelation.set(this, EWorkPlan.Resource, resource); + } +} 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 8b1c8f9..e61ce60 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 @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.common; import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import javax.persistence.MappedSuperclass; @@ -18,6 +19,7 @@ import java.util.Map; @Data @MappedSuperclass public abstract class BaseAPS extends BaseBean { + @JsonIgnore private transient Map customFields = new HashMap<>(); public Object getCustomField(String code) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java index de0cb5f..4c43a95 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java @@ -287,6 +287,9 @@ public class BeanInfo { case STRING: cls = String.class; break; + case DURATION: + cls = DateDuration.class; + break; default: break; } 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 1eaa05e..6c7e206 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 @@ -217,7 +217,7 @@ public class BeanRelation { * @param bean * @param holder */ - private static void remove(BaseBean bean, Enum holder) { + public static void remove(BaseBean bean, Enum holder) { if (bean == null || holder == null) { return; } @@ -241,7 +241,7 @@ public class BeanRelation { * @param holder * @param relaBean */ - private static void remove(BaseBean bean, Enum holder, BaseBean relaBean) { + public static void remove(BaseBean bean, Enum holder, BaseBean relaBean) { if (bean == null || holder == null) { return; } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java new file mode 100644 index 0000000..864cf3e --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java @@ -0,0 +1,4 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +public enum RESOURCE_CHOISE_RULE { +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java new file mode 100644 index 0000000..4984c67 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java @@ -0,0 +1,31 @@ +package cn.estsh.i3plus.pojo.aps.enums; + +/** + * @Description :预置的工作排序规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ +public enum WORK_SORT_RULE { + NONE, + ORDER_DELIVERY, // 订单交货期 + ORDER_PRIORITY, // 订单优先级 + ORDER_ESTSTART, // 订单最早开始时刻 + ORDER_COUNT, // 订单数量 + ORDER_RECEIVE_DATE,// 订单接单日期 + ORDER_LET_MINUS_EST,// 订单交货期与订单最早开始时刻之差 + ORDER_PRESSURE, // 订单紧迫程度 + ORDER_SURPLUS, // 订单余裕度 + REMAIN_OPERATION_COUNT,// 残留工序数 + REMAIN_PRODUCT, // 残留生产时间 + MINSTE_PREMAIN,// 最小工序宽裕时间 + WORK_LET, // 工作最晚结束时刻 + WORK_EST, // 工作最早开始时刻 + ORDER_STOCK_RELA, // 订单物品库存量相对值 + ORDER_FIRST_WORK_START,// 订单首工作上次开始时刻 + HAVE_HIGH_WORK, // 订单中含有高级别工作 + WORK_RESOURCE_COUNT, // 工作的可用资源数 + WORK_SCHED_APPROX,// 与已排工作近视度 + TOP_ORDER_DELIVERY;// 顶层订单的交货期 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java index 86fd054..1717230 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EResCalendar.java @@ -1,4 +1,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EResCalendar { + DayShifts, + Resources } 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 13dee44..47da0e1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -1,13 +1,14 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EWork { - Order, - ParentWork, - WorkResources, - WorkInputs, - WorkOutputs, - PrevRelations, - PostRelations, - Operation, - PlanFeedbacks + Order, // 订单 + ParentWork, // 父工作 + WorkResources, // 工作资源 + WorkInputs, // 工作输入 + WorkOutputs, // 工作输出 + PrevRelations, // 前关联 + PostRelations, // 后关联 + Operation, // 工序 + PlanFeedbacks, // 工作计划反馈 + WorkPlan // 关联的为主资源的计划 } 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 new file mode 100644 index 0000000..f288a42 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -0,0 +1,7 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EWorkPlan { + Work, + Resource, + AssPlans // 关联的为副资源的工作计划 +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java new file mode 100644 index 0000000..a843876 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/IWorkPlanRepository.java @@ -0,0 +1,9 @@ +package cn.estsh.i3plus.pojo.aps.repository; + +import cn.estsh.i3plus.pojo.aps.bean.WorkPlan; +import org.springframework.data.repository.CrudRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface IWorkPlanRepository extends CrudRepository { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml index d35accc..d2d6643 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ResCalendar.xml @@ -1,3 +1,7 @@ + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml index c1f7586..369d560 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkInput.xml @@ -1,9 +1,9 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml new file mode 100644 index 0000000..219bf07 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file From 1d3fc8b5c9a929de79152e7be88281aa9268ed6a Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Fri, 18 Oct 2019 17:17:52 +0800 Subject: [PATCH 19/24] =?UTF-8?q?mes=E4=BD=9C=E4=B8=9A=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java | 4 ++-- .../main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java | 1 - .../{MesWorkOrderButtonModel.java => MesButtonFlagModel.java} | 7 +++++-- .../main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java | 3 +++ 4 files changed, 10 insertions(+), 5 deletions(-) rename modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/{MesWorkOrderButtonModel.java => MesButtonFlagModel.java} (85%) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java index 8edb6bf..a5e62dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrder.java @@ -1,7 +1,7 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; +import cn.estsh.i3plus.pojo.mes.model.MesButtonFlagModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -201,7 +201,7 @@ public class MesWorkOrder extends BaseBean { @Transient @ApiParam("mes生产工单页面按钮控制") - private MesWorkOrderButtonModel workOrderButtonModel; + private MesButtonFlagModel workOrderButtonModel; @Transient @ApiParam(value = "下达按钮编号") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java index df1dcb6..67a37dc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkOrderLog.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.mes.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.mes.model.MesWorkOrderButtonModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java similarity index 85% rename from modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java rename to modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java index 4a5af7e..1928952 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesWorkOrderButtonModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesButtonFlagModel.java @@ -17,8 +17,8 @@ import java.io.Serializable; @Data @NoArgsConstructor @AllArgsConstructor -@Api("mes生产工单页面按钮控制model") -public class MesWorkOrderButtonModel implements Serializable { +@Api("mes页面按钮控制model") +public class MesButtonFlagModel implements Serializable { @ApiParam("修改按钮") private boolean updateButton; @@ -47,5 +47,8 @@ public class MesWorkOrderButtonModel implements Serializable { @ApiParam("完成按钮") private boolean completeButton; + @ApiParam("关闭按钮-提醒") + private boolean closeButtonNoticeFlag; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java index 71f9cea..b1bb02b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquTaskModel.java @@ -70,6 +70,9 @@ public class MesEquTaskModel implements Serializable { @ApiParam("通知标识") private String notifyFlagName; + @ApiParam("mes设备作业任务页面按钮控制") + private MesButtonFlagModel equTaskButtonFlagModel; + public MesEquTaskModel() { From 5a682467d1deefa3ecb6a3f830c2bf207d872eeb Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 18 Oct 2019 17:37:15 +0800 Subject: [PATCH 20/24] =?UTF-8?q?1=EF=BC=9A=E5=9C=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E8=A1=A8=E4=B8=AD=E6=96=B0=E5=A2=9E=E6=9E=9A?= =?UTF-8?q?=E4=B8=BE=E9=A1=B9=E6=95=B0=E7=BB=84=EF=BC=8C=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E5=9C=A8=E9=80=89=E6=8B=A9=E6=9E=9A=E4=B8=BE=E5=86=85=E5=AE=B9?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E9=9C=80=E8=A6=81=E5=86=8D=E4=BB=8E=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E8=8E=B7=E5=8F=96=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 5 ++++- .../estsh/i3plus/pojo/aps/bean/OperResource.java | 4 ++++ .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 4 ++++ .../pojo/aps/enums/RESOURCE_CHOISE_RULE.java | 18 +++++++++++++++++ .../i3plus/pojo/aps/enums/WORK_SORT_RULE.java | 23 +++++++++++----------- 5 files changed, 42 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index be169d1..f302131 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -41,7 +41,7 @@ public class FieldInfo extends BaseCode { private FIELD_TYPE type; @Column(name="TYPE_NAME") - @ApiParam(value ="类型全称") + @ApiParam(value ="类型名称") private String typeName; @Column(name="CUSTOMIZE") @@ -84,6 +84,9 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="字段默认值") private String defaultValue; + @ApiParam(value ="枚举项内容") + private transient Enum[] enumItems; + @JsonIgnore private transient Class clazz; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index b56b850..4957a0e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -59,6 +59,10 @@ public class OperResource extends BaseAPS { @ApiParam(value ="优先级") private Integer priority; + @Column(name="USER_MATCH_NUMBER") + @ApiParam(value ="资源使用配套号") + private String userMatchNumber; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java index 2e9b10d..d500003 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java @@ -58,6 +58,10 @@ public class WorkResource extends BaseAPS { @ApiParam(value ="最大后设置中断时间") private String maxPostSdTime; + @Column(name="USER_MATCH_NUMBER") + @ApiParam(value ="资源使用配套号") + private String userMatchNumber; + @Column(name="WORK_ID") @ApiParam(value ="工作") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java index 864cf3e..deb2079 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CHOISE_RULE.java @@ -1,4 +1,22 @@ package cn.estsh.i3plus.pojo.aps.enums; +/** + * @Description :预置的资源选择规则 + * @Reference : + * @Author : jason.niu + * @CreateDate : 2019-09-17 + * @Modify: + **/ public enum RESOURCE_CHOISE_RULE { + PREV_SET_TIME, // 前设置时间 + PRODUCE_TIME, // 生产时间 + POST_SET_TIME, // 后设置时间 + WORK_WAIT_TIME, // 工作等待时间 + RES_BALANCE, // 资源均衡度 + SAME_MATERIAL, // 相同物料 + SAME_ORDER, // 相同订单 + NEARLY_WORK, // 前后工作 + POST_RESOURCE, // 后资源制约 + SAME_ASS_RESOURCE, // 相同副资源 + RESOURCE_PRIORITY; // 资源优先级 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java index 4984c67..99a6d77 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_SORT_RULE.java @@ -9,23 +9,24 @@ package cn.estsh.i3plus.pojo.aps.enums; **/ public enum WORK_SORT_RULE { NONE, - ORDER_DELIVERY, // 订单交货期 + ORDER_LET, // 订单交货期 ORDER_PRIORITY, // 订单优先级 - ORDER_ESTSTART, // 订单最早开始时刻 + ORDER_EST, // 订单最早开始时刻 ORDER_COUNT, // 订单数量 ORDER_RECEIVE_DATE,// 订单接单日期 - ORDER_LET_MINUS_EST,// 订单交货期与订单最早开始时刻之差 + ORDER_LET_SUB_EST,// 订单交货期与订单最早开始时刻之差 ORDER_PRESSURE, // 订单紧迫程度 ORDER_SURPLUS, // 订单余裕度 - REMAIN_OPERATION_COUNT,// 残留工序数 - REMAIN_PRODUCT, // 残留生产时间 - MINSTE_PREMAIN,// 最小工序宽裕时间 + NOPLAN_OPERATION_SIZE,// 残留工序数 + REMAIN_PRODUCE_TIME, // 残留生产时间 + MIN_OPERATION_REMAIN_TIME,// 最小工序宽裕时间 WORK_LET, // 工作最晚结束时刻 WORK_EST, // 工作最早开始时刻 - ORDER_STOCK_RELA, // 订单物品库存量相对值 - ORDER_FIRST_WORK_START,// 订单首工作上次开始时刻 + INVENTORY_RELA, // 订单物品库存量相对值 + FIRST_WORK_BEGIN,// 订单首工作上次开始时刻 HAVE_HIGH_WORK, // 订单中含有高级别工作 - WORK_RESOURCE_COUNT, // 工作的可用资源数 - WORK_SCHED_APPROX,// 与已排工作近视度 - TOP_ORDER_DELIVERY;// 顶层订单的交货期 + WORK_RESOURCE_SIZE, // 工作的可用资源数 + TOP_ORDER_LET,// 顶层订单的交货期 + TOP_ORDER_CODE, // 顶层订单代码 + TOP_ORDER_PRIORITY; // 顶层订单优先级 } From f6be80db0173dbed668bc7a5e66185303b05d77a Mon Sep 17 00:00:00 2001 From: "bleakney.liu" Date: Sat, 19 Oct 2019 17:41:25 +0800 Subject: [PATCH 21/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0groupby=20=E6=9E=84?= =?UTF-8?q?=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java | 13 ++++++++++++- .../cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java | 8 ++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java index 9722217..a1832ae 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSFactTrans.java @@ -149,12 +149,23 @@ public class WmsCSFactTrans extends BaseBean { this.srcZoneNo = srcZoneNo; this.srcWhNo = srcWhNo; } - + public WmsCSFactTrans(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) { + this.partNo=partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.qty=qty; + } public WmsCSFactTrans(Long countBoxQty,Double sumPartQty,String zoneNo, String partNo, String partNameRdd) { this.countBoxQty = countBoxQty; this.sumPartQty = sumPartQty; this.zoneNo = zoneNo; this.partNo = partNo; this.partNameRdd = partNameRdd; + } + + + } 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 6461ae8..5addb05 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 @@ -178,4 +178,12 @@ public class WmsCSOrderDetails extends BaseBean { this.organizeCode = organizeCode; this.transStatus = transStatus; } + public WmsCSOrderDetails(String partNo,String partNameRdd,String unit, String orderNo, String organizeCode,double qty) { + this.partNo=partNo; + this.partNameRdd = partNameRdd; + this.unit = unit; + this.orderNo = orderNo; + this.organizeCode = organizeCode; + this.qty=qty; + } } From 0fdabe49507df48e0c6cb957537927466d522e13 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sat, 19 Oct 2019 19:36:43 +0800 Subject: [PATCH 22/24] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=20=EF=BC=8C?= =?UTF-8?q?=E8=87=AA=E5=A4=84=E7=90=86=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/andon/bean/AndonDisposalCfg.java | 10 +++- .../pojo/andon/bean/AndonDisposalMaintenCfg.java | 65 ++++++++++++++++++++++ .../IAndonDisposalMaintenCfgRepository.java | 14 +++++ .../i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 44 +++++++++++++++ .../i3plus/pojo/base/enumutil/AndonEnumUtil.java | 47 ++++++++++++++++ 5 files changed, 177 insertions(+), 3 deletions(-) create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java create mode 100644 modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java index 26d333c..96463f0 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalCfg.java @@ -51,8 +51,12 @@ public class AndonDisposalCfg extends BaseBean { @ApiParam(value = "呼叫原因描述") private String acNameRdd; - @AnnoOutputColumn(refClass = AndonEnumUtil.APPROVAL_STATUS.class,refForeignKey = "value",value = "description") - @Column(name = "APPROVAL_STATUS") + @AnnoOutputColumn(refClass = AndonEnumUtil.KNOWLEDGE_AUDIT_STATUS.class,refForeignKey = "value",value = "description") + @Column(name = "FLOW_STATUS") @ApiParam(value = "审批状态") - private String approvalStatus; + private Integer flowStatus; + + @Column(name = "FLOW_MEMO") + @ApiParam(value = "审批意见") + private String flowMemo; } diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java new file mode 100644 index 0000000..a0b4eed --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonDisposalMaintenCfg.java @@ -0,0 +1,65 @@ +package cn.estsh.i3plus.pojo.andon.bean; + +import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; +import cn.estsh.i3plus.pojo.base.bean.BaseModelBean; +import cn.estsh.i3plus.pojo.base.enumutil.AndonEnumUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiParam; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Table; + +/** + * @Description: 自处理维护配置 + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-19-14:56 + * @Modify: + **/ +@Data +@Entity +@Table(name="ANDON_DISPOSAL_MAINTEN_CFG") +@DynamicInsert +@DynamicUpdate +@EqualsAndHashCode(callSuper = true) +@Api("Andon自处理维护配置") +public class AndonDisposalMaintenCfg extends BaseBean { + @Column(name = "WORK_CENTER_CODE") + @ApiParam(value = "工作中心代码") + private String workCenterCode; + + @Column(name = "WORK_CELL_CODE") + @ApiParam(value = "工作单元代码") + private String workCellCode; + + @AnnoOutputColumn(refClass = AndonEnumUtil.ALARM_TYPE.class,refForeignKey = "value",value = "description") + @Column(name = "ALARM_CODE") + @ApiParam(value = "安灯类型代码") + private String alarmCode; + + @Column(name = "AC_CODE") + @ApiParam(value = "呼叫原因代码") + private String acCode; + + @Column(name = "EM_CODE") + @ApiParam(value = "处理措施代码") + private String emCode; + + @Column(name = "RP_WHERE") + @ApiParam(value = "有效时长") + private Integer rpWhere; + + @Column(name = "FAIL_TIME") + @ApiParam(value = "失败次数") + private Integer failTime; + + @Column(name = "SUCCESS_TIME") + @ApiParam(value = "成功次数") + private Integer successTime; +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java new file mode 100644 index 0000000..53bb9fd --- /dev/null +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/repository/IAndonDisposalMaintenCfgRepository.java @@ -0,0 +1,14 @@ +package cn.estsh.i3plus.pojo.andon.repository; + +import cn.estsh.i3plus.pojo.andon.bean.AndonDisposalMaintenCfg; +import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository; + +/** + * @Description: 自处理维护配置 + * @Reference: + * @Author: Crish + * @CreateDate:2019-10-19-15:02 + * @Modify: + **/ +public interface IAndonDisposalMaintenCfgRepository extends BaseRepository { +} diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index 044f313..f46add5 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -113,6 +113,23 @@ public class AndonHqlPack { } /** + * 自处理维护配置 + * @param andonDisposalMaintenCfg + * @return + */ + public static DdlPackBean getAndonDisposalMaintenCfg(AndonDisposalMaintenCfg andonDisposalMaintenCfg) { + DdlPackBean packBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getEmCode(), "emCode", packBean); + DdlPreparedPack.getStringEqualPack(andonDisposalMaintenCfg.getAcCode(), "acCode", packBean); + DdlPreparedPack.getNumEqualPack(andonDisposalMaintenCfg.getIsValid(),"isValid",packBean); + return packBean; + } + + /** * 安灯附属表 * @param andonQueueAttach * @return @@ -306,6 +323,32 @@ public class AndonHqlPack { } /** + * 按条件查询安灯知识库 + * @param andonKnowledgeBase + * @return + */ + public static DdlPackBean packAndonKnowlegeBase(AndonKnowledgeBase andonKnowledgeBase){ + DdlPackBean packBean = new DdlPackBean(); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAndonOrderNo(), "andonOrderNo", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAlarmCode(), "alarmCode", packBean); + DdlPreparedPack.getNumEqualPack(andonKnowledgeBase.getFlowStatus(), "flowStatus", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getOrganizeCode(), "organizeCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getWorkCellCode(), "workCellCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getAcCode(), "acCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEcCode(), "ecCode", packBean); + DdlPreparedPack.getStringEqualPack(andonKnowledgeBase.getEmCode(), "emCode", packBean); + + if(StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonKnowledgeBase.getCreateDateTimeEnd())){ + DdlPreparedPack.timeBuilder(andonKnowledgeBase.getCreateDateTimeStart(), andonKnowledgeBase.getCreateDateTimeEnd(), "createDatetime", packBean, true); + } + + getStringBuilderPack(andonKnowledgeBase, packBean); + packBean.setOrderByStr(andonKnowledgeBase.orderBy()); + return packBean; + } + + /** * 按条件查询按灯队列信息 * @param andonManageQueue * @return @@ -350,6 +393,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getWorkCellCode(),"workCellCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAlarmCode(),"alarmCode", result); DdlPreparedPack.getStringEqualPack(andonDisposalCfg.getAcCode(),"acCode", result); + DdlPreparedPack.getNumEqualPack(andonDisposalCfg.getFlowStatus(),"flowStatus", result); getStringBuilderPack(andonDisposalCfg, result); return result; diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java index ce28bb4..230f235 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/AndonEnumUtil.java @@ -12,6 +12,53 @@ import org.apache.commons.lang3.StringUtils; **/ public class AndonEnumUtil { /** + * 按灯状态 + * 10-是，20-否 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum KNOWLEDGE_AUDIT_STATUS { + PENDING(10,"待审批"), + PASS(20,"审批通过"), + STOP(99,"审批不通过"); + + private int value; + private String description; + + KNOWLEDGE_AUDIT_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descriptionOfValue(String val) { + int tmp = -1; + for (int i = 0; i < values().length; i++) { + if (StringUtils.equalsIgnoreCase(values()[i].description, val)) { + tmp = values()[i].value; + } + } + return tmp; + } + } + + /** * 语音播报类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 63e225026cefec0b8d6afcfd02703f0ee4f8d625 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8E=E5=AD=A6=E6=9D=B0?= Date: Mon, 21 Oct 2019 10:08:39 +0800 Subject: [PATCH 23/24] =?UTF-8?q?1.=20=E6=89=A9=E5=B1=95=E9=80=9A=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=B8=8E=E8=BD=AF=E9=80=82=E9=85=8D=E7=9A=84=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java index 0abcde9..ac86f7e 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/dbinterface/WmsInterfaceDataMapper.java @@ -126,7 +126,7 @@ public class WmsInterfaceDataMapper extends BaseBean { * 扩展脚本编号，用于扩展接口功能 */ @Column(name = "SCRIPT_NO") - public String ScriptNo; + public String scriptNo; /** * 调用脚本方法获取数据 From 69e8357c69fb74c0b8dc4d955e7c9556261389d8 Mon Sep 17 00:00:00 2001 From: "changjiang.gao" Date: Mon, 21 Oct 2019 10:48:19 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=95=B0=E9=87=8F?= =?UTF-8?q?=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/model/wms/FindWriteModel.java | 11 ++++++++ .../i3plus/pojo/wms/modelbean/SnDifferModel.java | 30 ++++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java create mode 100644 modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java new file mode 100644 index 0000000..4371202 --- /dev/null +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/FindWriteModel.java @@ -0,0 +1,11 @@ +package cn.estsh.i3plus.pojo.model.wms; + +import lombok.Data; + +import java.util.List; + +@Data +public class FindWriteModel { + private List snList; + private String organizeCode; +} diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java new file mode 100644 index 0000000..04f7e69 --- /dev/null +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/SnDifferModel.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.wms.modelbean; + +import io.swagger.annotations.Api; +import lombok.Data; + +@Data +@Api("盘点条码差异返回Model") +public class SnDifferModel { + + //盘点单号 + private String orderNo; + //条码 + private String sn; + //源库位编码 + private String locateNo; + //物料代码 + private String partNo; + //物料名称 + private String partNameRdd; + //应盘数量 + private String qty; + //实盘数量 + private String factQty; + // + private String whNo; + //仓库编码 + private String zoneNo ; + //差异状态 + private String wmStatus; +}