From 4b5fc9d394f98da834aa73415d9235c68d313b0b Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Tue, 16 Apr 2019 15:45:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEPO=E5=8D=95=E5=8F=B7=E6=89=B9?= =?UTF-8?q?=E9=87=8F=E7=94=9F=E6=88=90=E6=9D=A1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 26 +++++++++++++--------- .../i3plus/pojo/wms/bean/WmsPOMasterDetails.java | 2 +- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 1d95450..79d47dd 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -26,11 +26,11 @@ import java.util.List; @DynamicInsert @DynamicUpdate @EqualsAndHashCode(callSuper = true) -@Table(name="WMS_DOC_PO_MASTER") +@Table(name = "WMS_DOC_PO_MASTER") @Api("PO主表信息") public class WmsPOMaster extends BaseBean { - @Column(name="ORDER_NO") + @Column(name = "ORDER_NO") @ApiParam("订单号") public String orderNo; @@ -38,7 +38,7 @@ public class WmsPOMaster extends BaseBean { * 单据类型: * 1 REG=原物料采购,10 SUB=委外采购,20 TAR=多角贸易采购,30 TAP=多角代采购 */ - @Column(name="PO_TYPE") + @Column(name = "PO_TYPE") @ApiParam("单据类型") public String poType; @@ -46,26 +46,26 @@ public class WmsPOMaster extends BaseBean { * 状态:1=新建,10=收货中,20=收货完成, * 30=入库中,40=入库完成,90=已关闭,91=已取消 */ - @Column(name="PO_STATUS") + @Column(name = "PO_STATUS") @ApiParam(value = "状态", example = "1") public Integer poStatus; - @Column(name="VENDOR_NO") + @Column(name = "VENDOR_NO") @ApiParam("供应商编号") public String vendorNo; - @Column(name="VERSION") + @Column(name = "VERSION") @ApiParam("版本") public String version; /** * 单据来源:1 MNU=手工,2 ERP=ERP接口 */ - @Column(name="SRC") + @Column(name = "SRC") @ApiParam("单据来源") public String src; - @Column(name="IS_ASN") + @Column(name = "IS_ASN") @ApiParam("是否有ASN") public String isAsn; @@ -76,11 +76,11 @@ public class WmsPOMaster extends BaseBean { @ApiParam("供应商名称") private String vendorName; - @Column(name="IS_TASK") - @ApiParam(value = "是否生产任务", example = "1") + @Column(name = "IS_TASK") + @ApiParam(value = "是否生成任务", example = "1") public Integer isTask; - @Column(name="IS_PART") + @Column(name = "IS_PART") @ApiParam(value = "是否散件", example = "1") public Integer isPart; @@ -103,4 +103,8 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam(value = "发货日期") private String sendDate; + + @Column(name = "IS_SN") + @ApiParam(value = "是否生成条码", example = "1") + public Integer isSn; } 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 2a8209b..9d973a8 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 @@ -105,7 +105,7 @@ public class WmsPOMasterDetails extends BaseBean { @Column(name = "SNP") @ApiParam("标准包装") - public String snp; + public Integer snp; /** * 是否免费:0=计费,1=免费