11

ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java

@@ -19,6 +19,9 @@ public class CMaterial extends BaseEntity
     /** id */
     private Long materialId;
 
+    /** 关联物料类型id */
+    private Long materialTypeId;
+
     /** 型号 */
     @Excel(name = "型号")
     private String materialXingh;
@@ -47,6 +50,15 @@ public class CMaterial extends BaseEntity
     {
         return materialId;
     }
+
+    public Long getMaterialTypeId() {
+        return materialTypeId;
+    }
+
+    public void setMaterialTypeId(Long materialTypeId) {
+        this.materialTypeId = materialTypeId;
+    }
+
     public void setMaterialXingh(String materialXingh)
     {
         this.materialXingh = materialXingh;
@@ -97,12 +109,12 @@ public class CMaterial extends BaseEntity
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("materialId", getMaterialId())
-            .append("materialXingh", getMaterialXingh())
-            .append("materialGuig", getMaterialGuig())
-            .append("materialDiany", getMaterialDiany())
-            .append("materialDw", getMaterialDw())
-            .append("cMaterialCostList", getCMaterialCostList())
-            .toString();
+                .append("materialId", getMaterialId())
+                .append("materialXingh", getMaterialXingh())
+                .append("materialGuig", getMaterialGuig())
+                .append("materialDiany", getMaterialDiany())
+                .append("materialDw", getMaterialDw())
+                .append("cMaterialCostList", getCMaterialCostList())
+                .toString();
     }
 }