Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExpensiveGodownEntryReceivingReportItemVO.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExpensiveGodownEntryReceivingReportItemVO.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/ExpensiveGodownEntryReceivingReportItemVO.java	(revision 21853)
@@ -0,0 +1,301 @@
+package com.forgon.disinfectsystem.vo;
+
+import java.util.Date;
+
+/**
+ * 2018年1月7号
+ * @author YanWeiNing
+ *
+ */
+public class ExpensiveGodownEntryReceivingReportItemVO {
+
+	private String name;
+
+	private String code;// 编码
+
+	private String inventorySerialNumber; // 物资系统的物资编码，用于与物资系统交互
+
+	private String producingArea;// 产地
+
+	private String specification;// 规格
+
+	private String unit; // 单位
+
+	private String serialNumber; // 单号
+
+	private String operator; // 操作员
+
+	private String time; // 入库/退库/退货时间
+
+	private Long amount = 1L; // 数量
+
+	private Double cost; // 入库价
+
+	private Double price; // 入库价格
+
+	private Double rowPrice;// 小计
+
+	private Double totalPrice;
+
+	private String batchNumber; // 批次
+
+	private String identification; // 标识号
+
+	private Long diposableGoodsID;// 一次性物品id
+
+	private Long batchID;// 批次id
+
+	private Long identificationID;// 标识对象的ID，以后不要使用identification来关联了。
+
+	private Date expDate;// 失效期
+
+	private String certification;// 注册证号
+
+	private String supplierName;// 供应商
+
+	private String sterileBatchNumber;// 灭菌批次
+
+	private String manufacturer;// 生产厂家
+
+	private String conclusion;
+	
+	/**
+	 * 型号
+	 */
+	private String model;
+
+	/**
+	 * 型号id
+	 */
+	private Long expensiveGoodsModelId ;
+	
+	/**
+	 * 高值耗材定义id
+	 */
+	private Long  expensiveGoodsId;
+	
+	public Long getExpensiveGoodsId() {
+		return expensiveGoodsId;
+	}
+
+	public void setExpensiveGoodsId(Long expensiveGoodsId) {
+		this.expensiveGoodsId = expensiveGoodsId;
+	}
+
+	public String getModel() {
+		return model;
+	}
+
+	public void setModel(String model) {
+		this.model = model;
+	}
+
+	public Long getExpensiveGoodsModelId() {
+		return expensiveGoodsModelId;
+	}
+
+	public void setExpensiveGoodsModelId(Long expensiveGoodsModelId) {
+		this.expensiveGoodsModelId = expensiveGoodsModelId;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getInventorySerialNumber() {
+		return inventorySerialNumber;
+	}
+
+	public void setInventorySerialNumber(String inventorySerialNumber) {
+		this.inventorySerialNumber = inventorySerialNumber;
+	}
+
+	public String getProducingArea() {
+		return producingArea;
+	}
+
+	public void setProducingArea(String producingArea) {
+		this.producingArea = producingArea;
+	}
+
+	public String getSpecification() {
+		return specification;
+	}
+
+	public void setSpecification(String specification) {
+		this.specification = specification;
+	}
+
+	public String getUnit() {
+		return unit;
+	}
+
+	public void setUnit(String unit) {
+		this.unit = unit;
+	}
+
+	public String getSerialNumber() {
+		return serialNumber;
+	}
+
+	public void setSerialNumber(String serialNumber) {
+		this.serialNumber = serialNumber;
+	}
+
+	public String getOperator() {
+		return operator;
+	}
+
+	public void setOperator(String operator) {
+		this.operator = operator;
+	}
+
+	public String getTime() {
+		return time;
+	}
+
+	public void setTime(String time) {
+		this.time = time;
+	}
+
+	public Long getAmount() {
+		return amount;
+	}
+
+	public void setAmount(Long amount) {
+		this.amount = amount;
+	}
+
+	public Double getCost() {
+		return cost;
+	}
+
+	public void setCost(Double cost) {
+		this.cost = cost;
+	}
+
+	public Double getPrice() {
+		return price;
+	}
+
+	public void setPrice(Double price) {
+		this.price = price;
+	}
+
+	public Double getRowPrice() {
+		return rowPrice;
+	}
+
+	public void setRowPrice(Double rowPrice) {
+		this.rowPrice = rowPrice;
+	}
+
+	public Double getTotalPrice() {
+		return totalPrice;
+	}
+
+	public void setTotalPrice(Double totalPrice) {
+		this.totalPrice = totalPrice;
+	}
+
+	public String getBatchNumber() {
+		return batchNumber;
+	}
+
+	public void setBatchNumber(String batchNumber) {
+		this.batchNumber = batchNumber;
+	}
+
+	public String getIdentification() {
+		return identification;
+	}
+
+	public void setIdentification(String identification) {
+		this.identification = identification;
+	}
+
+	public Long getDiposableGoodsID() {
+		return diposableGoodsID;
+	}
+
+	public void setDiposableGoodsID(Long diposableGoodsID) {
+		this.diposableGoodsID = diposableGoodsID;
+	}
+
+	public Long getBatchID() {
+		return batchID;
+	}
+
+	public void setBatchID(Long batchID) {
+		this.batchID = batchID;
+	}
+
+	public Long getIdentificationID() {
+		return identificationID;
+	}
+
+	public void setIdentificationID(Long identificationID) {
+		this.identificationID = identificationID;
+	}
+
+	public Date getExpDate() {
+		return expDate;
+	}
+
+	public void setExpDate(Date expDate) {
+		this.expDate = expDate;
+	}
+
+	public String getCertification() {
+		return certification;
+	}
+
+	public void setCertification(String certification) {
+		this.certification = certification;
+	}
+
+	public String getSupplierName() {
+		return supplierName;
+	}
+
+	public void setSupplierName(String supplierName) {
+		this.supplierName = supplierName;
+	}
+
+	public String getSterileBatchNumber() {
+		return sterileBatchNumber;
+	}
+
+	public void setSterileBatchNumber(String sterileBatchNumber) {
+		this.sterileBatchNumber = sterileBatchNumber;
+	}
+
+	public String getManufacturer() {
+		return manufacturer;
+	}
+
+	public void setManufacturer(String manufacturer) {
+		this.manufacturer = manufacturer;
+	}
+
+	public String getConclusion() {
+		return conclusion;
+	}
+
+	public void setConclusion(String conclusion) {
+		this.conclusion = conclusion;
+	}
+
+}