From 78cbe1dc29361377e1ab5e6056f38703d190988f Mon Sep 17 00:00:00 2001
From: megagao <megagao@126.com>
Date: Thu, 24 Nov 2016 16:39:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BA=86=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../production_ms/domain/MaterialConsume.java | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/hqu/production_ms/domain/MaterialConsume.java b/src/main/java/org/hqu/production_ms/domain/MaterialConsume.java
index 1222b83..00b08ec 100644
--- a/src/main/java/org/hqu/production_ms/domain/MaterialConsume.java
+++ b/src/main/java/org/hqu/production_ms/domain/MaterialConsume.java
@@ -5,7 +5,9 @@ import java.util.Date;
 public class MaterialConsume {
     private String consumeId;
 
-    private String materialId;
+    private Work work;
+
+    private Material material;
 
     private Integer consumeAmount;
 
@@ -25,12 +27,20 @@ public class MaterialConsume {
         this.consumeId = consumeId == null ? null : consumeId.trim();
     }
 
-    public String getMaterialId() {
-        return materialId;
+    public Work getWork() {
+        return work;
+    }
+
+    public void setWork(Work work) {
+        this.work = work;
+    }
+
+    public Material getMaterial() {
+        return material;
     }
 
-    public void setMaterialId(String materialId) {
-        this.materialId = materialId == null ? null : materialId.trim();
+    public void setMaterial(Material material) {
+        this.material = material;
     }
 
     public Integer getConsumeAmount() {
-- 
GitLab