diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java index a694def..5d5d293 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -28,7 +27,30 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_ASN_DETAILS") @Api("ASN订单明细信息") -public class WmsASNMasterDetails extends WmsOrderDetailsModel { +public class WmsASNMasterDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "PO_ITEM") @ApiParam("PO行号") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java index e28e2c0..c4a8117 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSOrderDetails.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +26,30 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_CS_DETAILS") @Api("盘点单冻结信息") -public class WmsCSOrderDetails extends WmsOrderDetailsModel { +public class WmsCSOrderDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "WH_NO") @ApiParam("仓库代码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java index 32d1581..a8fd0f0 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +26,30 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_MOVEMENT_DETAILS") @Api("移库单明细表") -public class WmsDocMovementDetails extends WmsOrderDetailsModel { +public class WmsDocMovementDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "SRC_WH_NO") @ApiParam("源仓库代码") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java index fda45d5..6e62522 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMasterDetails.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -27,7 +26,30 @@ import javax.persistence.Table; @EqualsAndHashCode(callSuper = true) @Table(name = "WMS_DOC_PO_DETAILS") @Api("PO订单明细信息") -public class WmsPOMasterDetails extends WmsOrderDetailsModel { +public class WmsPOMasterDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; @Column(name = "PRINT_QTY") @ApiParam(value = "条码打印数量", example = "0") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java index 2d12d58..5639e4c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCDetails.java @@ -1,7 +1,6 @@ package cn.estsh.i3plus.pojo.wms.bean; import cn.estsh.i3plus.pojo.base.bean.BaseBean; -import cn.estsh.i3plus.pojo.wms.modelbean.WmsOrderDetailsModel; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -26,41 +25,64 @@ import javax.persistence.Table; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_QC_DETAILS") +@Table(name = "WMS_QC_DETAILS") @Api("质检单明细信息") -public class WmsQCDetails extends WmsOrderDetailsModel { +public class WmsQCDetails extends BaseBean { + @Column(name = "PART_NO") + @ApiParam("物料编码") + public String partNo; + + @Column(name = "PART_NAME_RDD") + @ApiParam("物料名称") + public String partNameRdd; + + @Column(name = "ITEM") + @ApiParam("行号") + public Integer item; + + @Column(name = "QTY") + @ApiParam(value = "需求数量", example = "0") + public Double qty; + + @Column(name = "UNIT") + @ApiParam("单位") + public String unit; + + @Column(name = "ORDER_NO") + @ApiParam("订单号") + public String orderNo; /** * 状态:N=正常,C=行取消 */ - @Column(name="ITEM_STATUS") + @Column(name = "ITEM_STATUS") @ApiParam(value = "状态", example = "1") public Integer itemStatus; - @Column(name="REMARK") + @Column(name = "REMARK") @ApiParam("备注") public String reMark; - @Column(name="FACT_QTY") + @Column(name = "FACT_QTY") @ApiParam(value = "实检数量", example = "0") public Double factQty; - @Column(name="PASS_QTY") + @Column(name = "PASS_QTY") @ApiParam(value = "合格数量", example = "0") public Double passQty; - @Column(name="REJECT_QTY") + @Column(name = "REJECT_QTY") @ApiParam(value = "不合格数量", example = "0") public Double rejectQty; - @Column(name="QC_USER") + @Column(name = "QC_USER") @ApiParam("检验员") public String qcUser; - @Column(name="QC_TIME") + @Column(name = "QC_TIME") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - @ApiParam(value="检验时间",example = "2000-01-01 01:00:00") + @ApiParam(value = "检验时间", example = "2000-01-01 01:00:00") public String qcTime; }