diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 9acb8ee..0d72080 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -2074,9 +2074,8 @@ public class WmsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum DATA_STATUS { - ENABLE(1, "启用", "fa fa-success cell-fa fa-check"), - DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"), - LOCKING(3, "全部", "fa cell-fa fa-lock"); + YES(1, "是", "fa fa-success cell-fa fa-check"), + NO(2, "否", "fa fa-disabled cell-fa fa-times-circle"); private int value; private String description; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index f858769..893a13b 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -56,14 +56,6 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "单位") private String unit; - @Column(name = "QTY") - @ApiParam(value = "交易数量", example = "1") - private Double qty; - - @Column(name = "REJECT_QTY") - @ApiParam(value = "不合格交易数量", example = "1") - private Double rejectQty; - @Column(name = "TRANS_STATUS") @ApiParam(value = "状态", example = "10") private Integer transStatus; @@ -99,4 +91,36 @@ public class WmsTransQuan extends BaseBean { @Column(name = "ERROR_MESSAGE") @ApiParam(value = "错误信息") private String errorMessage; + + @Column(name = "QTY") + @ApiParam(value = "可用数量", example = "0") + public Double qty; + + @Column(name = "FAIL_QTY") + @ApiParam(value = "不合格数量", example = "0") + private Double failQty; + + @Column(name = "HOLD_QTY") + @ApiParam(value = "隔离数量", example = "0") + private Double holdQty; + + @Column(name = "QC_QTY") + @ApiParam(value = "质检中数量", example = "0") + private Double qcQty; + + @Column(name = "RIN_QTY") + @ApiParam(value = "待入库数量", example = "0") + private Double rinQty; + + @Column(name = "FREEZE_QTY") + @ApiParam(value = "冻结数量", example = "0") + private Double freezeQty; + + @Column(name = "CONSIGN_QTY") + @ApiParam(value = "寄售数量", example = "0") + private Double consignQty; + + @Column(name = "LOCK_QTY") + @ApiParam(value = "锁定数量", example = "0") + private Double lockQty; }