From 1744b2ab035275b844a78b711fe98309af726ecd Mon Sep 17 00:00:00 2001
From: xd <844539747@qq.com>
Date: Fri, 1 Mar 2024 10:19:19 +0800
Subject: [PATCH] 11

---
 .../com/ruoyi/material/domain/CMaterial.java  | 48 ++++++++++++-------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java b/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java
index ea2e985..cd026c6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/material/domain/CMaterial.java
@@ -8,7 +8,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * 物料管理对象 c_material
- * 
+ *
  * @author ruoyi
  * @date 2024-02-28
  */
@@ -19,6 +19,9 @@ public class CMaterial extends BaseEntity
     /** id */
     private Long materialId;
 
+    /** 关联物料类型id */
+    private Long materialTypeId;
+
     /** 型号 */
     @Excel(name = "型号")
     private String materialXingh;
@@ -38,48 +41,57 @@ public class CMaterial extends BaseEntity
     /** 物料成本信息 */
     private List<CMaterialCost> cMaterialCostList;
 
-    public void setMaterialId(Long materialId) 
+    public void setMaterialId(Long materialId)
     {
         this.materialId = materialId;
     }
 
-    public Long getMaterialId() 
+    public Long getMaterialId()
     {
         return materialId;
     }
-    public void setMaterialXingh(String materialXingh) 
+
+    public Long getMaterialTypeId() {
+        return materialTypeId;
+    }
+
+    public void setMaterialTypeId(Long materialTypeId) {
+        this.materialTypeId = materialTypeId;
+    }
+
+    public void setMaterialXingh(String materialXingh)
     {
         this.materialXingh = materialXingh;
     }
 
-    public String getMaterialXingh() 
+    public String getMaterialXingh()
     {
         return materialXingh;
     }
-    public void setMaterialGuig(String materialGuig) 
+    public void setMaterialGuig(String materialGuig)
     {
         this.materialGuig = materialGuig;
     }
 
-    public String getMaterialGuig() 
+    public String getMaterialGuig()
     {
         return materialGuig;
     }
-    public void setMaterialDiany(String materialDiany) 
+    public void setMaterialDiany(String materialDiany)
     {
         this.materialDiany = materialDiany;
     }
 
-    public String getMaterialDiany() 
+    public String getMaterialDiany()
     {
         return materialDiany;
     }
-    public void setMaterialDw(String materialDw) 
+    public void setMaterialDw(String materialDw)
     {
         this.materialDw = materialDw;
     }
 
-    public String getMaterialDw() 
+    public String getMaterialDw()
     {
         return materialDw;
     }
@@ -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();
     }
 }