From de6792426e80b95f431e6cddcacc6a0d29609c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= Date: Mon, 16 Sep 2019 20:57:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=AE=A1=E5=AE=B6=EF=BC=9A?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=AE=8C=E6=88=90=E6=8F=90=E4=BA=A4=E6=89=80?= =?UTF-8?q?=E6=9C=89=E5=BE=85=E6=8F=90=E4=BA=A4=E7=A7=BB=E5=8A=A8=E5=8D=95?= =?UTF-8?q?=EF=BC=9B=E5=8F=AA=E6=8E=A8=E9=80=81=E5=BD=93=E5=89=8D=E7=A7=BB?= =?UTF-8?q?=E5=8A=A8=E5=8D=95=20PDA=E6=94=B6=E8=B4=A7=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=EF=BC=9A=E6=94=B9=E6=95=B0=E5=90=8E=E5=88=A0=E9=99=A4=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E8=AE=B0=E5=BD=95BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java | 19 +++++++++++-------- .../i3plus/pojo/wms/bean/WmsDocMovementMaster.java | 16 ++++++++-------- .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ .../cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java | 14 +++++++++----- 4 files changed, 32 insertions(+), 21 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java index 2fb7868..64ea546 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java @@ -43,7 +43,7 @@ public class WmsASNMaster extends BaseBean { @Column(name = "ASN_STATUS") @ApiParam(value = "状态", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer asnStatus; @Column(name = "VENDOR_NO") @@ -68,7 +68,7 @@ public class WmsASNMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; @ApiParam("ASN详情列表") @@ -169,18 +169,19 @@ public class WmsASNMaster extends BaseBean { @Transient @ApiParam("收货状态") - @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class, refForeignKey = "value", value = "description") private String recStatus; @Transient @ApiParam("项目") private String prodCfgTypeCode; - public WmsASNMaster(){} + public WmsASNMaster() { + } - public WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNameRdd, - Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType, - String recStatus){ + public WmsASNMaster(String orderNo, Integer asnStatus, String vendorNo, String partNo, String partNameRdd, + Double sumQty, Double sumRecQty, String planDate, String planTime, Double diffQty, String orderType, + String recStatus) { this.orderNo = orderNo; this.asnStatus = asnStatus; @@ -196,5 +197,7 @@ public class WmsASNMaster extends BaseBean { this.recStatus = recStatus; } - + public int getAsnStatusVal() { + return this.asnStatus == null ? 0 : this.asnStatus; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java index 49f0d92..fa09e20 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java @@ -45,7 +45,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "MOVE_TYPE") @ApiParam("移动类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_MOVE_TYPE.class, refForeignKey = "value", value = "description") public Integer moveType; /** * 业务类型:RC=收货,QC=质检,IN=入库,ZI=杂收,ZO=杂发, @@ -54,7 +54,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "BUSI_TYPE") @ApiParam("业务类型") - @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.OUT_MOVEMENT_BUSI_TYPE.class, refForeignKey = "value", value = "description") public Integer busiType; /** @@ -63,7 +63,7 @@ public class WmsDocMovementMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer orderStatus; @Column(name = "CUST_NO") @@ -95,7 +95,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; @Column(name = "PRIORITY") @@ -123,7 +123,7 @@ public class WmsDocMovementMaster extends BaseBean { @Column(name = "IS_PART") @ApiParam(value = "是否散件", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") private Integer isPart; @Column(name = "SRC_WH_NO") @@ -162,7 +162,7 @@ public class WmsDocMovementMaster extends BaseBean { @ApiParam("类型名称") public String busiTypeName; -// public Integer getIsSn() { -//// return isSn == null ? 0 : this.getIsSn(); -//// } + public int getOrderStatusVal() { + return this.orderStatus == null ? 0 : this.orderStatus; + } } 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 a8c4c5e..a545be8 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 @@ -140,4 +140,8 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam("前端信息") private String message; + + public int getPoStatusVal() { + return this.poStatus == null ? 0 : this.poStatus; + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java index ffe25ee..7d79a3b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCMaster.java @@ -42,7 +42,7 @@ public class WmsQCMaster extends BaseBean { */ @Column(name = "ORDER_TYPE") @ApiParam(value = "业务类型", example = "0") - @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.QC_INFO_TYPE.class, refForeignKey = "value", value = "description") public Integer orderType; /** @@ -50,7 +50,7 @@ public class WmsQCMaster extends BaseBean { */ @Column(name = "ORDER_STATUS") @ApiParam(value = "状态", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description") public Integer orderStatus; @Column(name = "REMARK") @@ -87,11 +87,15 @@ public class WmsQCMaster extends BaseBean { @Column(name = "IS_TASK") @ApiParam(value = "是否生产任务", example = "1") - @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description") public Integer isTask; - @Column(name="IS_PART") + @Column(name = "IS_PART") @ApiParam(value = "是否散件", example = "2") - @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description") + @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description") public Integer isPart; + + public int getOrderStatusVal() { + return this.orderStatus == null ? 0 : this.orderStatus; + } }