diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java index e4a35f8..be7ffe3 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPart.java @@ -204,7 +204,7 @@ public class WmsPart extends BaseBean { @ApiParam(value = "循环补货数量", example = "0") private Double cycleRquestQty = 0d; - public int getIqcValue(){ + public int getIqcVal(){ return this.iqc == null ? 0 : this.iqc.intValue(); } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java index 7ae45fb..811158c 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java @@ -79,49 +79,40 @@ public class WmsStockQuan extends BaseBean { private WmsLocate wmsLocate; - @Column(name = "QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "可用数量", example = "0") + @Column(name = "QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "可用数量") public Double qty; - @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "不合格数量", example = "0") + @Column(name = "FAIL_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "不合格数量") private Double failQty; - @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "隔离数量", example = "0") + @Column(name = "HOLD_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "隔离数量") private Double holdQty; - @Column(name = "QC_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "质检中数量", example = "0") + @Column(name = "QC_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "质检中数量") private Double qcQty; - @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "待入库数量", example = "0") + @Column(name = "RIN_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "待入库数量") private Double rinQty; - @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "冻结数量", example = "0") + @Column(name = "FREEZE_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "冻结数量") private Double freezeQty; - @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "寄售数量", example = "0") + @Column(name = "CONSIGN_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "寄售数量") private Double consignQty; - @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "锁定数量", example = "0") + @Column(name = "LOCK_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "锁定数量") private Double lockQty; - @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8)") - @ColumnDefault("0") - @ApiParam(value = "报废数量", example = "0") + @Column(name = "SCRAP_QTY", columnDefinition = "decimal(18,8) default 0") + @ApiParam(value = "报废数量") private Double scrapQty; @Transient diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java index aef6850..c6caa7a 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransType.java @@ -58,7 +58,7 @@ public class WmsTransType extends BaseBean { private String transTypeDesc; @Column(name = "TM_ID") - @ApiParam(value = "交易处理组件", example = "-1") + @ApiParam(value = "交易处理组件") @JsonSerialize(using = ToStringSerializer.class) private Long tmId; @@ -73,4 +73,8 @@ public class WmsTransType extends BaseBean { public String getMenuUrl() { return "/handle?transTypeCode=" + this.transTypeCode; } + + public long getTmIdVal() { + return this.tmId == null ? 0 : this.tmId; + } }