Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/GodownEntryUtil.java
===================================================================
diff -u -r13071 -r14464
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/GodownEntryUtil.java	(.../GodownEntryUtil.java)	(revision 13071)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/GodownEntryUtil.java	(.../GodownEntryUtil.java)	(revision 14464)
@@ -17,6 +17,9 @@
 	 * @return 
 	 */
 	public static String getGodownEntryTypeSqlWhere(String poName,String type){
+		if("全部".equals(type)){
+			return getGodownEntryInAndOutTypeSqlWhere(poName);
+		}
 		String sql = " ( 1=1 ) ";
 		if(!StringTools.isBlank(type)){
 			sql += " and " + poName + ".type='" + type + "'";
@@ -27,4 +30,18 @@
 		}
 		return sql;
 	}
+	/**
+	 * 生成入/退库单类型的where条件子句,查询入库单或者退库单,并且过滤掉调拨单产生的入库单和退库单
+	 * @param poName
+	 * @return
+	 */
+	public static String getGodownEntryInAndOutTypeSqlWhere(String poName){
+		String sql = " ( 1=0 ) ";
+		if(StringTools.isNotBlank(poName)){
+			sql = " (" + poName + ".type='" + GodownEntry.TYPE_IN + "' or " + poName + ".type='" + GodownEntry.TYPE_OUT + "')";
+			sql += " and ( " + poName + ".sourceId is null"; 
+			sql += " or " + poName + ".sourceId=0 )";
+		}
+		return sql;
+	}
 }
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/MaterialEntryUtil.java
===================================================================
diff -u -r13071 -r14464
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/MaterialEntryUtil.java	(.../MaterialEntryUtil.java)	(revision 13071)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/util/MaterialEntryUtil.java	(.../MaterialEntryUtil.java)	(revision 14464)
@@ -14,6 +14,9 @@
 	 * @return 
 	 */
 	public static String getMaterialEntryTypeSqlWhere(String poName,String type){
+		if("全部".equals(type)){
+			return getMaterialEntryInAndOutTypeSqlWhere(poName);
+		}
 		String sql = " ( 1=1 ) ";
 		if(!StringTools.isBlank(type)){
 			sql += " and " + poName + ".type='" + type + "'";
@@ -24,5 +27,20 @@
 		}
 		return sql;
 	}
+	
+	/**
+	 * 生成入/退库单类型的where条件子句,查询入库单或者退库单,并且过滤掉调拨单产生的入库单和退库单
+	 * @param poName
+	 * @return
+	 */
+	public static String getMaterialEntryInAndOutTypeSqlWhere(String poName){
+		String sql = " ( 1=0 ) ";
+		if(StringTools.isNotBlank(poName)){
+			sql = " (" + poName + ".type='" + MaterialEntry.TYPE_IN + "' or " + poName + ".type='" + MaterialEntry.TYPE_OUT + "')";
+			sql += " and ( " + poName + ".sourceId is null"; 
+			sql += " or " + poName + ".sourceId=0 )";
+		}
+		return sql;
+	}
 
 }
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js
===================================================================
diff -u -r13791 -r14464
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js	(.../godownEntrySummaryView.js)	(revision 13791)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/godownEntrySummaryView.js	(.../godownEntrySummaryView.js)	(revision 14464)
@@ -37,7 +37,7 @@
 
 var typeStore = new Ext.data.SimpleStore({
 	fields : ['type'],
-	data : [[godownTypeIn],[godownTypeOut]]
+	data : [['全部'],[godownTypeIn],[godownTypeOut]]
 });
 
 var goodsTypeStore = new Ext.data.JsonStore( {
@@ -365,7 +365,7 @@
 					displayField : 'type',
 					mode : 'local',
 					store : typeStore,
-					value : godownTypeIn,
+					value : '全部',
 					allowBlank : false,
 					typeAhead : true,
 					editable : false,
@@ -421,7 +421,7 @@
 				Ext.getCmp('suplierName').setValue("");
 				Ext.getCmp('goodsType').setValue('all');
 				Ext.getCmp('hasInvoice').setValue('全部');
-				Ext.getCmp('godownType').setValue(godownTypeIn);
+				Ext.getCmp('godownType').setValue('全部');
 				Ext.getCmp('disposableGoodsType').setValue('全部');
 			}
 		}]
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r14461 -r14464
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14461)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14464)
@@ -8043,6 +8043,13 @@
 		for(int index = 1; index <= ret.size();++index){
 			ret.get(index - 1).setIndex((long) index);
 		}
+		//如果是退库单,值是负的,取反
+		if(GodownEntry.TYPE_OUT.equals(type)){
+			for(GodownEntryItemVo item : ret){
+				item.setAmount(MathTools.sub(0, item.getAmount()).longValue());
+				item.setTotalPrice(MathTools.sub(0, item.getTotalPrice()).doubleValue());
+			}
+		}
 		return ret;
 		
 	}
@@ -8353,16 +8360,23 @@
 		if(item == null){
 			return;
 		}
-		addEntryItem(vos,item.getSupplierName(),item.getAmount(),item.getCost());
+		Long amount = item.getAmount();
+		if(StringTools.equals(GodownEntry.TYPE_OUT,item.getGodownEntry().getType())){
+			amount = MathTools.sub(0, item.getAmount()).longValue();
+		}
+		addEntryItem(vos,item.getSupplierName(),amount,item.getCost());
 	}
 	private void addEntryItem(List<GodownEntryItemVo> vos, MaterialEntryItem item) {
 		if(item == null){
 			return;
 		}
-		Integer amout = item.getAmount();
-		if(amout != null){
-			addEntryItem(vos,item.getSupplierName(),amout.longValue(),item.getCost());
+		Integer amount = item.getAmount();
+		if(StringTools.equals(MaterialEntry.TYPE_OUT,item.getMaterialEntry().getType())){
+			amount = MathTools.sub(0, item.getAmount()).intValue();
 		}
+		if(amount != null){
+			addEntryItem(vos,item.getSupplierName(),amount.longValue(),item.getCost());
+		}
 	}
 	@Override
 	public List<ReturnGoodsVo> getReturnGoodsSummarySource(String startDay, String endDay,String type,
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/GodownEntryItemVo.java
===================================================================
diff -u -r12640 -r14464
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/GodownEntryItemVo.java	(.../GodownEntryItemVo.java)	(revision 12640)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/GodownEntryItemVo.java	(.../GodownEntryItemVo.java)	(revision 14464)
@@ -1,5 +1,7 @@
 package com.forgon.disinfectsystem.jasperreports.javabeansource;
 
+import com.forgon.tools.MathTools;
+
 /**
  * 入库统计数据项
  * @author kzh
@@ -45,24 +47,16 @@
 		this.totalPrice = totalPrice;
 	}
 	
-	public boolean isValid(){
-		if(amount != null && amount > 0){
-			return true;
-		}
-		return false;
-	}
+//	public boolean isValid(){
+//		if(amount != null && amount > 0){
+//			return true;
+//		}
+//		return false;
+//	}
 	
 	public void addAmountAndTotalPrice(Long amount,Double perPrice){
-		Double addPrice = amount * perPrice;
-		if(this.amount == null){
-			this.amount = amount;
-		}else{
-			this.amount += amount;
-		}
-		if(this.totalPrice == null){
-			this.totalPrice = addPrice;
-		}else{
-			this.totalPrice += addPrice;
-		}
+		Double addPrice = MathTools.mul(amount, perPrice).doubleValue();
+		this.amount = MathTools.add(this.amount, amount).longValue();
+		this.totalPrice = MathTools.add(this.totalPrice, addPrice).doubleValue();
 	}
 }
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r14363 -r14464
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 14363)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 14464)
@@ -285,7 +285,7 @@
 	 * @param endTime 结束时间
 	 * @param suplier 供应商
 	 * @param 供应室仓库id
-	 * @param type 单类型，入库单或者是退库单
+	 * @param type 单类型，入库单或者是退库单或者全部
 	 * @param hasInvoice 是否有发货单
 	 * @param goodsType 物品类型
 	 * @param disposableGoodsType 一次性物品类型
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java
===================================================================
diff -u -r13791 -r14464
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java	(.../GodownEntryItemManager.java)	(revision 13791)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryItemManager.java	(.../GodownEntryItemManager.java)	(revision 14464)
@@ -17,7 +17,7 @@
 	 * @param supplier 供应商
 	 * @param orderField 排序字段
 	 * @param warehouseId 仓库id
-	 * @param type 单类型，入库单或者是退库单
+	 * @param type 单类型，入库单或者是退库单或者全部
 	 * @param hasInvoice 是否有发票
 	 * @param disposableGoodsType 一次性物品类型
 	 * @return