From 97958262b6fba1537c2fb42db21565631b6c68df Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Fri, 15 Nov 2019 10:38:00 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 1 + 1 file changed, 1 insertion(+) 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 34ed60e..dd9d0c1 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 @@ -44,6 +44,7 @@ public class AndonHqlPack { DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAlarmCode(), "alarmCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getAndonOrderNo(), "andonOrderNo", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpCode(), "rpCode", packBean); + DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpLevel(), "rpLevel", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getRpObjectCode(), "rpObjectCode", packBean); DdlPreparedPack.getStringEqualPack(andonMessageRecord.getStatusCode(), "statusCode", packBean); if(StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeStart()) || StringUtils.isNotBlank(andonMessageRecord.getCreateDateTimeEnd())){ From 0e9b9b26fd19f5b1c8b731785796fa44258a93c5 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Tue, 19 Nov 2019 14:28:21 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=8C=85=E8=A3=85=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) 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 f8940d1..cc2df06 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 @@ -3073,6 +3073,39 @@ public class MesEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ONLINE_SEND_TYPE { + + PLC("PLC", "PLC"), + DB("DB", "DB"); + + private String value; + private String description; + + ONLINE_SEND_TYPE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + } + /** * WC_CHECK_TYPE 开线检查的模块 */ From e91369c82a522c4759fbe26507d88392ef69c523 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Tue, 19 Nov 2019 16:13:46 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1198?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 ++- .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java | 12 ------------ .../java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java | 4 ++++ .../i3plus/pojo/mes/pcn/model/ProdPackageModel.java | 3 --- .../i3plus/pojo/mes/pcn/model/StepPrintSnModel.java | 16 ++++++++++++++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java | 12 ------------ .../java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java | 4 ++++ 7 files changed, 26 insertions(+), 28 deletions(-) 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 cc2df06..6d080fb 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 @@ -2962,7 +2962,8 @@ public class MesEnumUtil { SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""), PCN_LOGIN(160, "PCN_LOGIN",""), PCN_MENU(170, "PCN_MENU",""), - PCN_MODULE(180, "PCN_MODULE",""); + PCN_MODULE(180, "PCN_MODULE",""), + PCN_LOGOUT(190, "PCN_LOGOUT",""); private int value; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java index 466ead5..f21218e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPackage.java @@ -100,21 +100,9 @@ public class MesPackage extends BaseBean { private String printStrStatus; @Transient - @ApiParam("客户代码名称") - private String custCodeName; - - @Transient @ApiParam("打印缓存id") private String printId; - @Transient - @ApiParam("包装层级名称") - private String packLevelName; - - @Transient - @ApiParam("是否封箱名称") - private String isSealedName; - public MesPackage() { } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java index e23ed67..89cad0e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesShift.java @@ -44,6 +44,10 @@ public class MesShift extends BaseBean { @ApiParam("开班时间") private String startTime; + @Column(name = "END_TIME") + @ApiParam("下班时间") + private String endTime; + @Column(name = "WORK_TIMES") @ApiParam("作业时长") private Double workTimes; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java index abc6f92..fc94a50 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/ProdPackageModel.java @@ -73,9 +73,6 @@ public class ProdPackageModel { @ApiParam("打印状态文字") private String printStrStatus; - @ApiParam("客户代码名称") - private String custCodeName; - @ApiParam("包装层级名称") private String packLevelName; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index 2d627aa..5b3c105 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -53,4 +53,20 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("客户物料名称") private String customerPartName; + + @ApiParam("物料名称") + private String partNameRdd; + + @ApiParam("单位") + private String unit; + + @ApiParam("特殊批号") + private String fixLotNo; + + @ApiParam("生产工单号") + private String workOrderNo; + + @ApiParam("生产线代码") + private String workCenterCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java index 36b3bf6..93339b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPackage.java @@ -99,16 +99,4 @@ public class MesPackage extends BaseBean { @ApiParam("打印状态文字") private String printStrStatus; - @Transient - @ApiParam("客户代码名称") - private String custCodeName; - - @Transient - @ApiParam("包装层级名称") - private String packLevelName; - - @Transient - @ApiParam("是否封箱名称") - private String isSealedName; - } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java index 86c3aef..2a285ea 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesShift.java @@ -44,6 +44,10 @@ public class MesShift extends BaseBean { @ApiParam("开班时间") private String startTime; + @Column(name = "END_TIME") + @ApiParam("下班时间") + private String endTime; + @Column(name = "WORK_TIMES") @ApiParam("作业时长") private Double workTimes; From d35c6e97cda1968a644e7885f341ce18a3776356 Mon Sep 17 00:00:00 2001 From: 1111 Date: Tue, 19 Nov 2019 17:10:53 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E3=80=90=E9=87=87=E8=B4=AD=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=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/wms/bean/WmsPoSn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java index aaf250d..06afc0f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java @@ -142,7 +142,7 @@ public class WmsPoSn extends BaseBean { @ApiParam(value = "最晚收货时间") public String latestReceTime; - @Column(name = "FIX_LOT_NO", nullable = false) + @Column(name = "FIX_LOT_NO") @ApiParam(value = "特殊批次") private String fixLotNo = ""; From 1720952d23a29296f7d89d9d98f6f37da2ae8a42 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 19 Nov 2019 17:58:53 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=AD=97=E6=AE=B5=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/HolderAnnotation.java | 12 +++++ .../estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 10 ++-- .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 11 ++-- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 20 ++++--- .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 26 ++++----- .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 27 +++++----- .../estsh/i3plus/pojo/aps/bean/WorkRelation.java | 61 +++++++++++----------- .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 21 ++++---- .../cn/estsh/i3plus/pojo/aps/common/BaseCode.java | 4 -- .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 4 ++ .../estsh/i3plus/pojo/aps/holders/EWorkInput.java | 3 ++ .../estsh/i3plus/pojo/aps/holders/EWorkOutput.java | 3 ++ .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 3 ++ .../i3plus/pojo/aps/holders/EWorkRelation.java | 13 +++-- .../i3plus/pojo/aps/holders/EWorkResource.java | 3 ++ 15 files changed, 131 insertions(+), 90 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java new file mode 100644 index 0000000..f4a4264 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java @@ -0,0 +1,12 @@ +package cn.estsh.i3plus.pojo.aps.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface HolderAnnotation { + String[] notProperty(); +} diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index ba3afb0..3837379 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -30,25 +30,25 @@ public class DynamicSetTime extends BaseAPS { private String resCode; @Column(name="TYPE") - @ApiParam(value ="应用工作计划类型") + @ApiParam(value ="影响类型") @FieldAnnotation(defaultValue = "ALL") private ApsEnumUtil.DYNAMIC_SET_TYPE type; @Column(name="CONSIDER_ASS_RES") - @ApiParam(value ="是否启用副资源动态设置时间") + @ApiParam(value ="启用副资源设置时间") private Boolean considerAssRes; @Column(name="CONSIDER_MATERIAL") - @ApiParam(value ="是否启用物料动态设置时间") + @ApiParam(value ="启用物料设置时间") private Boolean considerMaterial; @Column(name="ASS_RES_CALC") - @ApiParam(value ="副资源动态设置计算方式") + @ApiParam(value ="副资源设置计算方式") @FieldAnnotation(defaultValue = "MAX") private ApsEnumUtil.DYNAMIC_SET_CALC assResCalc; @Column(name="MATERIAL_CALC") - @ApiParam(value ="物料动态设置时间计算方式") + @ApiParam(value ="物料设置时间计算方式") @FieldAnnotation(defaultValue = "MAX") private ApsEnumUtil.DYNAMIC_SET_CALC materialCalc; 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 30da6eb..2ea445a 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 @@ -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.common.BaseCode; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; @@ -50,18 +51,22 @@ public class FieldInfo extends BaseCode { @Column(name="CUSTOMIZE") @ApiParam(value ="是否为自定义字段") - private Boolean customize; + @FieldAnnotation(defaultValue = "true") + private Boolean customize = true; @Column(name="MODIFY") @ApiParam(value ="是否能修改") - private Boolean modify; + @FieldAnnotation(defaultValue = "true") + private Boolean modify = true; @Column(name="DISPLAY") @ApiParam(value ="是否在界面显示") - private Boolean display; + @FieldAnnotation(defaultValue = "true") + private Boolean display = true; @Column(name="PRIC") @ApiParam(value ="浮点数显示精度") + @FieldAnnotation(defaultValue = "2") private Integer pric; @Column(name="TIPS") 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 e14f224..576ffb0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -1,6 +1,7 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; +import cn.estsh.i3plus.pojo.aps.common.BaseAPS; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWork; @@ -29,10 +30,20 @@ import java.util.List; @Entity @Table(name = "APS_WORK") @Api("工作") -public class Work extends BaseCode { +public class Work extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="ORDER_ID") + @ApiParam(value ="订单") + @FieldAnnotation(property = false) + private Long orderId; + @Column(name="WORK_TYPE") @ApiParam(value ="工作类型") - @FieldAnnotation(modify = false) + @FieldAnnotation(property = false) private ApsEnumUtil.WORK_TYPE workType; @Column(name="count") @@ -124,11 +135,6 @@ public class Work extends BaseCode { @FieldAnnotation(modify = false) private String failedReason; - @Column(name="ORDER_ID") - @ApiParam(value ="订单") - @FieldAnnotation(property = false) - private Long orderId; - @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/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index ad465c2..10cc5dd 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -29,10 +29,15 @@ import java.util.List; @Table(name = "APS_WORK_INPUT") @Api("工作输入") public class WorkInput extends BaseAPS { - @Column(name="INPUT_TIME") - @ApiParam(value ="输入时间") - @FieldAnnotation(modify = false) - private Date inputTime; + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; @Column(name="INPUT_COUNT") @ApiParam(value ="输入数量") @@ -44,15 +49,10 @@ public class WorkInput extends BaseAPS { @FieldAnnotation(modify = false) private Double shortCount; - @Column(name="WORK_ID") - @ApiParam(value ="工作") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; + @Column(name="INPUT_TIME") + @ApiParam(value ="输入时间") + @FieldAnnotation(modify = false) + private Date inputTime; @Column(name="OPER_INPUT_ID") @ApiParam(value ="工序输入") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index 51f4803..c5638a8 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -30,10 +30,16 @@ import java.util.List; @Table(name = "APS_WORK_OUTPUT") @Api("工作输出") public class WorkOutput extends BaseAPS { - @Column(name="OUTPUT_TIME") - @ApiParam(value ="输出时间") - @FieldAnnotation(modify = false) - private Date outputTime; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") @@ -45,15 +51,10 @@ public class WorkOutput extends BaseAPS { @FieldAnnotation(modify = false) private Double remainCount; - @Column(name="WORK_ID") - @ApiParam(value ="工作") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; + @Column(name="OUTPUT_TIME") + @ApiParam(value ="输出时间") + @FieldAnnotation(modify = false) + private Date outputTime; @Column(name="OPER_OUTPUT_ID") @ApiParam(value ="工序输出") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index b0cb321..876e25f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -27,6 +27,37 @@ import javax.persistence.Table; @Table(name = "APS_Work_Relation") @Api("工作关联") public class WorkRelation extends BaseAPS { + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="PREV_ORDER_ID") + @ApiParam(value ="前订单") + @FieldAnnotation(property = false) + private Long prevOrderId; + + @Column(name="POST_ORDER_ID") + @ApiParam(value ="后订单") + @FieldAnnotation(property = false) + private Long postOrderId; + + @Column(name="PREV_WORK_ID") + @ApiParam(value ="前工作") + @FieldAnnotation(property = false) + private Long prevWorkId; + + @Column(name="POST_WORK_ID") + @ApiParam(value ="后工作") + @FieldAnnotation(property = false) + private Long postWorkId; + + @Column(name="COUNT") + @ApiParam(value ="关联数量") + @FieldAnnotation(modify = false) + private Double count; + @Column(name="TYPE") @ApiParam(value ="关联类型") @FieldAnnotation(modify = false) @@ -47,11 +78,6 @@ public class WorkRelation extends BaseAPS { @FieldAnnotation(modify = false) private String minSpaceTime; - @Column(name="COUNT") - @ApiParam(value ="关联数量") - @FieldAnnotation(modify = false) - private Double count; - @Column(name="FIX_RELATION") @ApiParam(value ="是否固定关联") private Boolean fixRelation; @@ -70,31 +96,6 @@ public class WorkRelation extends BaseAPS { @FieldAnnotation(property = false) private Long workOutputId; - @Column(name="PREV_WORK_ID") - @ApiParam(value ="前工作") - @FieldAnnotation(property = false) - private Long prevWorkId; - - @Column(name="POST_WORK_ID") - @ApiParam(value ="后工作") - @FieldAnnotation(property = false) - private Long postWorkId; - - @Column(name="PREV_ORDER_ID") - @ApiParam(value ="前订单") - @FieldAnnotation(property = false) - private Long prevOrderId; - - @Column(name="POST_ORDER_ID") - @ApiParam(value ="后订单") - @FieldAnnotation(property = false) - private Long postOrderId; - - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - public WorkInput getWorkInput() { return BeanRelation.get(this, EWorkRelation.WorkInput); } 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 67bac97..fbc7726 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 @@ -27,6 +27,17 @@ import javax.persistence.Table; @Table(name = "APS_WORK_RESOURCE") @Api("工作资源") public class WorkResource extends BaseAPS { + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(property = false) + private Long resourceId; + @Column(name="USE_TYPE") @ApiParam(value ="使用类型") @FieldAnnotation(modify = false) @@ -72,16 +83,6 @@ public class WorkResource extends BaseAPS { @FieldAnnotation(modify = false) private String userMatchNumber; - @Column(name="WORK_ID") - @ApiParam(value ="工作") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="RESOURCE_ID") - @ApiParam(value ="资源") - @FieldAnnotation(property = false) - private Long resourceId; - @Column(name="OPER_RESOURCE_ID") @ApiParam(value ="工序资源") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index 8fca466..638f867 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -28,8 +28,4 @@ public abstract class BaseCode extends BaseAPS { @ApiParam(value ="名称") @FieldAnnotation(popSearch = true) private String name; - - @Column(name="REMARK") - @ApiParam(value ="备注") - private String remark; } 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 47da0e1..4e72065 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,5 +1,9 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = {"ParentWork", "WorkResources", "WorkInputs", "WorkOutputs", + "PrevRelations", "PostRelations", "Operation"}) public enum EWork { Order, // 订单 ParentWork, // 父工作 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java index ddfbd3a..2b35993 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = {"OperInput"}) public enum EWorkInput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java index e2f1de2..b6d52e0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = "OperOutput") public enum EWorkOutput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index 490bddc..25438ec 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = {"WorkResource", "MainPlan", "FurnacePlan"}) public enum EWorkPlan { Work, Resource, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java index cdfc8ab..d75afa7 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java @@ -1,11 +1,14 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = {"WorkInput", "WorkOutput"}) public enum EWorkRelation { - WorkInput, - WorkOutput, - PrevWork, - PostWork, + Material, PrevOrder, PostOrder, - Material + PrevWork, + PostWork, + WorkInput, + WorkOutput } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java index 2f77bcc..360e756 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java @@ -1,5 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = "OperResource") public enum EWorkResource { Work, Resource, From 12ba5d2ff3080e26637fd7e45b6eb5a6d56a5c07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Tue, 19 Nov 2019 21:38:20 +0800 Subject: [PATCH 06/16] =?UTF-8?q?lac=E5=BE=AE=E6=9C=8D=E5=8A=A1=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/LacEnumUtil.java | 76 ++++++++++++++++++++++ .../i3plus/pojo/lac/bean/LacCommandOperate.java | 30 +++++++++ .../pojo/lac/bean/LacCommandStackRecord.java | 4 ++ .../estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java | 28 ++++++-- .../pojo/model/lac/LacCommandStackModel.java | 1 + 5 files changed, 133 insertions(+), 6 deletions(-) create mode 100644 modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java index d64eb01..e6dbdbd 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/LacEnumUtil.java @@ -251,4 +251,80 @@ public class LacEnumUtil { } } + /** + * 指令操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMMAND_OPERATE_TYPE{ + COMMAND_STACK(10,"指令集"), + COMMAND_STACK_STEP(20,"指令集步骤"), + COMMAND_STACK_STEP_TASK(30,"指令集步骤任务"); + + private int value; + private String description; + + COMMAND_OPERATE_TYPE(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; + } + } + + /** + * 指令操作类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum COMMAND_OPERATE{ + RESUME(11,"恢复",COMMAND_OPERATE_TYPE.COMMAND_STACK), + PAUSE(12,"暂停",COMMAND_OPERATE_TYPE.COMMAND_STACK), + CLOSE(13,"关闭",COMMAND_OPERATE_TYPE.COMMAND_STACK), + NEXT_STEP(14,"下一步",COMMAND_OPERATE_TYPE.COMMAND_STACK), + INTERRUPT(21,"中断",COMMAND_OPERATE_TYPE.COMMAND_STACK_STEP_TASK); + + private int value; + private String description; + private COMMAND_OPERATE_TYPE commandOperateType; + + COMMAND_OPERATE(int value, String description,COMMAND_OPERATE_TYPE commandOperateType) { + this.value = value; + this.description = description; + this.commandOperateType = commandOperateType; + } + + 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; + } + } + } diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java new file mode 100644 index 0000000..8c878bf --- /dev/null +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandOperate.java @@ -0,0 +1,30 @@ +package cn.estsh.i3plus.pojo.lac.bean; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiParam; +import lombok.Data; + +/** + * @Description : + * @Reference : + * @Author : yunhao + * @CreateDate : 2019-11-19 16:14 + * @Modify: + **/ +@Data +@ApiModel("指令操作") +public class LacCommandOperate { + + @ApiParam(value ="指令集记录id" , example = "-1") + private Long commandStackRecordId; + + @ApiParam(value ="步骤任务id" , example = "-1") + private Long commandStackStepTaskIdId; + + @ApiParam(value ="操作类型" , example = "-1") + private Integer operateType; + + @ApiParam(value ="操作" , example = "-1") + private Integer operate; + +} diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java index e108f1b..c4eada8 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/bean/LacCommandStackRecord.java @@ -94,6 +94,10 @@ public class LacCommandStackRecord extends BaseBean { private String executionDescription; @Transient + @ApiParam(value ="Lac实例id") + private String lacInstanceId; + + @Transient @ApiParam(value ="指令集模板") private LacCommandStackTemplate template; diff --git a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java index abf9368..07bd515 100644 --- a/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java +++ b/modules/i3plus-pojo-lac/src/main/java/cn/estsh/i3plus/pojo/lac/sqlpack/LacHqlPack.java @@ -2,9 +2,19 @@ package cn.estsh.i3plus.pojo.lac.sqlpack; import cn.estsh.i3plus.pojo.base.bean.DdlPackBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; +import cn.estsh.i3plus.pojo.base.enumutil.LacEnumUtil; import cn.estsh.i3plus.pojo.base.tool.DdlPreparedPack; -import cn.estsh.i3plus.pojo.lac.bean.*; - +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackRecord; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStep; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackStepTask; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackTemplate; +import cn.estsh.i3plus.pojo.lac.bean.LacCommandStackType; +import cn.estsh.i3plus.pojo.lac.bean.LacLogTask; +import cn.estsh.i3plus.pojo.lac.bean.LacLogTaskDetail; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTask; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParam; +import cn.estsh.i3plus.pojo.lac.bean.LacSuitTaskParamAdapter; +import cn.estsh.i3plus.pojo.lac.bean.LacTaskType; import java.util.List; /** @@ -61,9 +71,9 @@ public class LacHqlPack { public static DdlPackBean packHqlLacCommandStackStepTask(LacCommandStackStepTask bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - DdlPreparedPack.getNumEqualPack(bean.getTemplateId(),"templateId",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getStepId(),"stepId",ddlPackBean); - DdlPreparedPack.getNumEqualPack(bean.getTaskId(),"taskId",ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTemplateId(), "templateId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getStepId(), "stepId", ddlPackBean); + DdlPreparedPack.getNumEqualPack(bean.getTaskId(), "taskId", ddlPackBean); DdlPreparedPack.getStringLikerPack(bean.getTaskNameRdd(), "taskNameRdd", ddlPackBean); return ddlPackBean; @@ -104,7 +114,7 @@ public class LacHqlPack { public static DdlPackBean packHqlLacSuitTaskParam(LacSuitTaskParam bean) { DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); - if(bean == null){ + if (bean == null) { return ddlPackBean; } DdlPreparedPack.getNumEqualPack(bean.getParamType(), "paramType", ddlPackBean); @@ -143,4 +153,10 @@ public class LacHqlPack { ); return ddlPackBean; } + + public static DdlPackBean packHqlNotFinishLacCommandStackRecord() { + DdlPackBean ddlPackBean = DdlPackBean.getDdlPackBean(); + DdlPreparedPack.getNumberSmallerPack(LacEnumUtil.STACK_STATUS.FINISH.getValue(), "stackStatus", ddlPackBean); + return ddlPackBean; + } } diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java index 0cdedf7..0574386 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/lac/LacCommandStackModel.java @@ -44,6 +44,7 @@ public class LacCommandStackModel { */ private Exception exception; + public void setException(Exception exception){ LoggerFactory.getLogger("YYYY").error("异常信息：{}",exception); this.exception = exception; From 88d480403cc4fd73dc4f560d395ebbf42b7ff7c0 Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Wed, 20 Nov 2019 09:05:48 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=88=9D=E5=A7=8B=E5=8C=96=E5=B1=9E=E6=80=A7=20?= =?UTF-8?q?=E8=B5=8B=E5=80=BClongtext?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 2 ++ .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java index 90fc4d3..6838d51 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -39,6 +40,7 @@ public class MesRoute extends BaseBean { @ApiParam("流程类型 10-扫描类型 20-监控类型") private Integer routeType; + @Lob @Column(name = "POSITION") @ApiParam("GOJS位置") private String position; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java index 8bbbb0f..5c55d35 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java @@ -10,6 +10,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; +import javax.persistence.Lob; import javax.persistence.Table; /** @@ -35,6 +36,7 @@ public class MesRoute extends BaseBean { @ApiParam("流程名称") private String routeName; + @Lob @Column(name = "POSITION") @ApiParam("GOJS位置") private String position; From 7b47c7b942fd32ae7292c8bc076a4c5777d7f70c Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 20 Nov 2019 09:48:07 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=B3=E8=81=94?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/FieldAnnotation.java | 1 + .../pojo/aps/annotation/HolderAnnotation.java | 12 ------- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 11 +++--- .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 10 +++--- .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 10 +++--- .../estsh/i3plus/pojo/aps/bean/OperResource.java | 11 +++--- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 5 --- .../estsh/i3plus/pojo/aps/bean/StandOperation.java | 11 +++--- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 40 +++++++++++----------- .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 12 +++---- .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 12 +++---- .../cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java | 29 ++++++++-------- .../estsh/i3plus/pojo/aps/bean/WorkRelation.java | 10 +++--- .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 10 +++--- .../estsh/i3plus/pojo/aps/holders/EBaseOrder.java | 3 -- .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 4 --- .../estsh/i3plus/pojo/aps/holders/EWorkInput.java | 3 -- .../estsh/i3plus/pojo/aps/holders/EWorkOutput.java | 3 -- .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 3 -- .../i3plus/pojo/aps/holders/EWorkRelation.java | 3 -- .../i3plus/pojo/aps/holders/EWorkResource.java | 3 -- 21 files changed, 86 insertions(+), 120 deletions(-) delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.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 1c14524..7356992 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 @@ -27,4 +27,5 @@ public @interface FieldAnnotation { ApsEnumUtil.EDIT_TYPE editType() default ApsEnumUtil.EDIT_TYPE.NONE; // 定义字段的编辑类型 Class multiEnumClass() default Object.class; // 多选枚举的类型。 String typeName() default ""; // 定义字段类型的简单名称，对于多选关联对象时有用。 + String relation() default ""; // 关联字段标识 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java deleted file mode 100644 index f4a4264..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface HolderAnnotation { - String[] notProperty(); -} 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 3576592..7314227 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 @@ -28,6 +28,12 @@ import java.util.List; @MappedSuperclass @Api("订单基类") public class BaseOrder extends BaseCode { + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material") + private Long materialId; + @Column(name="COUNT") @ApiParam(value ="数量") private Double count; @@ -69,11 +75,6 @@ public class BaseOrder extends BaseCode { @ApiParam(value ="专料号") private String specifyMaterialNum; - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index b4b241c..2f7ac74 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -29,6 +29,11 @@ import java.util.List; @Table(name = "APS_OPER_INPUT") @Api("工序输入") public class OperInput extends BaseAPS { + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material") + private Long materialId; + @Column(name="INPUT_COUNT") @ApiParam(value ="输入数量") private Double inputCount; @@ -59,11 +64,6 @@ public class OperInput extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - public Operation getOperation() { return BeanRelation.get(this, EOperInput.Operation); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index c1f8984..7e0d8e4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -28,6 +28,11 @@ import java.util.List; @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") public class OperOutput extends BaseAPS { + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material") + private Long materialId; + @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") private Double outputCount; @@ -45,11 +50,6 @@ public class OperOutput extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - public Operation getOperation() { return BeanRelation.get(this, EOperOutput.Operation); } 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 7d78809..9fd050f 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 @@ -29,6 +29,12 @@ import java.util.List; @Table(name = "APS_OPER_RESOURCE") @Api("工序资源") public class OperResource extends BaseAPS { + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(relation = "Resource") + private Long resourceId; + @Column(name="USE_TYPE") @ApiParam(value ="使用类型") @FieldAnnotation(defaultValue = "MAIN") @@ -71,11 +77,6 @@ public class OperResource extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; - @Column(name="RESOURCE_ID") - @ApiParam(value ="资源") - @FieldAnnotation(property = false) - private Long resourceId; - public Operation getOperation() { return BeanRelation.get(this, EOperResource.Operation); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index b0963f9..f5d5503 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -30,11 +30,6 @@ import java.util.List; @Table(name = "APS_RESOURCE") @Api("资源") public class Resource extends BaseCode { - @Column(name="BOTTLENECK") - @ApiParam(value ="是否瓶颈资源") - @FieldAnnotation(defaultValue = "false") - private Boolean bottleneck; - @Column(name="TYPE") @ApiParam(value ="资源类型") @FieldAnnotation(defaultValue = "MAIN") 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 52d1f68..b5f79e1 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 @@ -25,6 +25,12 @@ import javax.persistence.Table; @Table(name = "APS_STAND_OPERATION") @Api("标准工序") public class StandOperation extends BaseCode { + + @Column(name="DIRECTION") + @ApiParam(value ="排程方向") + @FieldAnnotation(defaultValue = "POSITIVE") + private ApsEnumUtil.DIRECTION direction; + @Column(name="RATIO") @ApiParam(value ="分割比例") private String ratio; @@ -37,11 +43,6 @@ public class StandOperation extends BaseCode { @ApiParam(value ="分割批量") private Double batch; - @Column(name="DIRECTION") - @ApiParam(value ="排程方向") - @FieldAnnotation(defaultValue = "POSITIVE") - private ApsEnumUtil.DIRECTION direction; - @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 576ffb0..77f0691 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -38,7 +38,7 @@ public class Work extends BaseAPS { @Column(name="ORDER_ID") @ApiParam(value ="订单") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Order") private Long orderId; @Column(name="WORK_TYPE") @@ -51,6 +51,25 @@ public class Work extends BaseAPS { @FieldAnnotation(modify = false) private Double count; + @Column(name="WORK_STATUS") + @ApiParam(value ="工作状态") + private ApsEnumUtil.WORK_STATUS workStatus; + + @Column(name="PLAN_BEGIN") + @ApiParam(value ="计划开始时间") + @FieldAnnotation(modify = false) + private Date planBegin; + + @Column(name="PLAN_END") + @ApiParam(value ="计划结束时间") + @FieldAnnotation(modify = false) + private Date planEnd; + + @Column(name="PLAN_RESOURCE") + @ApiParam(value ="计划主资源") + @FieldAnnotation(modify = false) + private String planResource; + @Column(name="SPECIFY_COUNT") @ApiParam(value ="指定数量") private Double specifyCount; @@ -97,25 +116,6 @@ public class Work extends BaseAPS { @FieldAnnotation(modify = false) private Date calcLet; - @Column(name="WORK_STATUS") - @ApiParam(value ="工作状态") - private ApsEnumUtil.WORK_STATUS workStatus; - - @Column(name="PLAN_BEGIN") - @ApiParam(value ="计划开始时间") - @FieldAnnotation(modify = false) - private Date planBegin; - - @Column(name="PLAN_END") - @ApiParam(value ="计划结束时间") - @FieldAnnotation(modify = false) - private Date planEnd; - - @Column(name="PLAN_RESOURCE") - @ApiParam(value ="计划主资源") - @FieldAnnotation(modify = false) - private String planResource; - @Column(name="FIX_SPLIT") @ApiParam(value ="已分割的工作是否固定") private Boolean fixSplit; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 10cc5dd..e84ac02 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -29,16 +29,16 @@ import java.util.List; @Table(name = "APS_WORK_INPUT") @Api("工作输入") public class WorkInput extends BaseAPS { - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - @Column(name="WORK_ID") @ApiParam(value ="工作") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Work") private Long workId; + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material") + private Long materialId; + @Column(name="INPUT_COUNT") @ApiParam(value ="输入数量") @FieldAnnotation(modify = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index c5638a8..b3c4aaa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -31,16 +31,16 @@ import java.util.List; @Api("工作输出") public class WorkOutput extends BaseAPS { - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - @Column(name="WORK_ID") @ApiParam(value ="工作") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Work") private Long workId; + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material") + private Long materialId; + @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") @FieldAnnotation(modify = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java index e0b655c..09daae4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java @@ -34,6 +34,17 @@ import java.util.List; @Table(name="APS_WORK_PLAN") @Api("工作计划") public class WorkPlan extends BaseAPS { + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(relation = "Work") + private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(relation = "Resource") + private Long resourceId; + @Column(name="TYPE") @ApiParam(value ="工作计划类型") @FieldAnnotation(modify = false, display = false) @@ -51,7 +62,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PREV_SET_TIME") @ApiParam(value ="前设置时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer prevSetTime; @Column(name="PRODUCE_BEGIN") @@ -68,7 +79,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer produceTime; @Column(name="POST_SET_BEGIN") @@ -83,7 +94,7 @@ public class WorkPlan extends BaseAPS { @Column(name="POST_SET_TIME") @ApiParam(value ="后设置时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer postSetTime; @Column(name="LOCK_BEGIN") @@ -99,19 +110,9 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer lockTime; - @Column(name="WORK_ID") - @ApiParam(value ="工作对象id") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="RESOURCE_ID") - @ApiParam(value ="资源对象id") - @FieldAnnotation(property = false) - private Long resourceId; - @Column(name="WORK_RESOURCE_ID") @ApiParam(value ="工作资源对象id") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 876e25f..9343d9e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -30,27 +30,27 @@ public class WorkRelation extends BaseAPS { @Column(name="MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Material") private Long materialId; @Column(name="PREV_ORDER_ID") @ApiParam(value ="前订单") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "PrevOrder") private Long prevOrderId; @Column(name="POST_ORDER_ID") @ApiParam(value ="后订单") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "PostOrder") private Long postOrderId; @Column(name="PREV_WORK_ID") @ApiParam(value ="前工作") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "PrevWork") private Long prevWorkId; @Column(name="POST_WORK_ID") @ApiParam(value ="后工作") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "PostWork") private Long postWorkId; @Column(name="COUNT") 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 fbc7726..795117a 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 @@ -30,12 +30,12 @@ public class WorkResource extends BaseAPS { @Column(name="WORK_ID") @ApiParam(value ="工作") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Work") private Long workId; @Column(name="RESOURCE_ID") @ApiParam(value ="资源") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Resource") private Long resourceId; @Column(name="USE_TYPE") @@ -45,17 +45,17 @@ public class WorkResource extends BaseAPS { @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer postTime; @Column(name="PRIORITY") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java index ef776fc..e4c5238 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java @@ -1,10 +1,7 @@ package cn.estsh.i3plus.pojo.aps.holders; -import io.swagger.annotations.ApiParam; - public enum EBaseOrder { Works, - @ApiParam(value = "物料") Material, PrevRelations, PostRelations, 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 4e72065..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,9 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = {"ParentWork", "WorkResources", "WorkInputs", "WorkOutputs", - "PrevRelations", "PostRelations", "Operation"}) public enum EWork { Order, // 订单 ParentWork, // 父工作 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java index 2b35993..ddfbd3a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java @@ -1,8 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = {"OperInput"}) public enum EWorkInput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java index b6d52e0..e2f1de2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java @@ -1,8 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = "OperOutput") public enum EWorkOutput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index 25438ec..490bddc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -1,8 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = {"WorkResource", "MainPlan", "FurnacePlan"}) public enum EWorkPlan { Work, Resource, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java index d75afa7..1fc05e6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java @@ -1,8 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = {"WorkInput", "WorkOutput"}) public enum EWorkRelation { Material, PrevOrder, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java index 360e756..2f77bcc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java @@ -1,8 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = "OperResource") public enum EWorkResource { Work, Resource, From 7a134dc0cb3f14d2a866f14d597349a1d098173f Mon Sep 17 00:00:00 2001 From: qinjia zou Date: Wed, 20 Nov 2019 10:37:13 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E3=80=90=E6=AC=A7=E6=B4=B2-=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=BF=AB=E9=80=9F=E5=85=A5=E5=BA=93=E3=80=91bug6389?= 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 | 2 +- 1 file changed, 1 insertion(+), 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 a4862cb..2d2f84a 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 @@ -1053,7 +1053,7 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum STOCK_SN_QC_STATUS { - NORMAL(10, "EMPTY", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "ISOLATED", "报废"); + NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废"); private int value; private String code; From 89943f65866c56b0d2cea73ff0fbf689d828ee86 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 20 Nov 2019 11:03:18 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=A1=A8=E5=A4=9A=E9=80=89=E6=9E=9A=E4=B8=BE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 7 +++--- .../i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java | 24 --------------------- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 25 ++++++++++++++++++++++ 3 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index f5d5503..5ae21a4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -3,7 +3,6 @@ package cn.estsh.i3plus.pojo.aps.bean; import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; -import cn.estsh.i3plus.pojo.aps.enums.*; import cn.estsh.i3plus.pojo.aps.holders.EResource; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import com.fasterxml.jackson.annotation.JsonBackReference; @@ -84,17 +83,17 @@ public class Resource extends BaseCode { @Column(name="EFFICIENCY_EFFECT") @ApiParam(value ="效率影响类型") - @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) + @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer EfficiencyEffect; @Column(name="TIME_ROUND") @ApiParam(value ="时间圆整影响") - @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) + @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer timeRound; @Column(name="TIME_TAIL_ROUND") @ApiParam(value ="时间尾数影响") - @FieldAnnotation(multiEnumClass = EFFICIENCY_EFFECT.class) + @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class) private Integer timeTailRound; @Column(name="LOCK_TYPE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java deleted file mode 100644 index f1da6b4..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/EFFICIENCY_EFFECT.java +++ /dev/null @@ -1,24 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.enums; - -/** - * @Description :资源效率影响的计划类型 - * @Reference : - * @Author : jason.niu - * @CreateDate : 2019-10-17 - * @Modify: - **/ -public enum EFFICIENCY_EFFECT { - PREV_SET(1), // 前设置 - PRODUCE(2), // 生产 - POST_SET(4); // 后设置 - - private int _value; - - EFFICIENCY_EFFECT(int value){ - _value = value; - } - - public int value() { - return this._value; - } -} diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index b84ac79..e2c94c3 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -324,6 +324,31 @@ public class ApsEnumUtil { } /** + * 资源效率影响类型 + */ + public enum EFFICIENCY_EFFECT { + PREV_SET(1, "前设置"), // 前设置 + PRODUCE(2, "生产"), // 生产 + POST_SET(4, "后设置"); // 后设置 + + private int value; + private String description; + + EFFICIENCY_EFFECT(int value, String description){ + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** * 预置的资源选择规则 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) From 695ab094d20f2ee1200e24eaf1e349d45db87bb3 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 20 Nov 2019 11:24:04 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E8=A1=A8=E5=A4=9A=E9=80=89=E6=9E=9A=E4=B8=BE=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java index e2c94c3..11d5fe1 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java @@ -326,6 +326,7 @@ public class ApsEnumUtil { /** * 资源效率影响类型 */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum EFFICIENCY_EFFECT { PREV_SET(1, "前设置"), // 前设置 PRODUCE(2, "生产"), // 生产 From 054502b657abf9d1f363507390ef8caee02d16b8 Mon Sep 17 00:00:00 2001 From: jokelone Date: Wed, 20 Nov 2019 11:34:56 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E3=80=90=E4=BB=BB=E5=8A=A1=EF=BC=9A1193?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java index 6fe4ca3..59ebe07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/IfDismantleRecord.java @@ -37,6 +37,10 @@ public class IfDismantleRecord extends BaseBean { @ApiParam("产线") private String workCenterCode; + @Column(name = "WORK_CELL_CODE") + @ApiParam("工位") + private String workCellCode; + @Column(name = "PARENT_PART_NO") @ApiParam("产品物料编码") private String parentPartNo; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java index 6ab949d..65b038b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/IfRawPartDataModel.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.mes.model; +import cn.estsh.i3plus.pojo.base.bean.BaseBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; @@ -19,8 +20,8 @@ import java.math.BigDecimal; @Data @NoArgsConstructor @AllArgsConstructor -@Api("动作函数关系model") -public class IfRawPartDataModel implements Serializable { +@Api("原材料信息model") +public class IfRawPartDataModel extends BaseBean { @ApiParam("id") private Long id; From 5943854c5b1dbc15e007965487489eb9686d9ef3 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 Nov 2019 13:27:57 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=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/mes/pcn/model/StepPrintSnModel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java index 5b3c105..53b974e 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StepPrintSnModel.java @@ -51,6 +51,9 @@ public class StepPrintSnModel extends MesProduceSn { @ApiParam("客户名称") private String customerName; + @ApiParam("客户零件号") + private String customerPartNo; + @ApiParam("客户物料名称") private String customerPartName; From 59d6eb0727eb3a7ced8514471b71f3234b5e85dd Mon Sep 17 00:00:00 2001 From: "wei.peng" <123456> Date: Wed, 20 Nov 2019 14:54:03 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index ce67a7d..13b076e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -842,7 +842,8 @@ public class ImppEnumUtil { NUMBER(2,"number","数字"), DATE(3,"date","时间"), SWITCH(4,"switch","布尔"), - SELECT(5,"select","选择"); + SELECT(5,"select","选择"), + FILE(6,"select","选择"); private int value; private String name; From c595d3f6b1511053aeb4f47d55dab12a30963e19 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Wed, 20 Nov 2019 15:11:59 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 52 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesWorkCenter.java | 2 +- .../i3plus/pojo/mes/model/ProductBiModel.java | 3 +- 3 files changed, 54 insertions(+), 3 deletions(-) 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 6d080fb..7edb1f9 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 @@ -3199,4 +3199,56 @@ public class MesEnumUtil { } } + /** + * MesWorkCenter 工作中心运行状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum WORK_CENTER_RUNNING_STATUS { + + RUNNING("Y", "start", "开线"), + STOPPED("N", "stop", "停线"); + + private String value; + private String code; + private String description; + + WORK_CENTER_RUNNING_STATUS(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static String valueOfCode(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].code; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java index 67622a0..4caea9d 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java @@ -53,7 +53,7 @@ public class MesWorkCenter extends BaseBean { @Column(name = "RUNNING_STATUS") @ApiParam("运行状态") - private Integer runningStatus; + private String runningStatus; @Transient @ApiParam(value = "子集列表") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java index a7a613f..0104edc 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/ProductBiModel.java @@ -1,6 +1,5 @@ package cn.estsh.i3plus.pojo.mes.model; -import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -25,7 +24,7 @@ public class ProductBiModel { private String areaCode; @ApiParam("运行状态") - private Integer runningStatus; + private String runningStatus; @ApiParam(value = "物料号") private String partNo; From 51d70654efd7a5bf39462664aceb2caa5093ec5d Mon Sep 17 00:00:00 2001 From: qinjia zou Date: Wed, 20 Nov 2019 16:29:18 +0800 Subject: [PATCH 16/16] =?UTF-8?q?=E3=80=90=E6=AC=A7=E6=B4=B2-=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E5=BF=AB=E9=80=9F=E5=85=A5=E5=BA=93=E3=80=91bug6389?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsRoutingRule.java | 1 + 1 file changed, 1 insertion(+) 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 9fd93de..15f6d49 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 @@ -51,6 +51,7 @@ public class WmsRoutingRule extends BaseBean { @Column(name = "RULE_TYPE") @ApiParam(value = "规则类型(10 推动规则，20 补货规则)", example ="10") + @AnnoOutputColumn(refClass = WmsEnumUtil.ROUTING_RULE_TYPE.class, refForeignKey = "value", value = "description") private Integer ruleType; @Column(name = "SRC_ZONE_NO")