diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java index d71b02d..34ab3f6 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskDetails.java @@ -24,7 +24,7 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_TASK_DETAILS") +@Table(name = "WMS_TASK_DETAILS") @Api("作业任务明细信息") public class WmsTaskDetails extends BaseBean { @@ -109,4 +109,12 @@ public class WmsTaskDetails extends BaseBean { @Column(name = "REF_SRC") @ApiParam(value = "关联单据编号") private String refSrc; + + @Column(name = "SRC_AREA_NO") + @ApiParam("源库存地代码") + public String srcAreaNo; + + @Column(name = "DEST_AREA_NO") + @ApiParam("目的库存地代码") + public String destAreaNo; } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java index 0be658a..68faeba 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java @@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.wms.modelbean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.wms.bean.WmsASNMasterDetails; +import com.fasterxml.jackson.annotation.JsonInclude; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -9,10 +10,7 @@ import lombok.EqualsAndHashCode; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; -import javax.persistence.Transient; +import javax.persistence.*; import java.util.List; /** @@ -24,6 +22,10 @@ import java.util.List; **/ @Data @Api("单据明细Model") +@Entity +//以子类table为准 +@javax.persistence.Inheritance(strategy=InheritanceType.TABLE_PER_CLASS) +@JsonInclude(value = JsonInclude.Include.NON_EMPTY) //""或null属性不参加序列转换 public class WmsOrderDetailsModel extends BaseBean { @Column(name = "PART_NO") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index 2f30f9b..71a1a1a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -83,7 +83,7 @@ public class WmsHqlPack { * @param orderNos * @return */ - public static String packHqlWmsDocMovementDetailsByOrderNos(List orderNos) { + public static String packWmsOrderDetailsByOrderNos(List orderNos) { StringBuffer result = new StringBuffer(); StringBuffer orderNoStr = new StringBuffer(); for (int i = 0; i < orderNos.size(); i++) {