diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java index b472d44..8707b77 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsOpType.java @@ -3,6 +3,8 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -45,14 +47,6 @@ public class WmsOpType extends BaseBean { @ApiParam(value = "序号", example = "0") private Integer seq; - @Column(name = "TM_ID") - @ApiParam(value = "交易处理组件ID", example = "0") - private Integer tmId; - - @Column(name = "DATA_SRC") - @ApiParam("数据来源") - private String dataSrc; - @Column(name = "ORDER_MIN") @ApiParam(value = "单据处理下限", example = "0") private Integer orderMin; @@ -103,7 +97,12 @@ public class WmsOpType extends BaseBean { @ApiParam(value = "是否允许多人操作", example = "0") private Integer isMuliti; - @Transient - @ApiParam(value = "单据集") - private List> orderList; + @Column(name = "TM_ID") + @ApiParam(value = "处理组件编号") + @JsonSerialize(using = ToStringSerializer.class) + private Long tmId; + + @Column(name = "DATA_SRC") + @ApiParam("数据来源") + private String dataSrc; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java index 36ac8e9..a6766aa 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskSrc.java @@ -51,6 +51,7 @@ public class WmsTaskSrc extends BaseBean { @Column(name = "TRANS_CODE") @ApiParam("默认交易类型") public String transCode; + @Column(name = "IS_ONE_STEP") @ApiParam("是否一步法") public Integer isOneStep;