增加-预付款充值和消费的功能

src/main/java/com/jsh/model/po/DepotHead.java

@@ -19,6 +19,7 @@ public class DepotHead implements java.io.Serializable
 	private Double ChangeAmount;
 	private Depot AllocationProjectId;	
 	private Double TotalPrice;
+	private String PayType;
 	private String Remark;	
 
 	public DepotHead()
@@ -34,7 +35,7 @@ public class DepotHead implements java.io.Serializable
 	public DepotHead(String type, String subType, Depot projectId,
 			String number, String operPersonName, Timestamp createTime,
 			Timestamp operTime, Supplier organId, Person handsPersonId,
-			Account accountId, Double changeAmount, Depot allocationProjectId, Double totalPrice, String remark) {
+			Account accountId, Double changeAmount, Depot allocationProjectId, Double totalPrice,String payType, String remark) {
 		super();
 		Type = type;
 		SubType = subType;
@@ -49,6 +50,7 @@ public class DepotHead implements java.io.Serializable
 		ChangeAmount = changeAmount;
 		AllocationProjectId = allocationProjectId;
 		TotalPrice = totalPrice;
+		PayType = payType;
 		Remark = remark;
 	}
 
@@ -164,6 +166,14 @@ public class DepotHead implements java.io.Serializable
 		TotalPrice = totalPrice;
 	}
 
+	public String getPayType() {
+		return PayType;
+	}
+
+	public void setPayType(String payType) {
+		PayType = payType;
+	}
+
 	public String getRemark() {
 		return Remark;
 	}

src/main/java/com/jsh/model/po/Supplier.java

@@ -9,6 +9,7 @@ public class Supplier implements java.io.Serializable
 	private String contacts;
 	private String phonenum;
 	private String email;
+	private Double advanceIn;
     private Double BeginNeedGet;
     private Double BeginNeedPay;
     private Double AllNeedGet;
@@ -28,7 +29,7 @@ public class Supplier implements java.io.Serializable
 	}
 
 	public Supplier(String supplier, String type, String contacts, String phonenum, 
-    String email, Short isystem, String description, Boolean enabled,
+    String email, Short isystem, String description, Boolean enabled, Double advanceIn,
                     Double beginNeedGet,Double beginNeedPay,Double allNeedGet,Double allNeedPay) {
 		super();
 		this.supplier = supplier;
@@ -43,6 +44,7 @@ public class Supplier implements java.io.Serializable
 		this.isystem = isystem;
 		this.description = description;
 		this.enabled = enabled;
+		this.advanceIn = advanceIn;
 	}
 
 	public Long getId()
@@ -158,6 +160,13 @@ public class Supplier implements java.io.Serializable
 
 	public void setEnabled(Boolean enabled) {
 		this.enabled = enabled;
-	}	
-    
+	}
+
+	public Double getAdvanceIn() {
+		return advanceIn;
+	}
+
+	public void setAdvanceIn(Double advanceIn) {
+		this.advanceIn = advanceIn;
+	}
 }

src/main/java/com/jsh/model/vo/basic/SupplierModel.java

@@ -31,12 +31,17 @@ public class SupplierModel implements Serializable
 	/**
 	 * 电子邮箱
 	 */
-	private String email = "";    
-    
-    /**
-     * 期初应收
+	private String email = "";
+
+	/**
+     * 预付款
 	 */
-    private Double BeginNeedGet;
+    private Double AdvanceIn;
+
+	/**
+	 * 期初应收
+	 */
+	private Double BeginNeedGet;
     
     /**
      * 期初应付
@@ -135,6 +140,14 @@ public class SupplierModel implements Serializable
 	public void setEmail(String email) {
 		this.email = email;
 	}
+
+	public Double getAdvanceIn() {
+		return AdvanceIn;
+	}
+
+	public void setAdvanceIn(Double advanceIn) {
+		AdvanceIn = advanceIn;
+	}
     
     public void setBeginNeedGet(Double beginNeedGet)
     {

src/main/java/com/jsh/model/vo/materials/DepotHeadModel.java

@@ -21,6 +21,7 @@ public class DepotHeadModel implements Serializable
 	private Double ChangeAmount;	
 	private Long AllocationProjectId;	
 	private Double TotalPrice;
+	private String PayType = "";
 	private String Remark = "";	
 	
 	private String BeginTime; //查询开始时间
@@ -158,6 +159,14 @@ public class DepotHeadModel implements Serializable
 		TotalPrice = totalPrice;
 	}
 
+	public String getPayType() {
+		return PayType;
+	}
+
+	public void setPayType(String payType) {
+		PayType = payType;
+	}
+
 	public String getRemark() {
 		return Remark;
 	}