From 4d608dd4c327abf14df1674122cf16fc0c57c142 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Mon, 27 Jul 2020 01:14:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=A9=E5=B1=95dispatcher=20model?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 3 ++- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java | 4 ++++ .../main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java index d609b14..38a7634 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java @@ -21,7 +21,8 @@ public class MesPcnEnumUtil { REVEAL_MODULE(20, "展示组件"), BUTTON_MODULE(30, "按钮组件"), TIMING_MODULE(40, "定时组件"), - PCS_BACK_MODULE(50, "工序后台组件"); + PCS_BACK_MODULE(50, "工序后台组件"), + PLC_CALLBACK_MODULE(60, "PLC回调工位参数"); private int value; private String description; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java index 576a580..4e09969 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPlc.java @@ -138,6 +138,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("数据方向 10 plc->mes 20 mes->plc 30共用地址") private Integer dataDirect; + @Column(name = "CALLBACK_METHOD") + @ApiParam("回调方法名称") + private String callbackMethod; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java index ec019ee..a3e7ec9 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepDispatchModel.java @@ -22,6 +22,10 @@ public class StepDispatchModel { private String moduleDataMapKey; + private String pfKey; + + private String dlKey; + private String scanInfo; public StepDispatchModel(String stepListKey, String firstScanKey, String cellParamKey, String requestBeanKey, String moduleDataMapKey, String scanInfo) {