Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/GoodsStockManager.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/GoodsStockManager.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/goodsstock/GoodsStockManager.java	(revision 12653)
@@ -0,0 +1,38 @@
+package com.forgon.disinfectsystem.basedatamanager.goodsstock;
+
+import java.util.List;
+
+import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
+
+/**
+ * 器械包、材料库存manager接口
+ * @author shuyongfu
+ * @since 2016-03-21
+ */
+public interface GoodsStockManager {
+	
+	/**
+	 * 入库,加库存
+	 */
+	public static String MODE_INSTOCK = "入库";
+	
+	/**
+	 * 出库,减库存
+	 */
+	public static String MODE_OUTSTOCK = "出库";
+
+	/**
+	 * 新增或修改材料库存数据(同一个仓库的同一个器械包或材料id只存在一条数据)
+	 * @param goodsStockList
+	 * @return
+	 */
+	public List<GoodsStock> saveOrUpdateGoodsStock(List<GoodsStock> goodsStockList, String mode);
+	
+	/**
+	 * 查询材料库存数据明细,(按仓库对器械包或材料进行数量汇总,显示仓库明细)
+	 * @param goodsStock 可以查询的属性有仓库id,器械包或材料定义id等
+	 * @return
+	 */
+	public List<GoodsStock> getGoodsStockList(GoodsStock goodsStock);
+	
+}
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/goodsstock/GoodsStock.java	(revision 12653)
@@ -0,0 +1,155 @@
+package com.forgon.disinfectsystem.entity.goodsstock;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import com.fasterxml.jackson.annotation.JsonFilter;
+
+/**
+ * 器械包、材料库存表
+ * @author shuyongfu
+ * @since 2016-03-21
+ */
+@Entity
+@Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE)
+@JsonFilter("fieldFilter")
+public class GoodsStock {
+
+	/**
+	 * id
+	 */
+	private Long id;
+	
+	/**
+	 * 仓库id
+	 */
+	private Long wareHouseId;
+	
+	/**
+	 * 仓库名称
+	 */
+	private String wareHouseName;
+	
+	/**
+	 * 科室编码
+	 */
+	private String orgUnitCode;
+	
+	/**
+	 * 科室名称
+	 */
+	private String orgUnitName;
+	
+	/**
+	 * 物品类型
+	 */
+	private String goodsType;
+	
+	/**
+	 * 器械包定义id
+	 */
+	private Long tousseDefinitionId;
+	
+	/**
+	 * 材料定义id
+	 */
+	private Long materialDefinitionId;
+
+	/**
+	 * 名称(材料则为名称+规格)
+	 */
+	private Long name;
+	
+	/**
+	 * 数量
+	 */
+	private Integer amount;
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public Long getWareHouseId() {
+		return wareHouseId;
+	}
+
+	public void setWareHouseId(Long wareHouseId) {
+		this.wareHouseId = wareHouseId;
+	}
+
+	public String getWareHouseName() {
+		return wareHouseName;
+	}
+
+	public void setWareHouseName(String wareHouseName) {
+		this.wareHouseName = wareHouseName;
+	}
+
+	public String getOrgUnitCode() {
+		return orgUnitCode;
+	}
+
+	public void setOrgUnitCode(String orgUnitCode) {
+		this.orgUnitCode = orgUnitCode;
+	}
+
+	public String getOrgUnitName() {
+		return orgUnitName;
+	}
+
+	public void setOrgUnitName(String orgUnitName) {
+		this.orgUnitName = orgUnitName;
+	}
+
+	public String getGoodsType() {
+		return goodsType;
+	}
+
+	public void setGoodsType(String goodsType) {
+		this.goodsType = goodsType;
+	}
+
+	public Long getTousseDefinitionId() {
+		return tousseDefinitionId;
+	}
+
+	public void setTousseDefinitionId(Long tousseDefinitionId) {
+		this.tousseDefinitionId = tousseDefinitionId;
+	}
+
+	public Long getMaterialDefinitionId() {
+		return materialDefinitionId;
+	}
+
+	public void setMaterialDefinitionId(Long materialDefinitionId) {
+		this.materialDefinitionId = materialDefinitionId;
+	}
+
+	public Long getName() {
+		return name;
+	}
+
+	public void setName(Long name) {
+		this.name = name;
+	}
+
+	public Integer getAmount() {
+		return amount;
+	}
+
+	public void setAmount(Integer amount) {
+		this.amount = amount;
+	}
+	
+}