采购入库，增加单行的金额，合计金额，付款账户，付款金额等字段，改动较大，为临时版本

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

@@ -16,14 +16,11 @@ public class DepotHeadModel implements Serializable
 	private String OperTime;	
 	private Long OrganId;
 	private Long HandsPersonId;
-	private Long WareHousePersonId;
-	private String SettlementWay = "";	
-	private Long BuildingId;
+	private Long AccountId;
+	private Double ChangeAmount;	
 	private Long AllocationProjectId;	
+	private Double TotalPrice;
 	private String Remark = "";	
-	private String State = "";	
-	private String ReAuditPersonName = "";	
-	private String Reason = "";	
 	
 	private String BeginTime; //查询开始时间
 	private String EndTime;  //查询结束时间
@@ -117,28 +114,20 @@ public class DepotHeadModel implements Serializable
 		HandsPersonId = handsPersonId;
 	}
 
-	public Long getWareHousePersonId() {
-		return WareHousePersonId;
+	public Long getAccountId() {
+		return AccountId;
 	}
 
-	public void setWareHousePersonId(Long wareHousePersonId) {
-		WareHousePersonId = wareHousePersonId;
+	public void setAccountId(Long accountId) {
+		AccountId = accountId;
 	}
 
-	public String getSettlementWay() {
-		return SettlementWay;
+	public Double getChangeAmount() {
+		return ChangeAmount;
 	}
 
-	public void setSettlementWay(String settlementWay) {
-		SettlementWay = settlementWay;
-	}
-
-	public Long getBuildingId() {
-		return BuildingId;
-	}
-
-	public void setBuildingId(Long buildingId) {
-		BuildingId = buildingId;
+	public void setChangeAmount(Double changeAmount) {
+		ChangeAmount = changeAmount;
 	}
 
 	public Long getAllocationProjectId() {
@@ -149,36 +138,20 @@ public class DepotHeadModel implements Serializable
 		AllocationProjectId = allocationProjectId;
 	}
 
-	public String getRemark() {
-		return Remark;
-	}
-
-	public void setRemark(String remark) {
-		Remark = remark;
-	}
-
-	public String getState() {
-		return State;
-	}
-
-	public void setState(String state) {
-		State = state;
-	}
-
-	public String getReAuditPersonName() {
-		return ReAuditPersonName;
+	public Double getTotalPrice() {
+		return TotalPrice;
 	}
 
-	public void setReAuditPersonName(String reAuditPersonName) {
-		ReAuditPersonName = reAuditPersonName;
+	public void setTotalPrice(Double totalPrice) {
+		TotalPrice = totalPrice;
 	}
 
-	public String getReason() {
-		return Reason;
+	public String getRemark() {
+		return Remark;
 	}
 
-	public void setReason(String reason) {
-		Reason = reason;
+	public void setRemark(String remark) {
+		Remark = remark;
 	}
 
 	public Long getDepotHeadID() {

src/com/jsh/model/vo/materials/DepotItemModel.java

@@ -13,7 +13,7 @@ public class DepotItemModel implements Serializable
 	private Long MaterialId;
 	private Double OperNumber;
 	private Double UnitPrice;
-	private Double Incidentals;
+	private Double AllPrice;
 	private String Remark = "";
 	private String Img = "";
     
@@ -100,12 +100,12 @@ public class DepotItemModel implements Serializable
 		UnitPrice = unitPrice;
 	}
 
-	public Double getIncidentals() {
-		return Incidentals;
+	public Double getAllPrice() {
+		return AllPrice;
 	}
 
-	public void setIncidentals(Double incidentals) {
-		Incidentals = incidentals;
+	public void setAllPrice(Double allPrice) {
+		AllPrice = allPrice;
 	}
 
 	public String getRemark() {

src/com/jsh/model/vo/materials/PersonModel.java

@@ -8,10 +8,6 @@ public class PersonModel implements Serializable
     private PersonShowModel showModel = new PersonShowModel();
 
     /**======开始接受页面参数=================**/
-    /**
-     * ProjectId
-     */
-    private Long ProjectId;
     /**
      * 类型
      */
@@ -54,14 +50,6 @@ public class PersonModel implements Serializable
 		this.showModel = showModel;
 	}
 
-	public Long getProjectId() {
-		return ProjectId;
-	}
-
-	public void setProjectId(Long projectId) {
-		ProjectId = projectId;
-	}
-
 	public String getType() {
 		return Type;
 	}

src/com/jsh/service/materials/BuildingIService.java

-package com.jsh.service.materials;
-
-import com.jsh.base.BaseIService;
-import com.jsh.model.po.Building;
-
-public interface BuildingIService extends BaseIService<Building>
-{
-	
-}

src/com/jsh/service/materials/BuildingService.java

-package com.jsh.service.materials;
-
-import com.jsh.base.BaseService;
-import com.jsh.dao.materials.BuildingIDAO;
-import com.jsh.model.po.Building;
-
-public class BuildingService extends BaseService<Building> implements BuildingIService
-{
-	@SuppressWarnings("unused")
-	private BuildingIDAO buildingDao;
-
-	
-	public void setBuildingDao(BuildingIDAO buildingDao) {
-		this.buildingDao = buildingDao;
-	}
-
-
-	@Override
-	protected Class<Building> getEntityClass()
-	{
-		return Building.class;
-	}
-    
-}