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 8567ff4..674dd65 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 @@ -283,6 +283,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "发送标志") private String sendFlag; + @Column(name = "SIGN_SEND_FLAG") + @ApiParam(value = "响应已通知标识") + private String signSendFlag; + /** * 处理类型:10=标准处理,20=自处理 */ @@ -329,6 +333,10 @@ public class AndonManageQueue extends BaseBean { @ApiParam(value = "驳回意见") private String rejectOpinion; + @Column(name = "OPEN_INFO") + @ApiParam(value = "放行说明") + private String openInfo; + @Transient @ApiParam(value = "安灯状态集合") private List statusCodeList; 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 f1fa3f0..b7aef8e 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 @@ -264,6 +264,10 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "驳回意见") private String rejectOpinion; + @Column(name = "OPEN_INFO") + @ApiParam(value = "放行说明") + private String openInfo; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; 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 efbfada..d3688eb 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 @@ -717,7 +717,8 @@ public class AndonEnumUtil { CANCEL_ACTION("40", "撤销动作"), COMMIT_ACTION("50","提交动作"), PASS_ACTION("60","审批动作"), - REJECT_ACTION("70", "驳回动作"); + REJECT_ACTION("70", "驳回动作"), + OPEN_ACTION("80","放行动作"); private String value; private String description;