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 935554b..d609b14 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 @@ -4542,4 +4542,25 @@ public class MesPcnEnumUtil { } } + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PLC_DATA_DIRECT { + + PLC_WRITE(10, "plc->mes"), + MES_WRITE(20, "mes->plc"), + SHARE(30, "共用"); + + private int value; + private String description; + + PLC_DATA_DIRECT(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + } + } 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 fc99205..576a580 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 @@ -134,6 +134,10 @@ public class MesPlc extends BaseBean implements Serializable { @ApiParam("默认赋值属性") private String defaultRule; + @Column(name = "DATA_DIRECT") + @ApiParam("数据方向 10 plc->mes 20 mes->plc 30共用地址") + private Integer dataDirect; + @Transient @ApiParam("设备名称") private String equipmentName; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java index 3be58cd..ad767e6 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java @@ -60,6 +60,9 @@ public class StationRequestBean implements Serializable { @ApiParam("客户端信息") private String clientInfo; + @ApiParam("websocket session连接id") + private String sessionId; + @ApiParam("用户信息") private String userInfo; diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java index 374d58e..02084bb 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java +++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/mes/TorqueCollectionModel.java @@ -138,6 +138,9 @@ public class TorqueCollectionModel implements Serializable { @ApiParam("psets总数") private Integer psetSum; + @ApiParam("防错码") + private String pokeYokeFix; + private Map psets = new LinkedHashMap<>(); /** @@ -158,7 +161,8 @@ public class TorqueCollectionModel implements Serializable { */ public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer torqueNo, Integer checkScanCount, Integer sendSeq, - Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount) { + Integer yellowGunRule, Integer isEndSeq, String groupCode, Integer isPf, Double qualifiedCount, + String pokeYokeFix) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -173,6 +177,7 @@ public class TorqueCollectionModel implements Serializable { this.groupCode = groupCode; this.isPf = isPf; this.qualifiedCount = qualifiedCount; + this.pokeYokeFix = pokeYokeFix; } /** @@ -197,7 +202,7 @@ public class TorqueCollectionModel implements Serializable { public TorqueCollectionModel(String vinCode, String prodCfgTypeCode, String gradeCode, String colorCode, String partNo, String partName, Integer pset1, Integer pset2, Integer pset3, Integer pset4, Integer pset5, Integer pset6, Integer pset7, Integer pset8, - Integer torqueNo, Integer sendSeq, Integer checkScanCount) { + Integer torqueNo, Integer sendSeq, Integer checkScanCount, String pokeYokeFix) { this.vinCode = vinCode; this.prodCfgTypeCode = prodCfgTypeCode; this.gradeCode = gradeCode; @@ -215,6 +220,7 @@ public class TorqueCollectionModel implements Serializable { this.torqueNo = torqueNo; this.sendSeq = sendSeq; this.checkScanCount = checkScanCount; + this.pokeYokeFix = pokeYokeFix; assemblePsets(); }