diff --git a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java index 857d0e87..29d35da0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/erp/domain/ErpMaterial.java @@ -31,7 +31,7 @@ public class ErpMaterial extends BaseEntity @Excel(name = "料号",sort = 1) private String materialNo; /** 物料名称 */ - @Excel(name = "物料名称",sort = 4) + @Excel(name = "物料名称",sort = 2) private String materialName; /** 审核状态 0-待审核 1-审核通过 2-审核拒绝*/ @@ -39,9 +39,10 @@ public class ErpMaterial extends BaseEntity /** 使用状态 0-否 1-是 2-已作废*/ private String useStatus; + /** 关联bom */ - @Excel(name = "关联bom号",sort = 2) private String bomNo; + /** 是否有生产团队 */ private String havaProductTem; /**技术团队编号 */ @@ -53,10 +54,10 @@ public class ErpMaterial extends BaseEntity //技术团队利润率 private String itemPR; /** 物料类型 */ + @Excel(name = "物料类型",sort = 3,readConverterExp = "bzjgj=原料-标准结构件或电气元件,scy=辅料-生产用,fscy=辅料-非生产用,dbmcljgj=半成品-加工完成待表面处理的结构件,lj=半成品-零件,zhj=半成品-组合件,chcpsb=成品-成品出货设备,qtyflswl=其他/研发临时物料") private String materialType; /** 物料类型名称 */ - @Excel(name = "物料类型名称",sort = 5) private String materialTypeName; @@ -89,7 +90,9 @@ public class ErpMaterial extends BaseEntity @FieldCompare(chineseName = "入库部门",properties = "0:仓库,1:采购") @Excel(name = "入库部门",sort = 10,dictType = "warehouseDept") private String warehouseDept; - /*工程员*/ + + /**工程员*/ + @Excel(name = "工程员",sort = 11) private String businessMembers; /** 流程实例ID */