diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java index df3f6d5..28139af 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroup.java @@ -52,42 +52,25 @@ public class WmsActionGroup extends BaseBean { @JsonSerialize(using = ToStringSerializer.class) private Long initAmId; -// @Transient -// @ApiParam(value = "初始化组件名称") -// private String initAmName; - @Column(name = "DETAILS_AM_ID") @ApiParam(value = "明细处理组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long detailsAmId; -// @Transient -// @ApiParam(value = "明细处理组件名称") -// private String detailsAmName; - - @Column(name = "SUBMIT_AM_ID") - @ApiParam(value = "提交组件编号", example = "0") - @JsonSerialize(using = ToStringSerializer.class) - private Long submitAmId; - -// @Transient -// @ApiParam(value = "提交组件名称") -// private String submitAmName; - @Column(name = "END_AM_ID") @ApiParam(value = "结束组件编号", example = "0") @JsonSerialize(using = ToStringSerializer.class) private Long endAmId; -// -// @Transient -// @ApiParam(value = "结束组件名称") -// private String endAmName; // 1=true, 2 = false @Column(name = "AUTO_INIT") @ApiParam(value = "任务自动初始化", example = "0") private Integer autoInit; + @Column(name = "POSITION") + @ApiParam(value = "GOJS位置") + private String position; + public Long getInitAmId() { if (initAmId != null) { return initAmId.longValue(); diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java index 54a9528..beb6129 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionGroupDetails.java @@ -27,7 +27,7 @@ import javax.persistence.Transient; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_ACTION_GROUP_DETAILS") +@Table(name = "WMS_ACTION_GROUP_DETAILS") @Api("作业流程明细") public class WmsActionGroupDetails extends BaseBean {