diff --git a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondaryWarehouse.java b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondaryWarehouse.java index 7b9df14..c69f9a6 100644 --- a/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondaryWarehouse.java +++ b/sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/material/domain/SecondaryWarehouse.java @@ -49,9 +49,10 @@ public class SecondaryWarehouse { /** * 工程名称 */ - @Excel(name = "工程") +// @Excel(name = "工程") private String proName; + /** * 工程名称 */ @@ -59,13 +60,19 @@ public class SecondaryWarehouse { /** * 设备名称 */ - @Excel(name = "类型名称") + @Excel(name = "机具名称") private String typeName; /** * 规格型号 */ @Excel(name = "规格型号") private String modelName; + + /** + * 计量单位 + */ + @Excel(name = "计量单位") + private String nuitName; /** * 规格型号id */ @@ -73,53 +80,51 @@ public class SecondaryWarehouse { /** * 进场数量 */ - @Excel(name = "进场数量") +// @Excel(name = "进场数量") private String jcNum; /** * 退场数量 */ - @Excel(name = "退场数量") +// @Excel(name = "退场数量") private String tcNUm; - /** - * 场内库存量 - */ - @Excel(name = "场内库存量") - private String kcNum; + /** * 已出库数量 */ - @Excel(name = "已出库数量") +// @Excel(name = "已出库数量") private String ckNum; + /** - * 在库数量 + * 场内库存量 */ - @Excel(name = "在库数量") - private String zkNum; - /** - * 计量单位 - */ - @Excel(name = "计量单位") - private String nuitName; + + private String kcNum; private String keyword; /** * 租赁类型 0工程1长期 */ - @Excel(name = "租赁类型") +// @Excel(name = "租赁类型") private Integer leaseType; /** * 领用数量 */ + @Excel(name = "总量") private Integer Num; + + /** + * 库存数量 + */ + @Excel(name = "库存数量") + private Integer stockNum; + /** * 领用数量 */ + @Excel(name = "领用数量") private Integer receiveNum; - /** - * 库存数量 - */ - private Integer stockNum; + }