Index: ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js
===================================================================
diff -u -r13422 -r13509
--- ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 13422)
+++ ssts-web/src/main/webapp/disinfectsystem/assestManagement/godownEntry/godownEntryView.js	(.../godownEntryView.js)	(revision 13509)
@@ -123,10 +123,13 @@
 		fields : ['hasType'],
 		data : [[HAS_TYPE_NO],[HAS_TYPE_YES]]
 	});
+
+//类别数据源
 var gradeStore = new Ext.data.SimpleStore({
 	data:[['一类'],['二类'],['三类']],
 	fields:['name']
 });
+
 var GodownEntryItemRecord = Ext.data.Record.create([
 	{name : 'localID'}, 
 	{name : 'id'}, 
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java
===================================================================
diff -u -r13369 -r13509
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 13369)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/dwr/table/GodownEntryTableManager.java	(.../GodownEntryTableManager.java)	(revision 13509)
@@ -416,6 +416,13 @@
 					jsonObject.put("grade", disposableGoods.getGrade());
 				}
 			}
+		}else{
+			//查一次性物品定义的类别
+			DisposableGoods disposableGoods = 
+					diposableGoodsManager.getDisposableGoodsById(disposableGoodsId);
+			if(disposableGoods != null && StringUtils.isNotBlank(disposableGoods.getGrade())){
+				jsonObject.put("grade", disposableGoods.getGrade());
+			}
 		}
 		return jsonObject.toString();
 	}
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r13503 -r13509
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13503)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13509)
@@ -7616,7 +7616,7 @@
 			inStorageSummarySql = "select po.externalCode, case when po.specification is null then po.name else po.name + '['+ po.specification +']' end name, sum(gei.amount) amount from DisposableGoods po "
 				+" left join GodownEntryItem gei on po.id=gei.disposableGoodsId"
 				+" and gei.godownEntry_id in "
-				+" (select id from GodownEntry f where f.type='"+GodownEntry.TYPE_IN+"' and f.subType in ('"+GodownEntry.SUBTYPE_MANUAL_IN+"','"+GodownEntry.SUBTYPE_SYNC_IN+"','"+GodownEntry.SUBTYPE_MOVE_IN+"') " + timeCondition
+				+" (select id from GodownEntry f where f.type='"+GodownEntry.TYPE_IN+"' and f.subType in ('"+GodownEntry.SUBTYPE_MANUAL_IN+"','"+GodownEntry.SUBTYPE_SYNC_IN+"','"+GodownEntry.SUBTYPE_IMPORT_IN+"') " + timeCondition
 				+" and warehouseID in (select id from WareHouse where orgUnitCode='" + orgUnitCoding + "')) where 1=1 " + goodsNameCondition + gradeCondition
 				+" group by po.externalCode, po.name,po.specification order by po.externalCode";
 			
@@ -7651,7 +7651,7 @@
 			//一次性物品信息入库数量-退库单
 			outStorageSummarySql = "select po.externalCode, case when po.specification is null then po.name else po.name + '['+ po.specification +']' end name, -1 * sum(gei.amount) amount from DisposableGoods po "
 				+" left join GodownEntryItem gei on po.id=gei.disposableGoodsId"
-				+" and gei.godownEntry_id in (select id from GodownEntry f where f.type='" + GodownEntry.TYPE_OUT + "' " + timeCondition
+				+" and gei.godownEntry_id in (select id from GodownEntry f where f.subtype='" + GodownEntry.SUBTYPE_MANUAL_OUT + "' " + timeCondition
 				+" and warehouseID in (select id from WareHouse where orgUnitCode='" + orgUnitCoding + "')) where 1=1 " + goodsNameCondition + gradeCondition
 				+" group by po.externalCode, po.name,po.specification order by po.externalCode";
 			
@@ -7697,7 +7697,7 @@
 			inStorageSummarySql = "select po.externalCode, case when po.specification is null then po.name else po.name || '['|| po.specification ||']' end name, sum(gei.amount) amount from DisposableGoods po "
 				+" left join GodownEntryItem gei on po.id=gei.disposableGoodsId"
 				+" and gei.godownEntry_id in "
-				+" (select id from GodownEntry f where f.type='"+GodownEntry.TYPE_IN+"' and f.subType in ('"+GodownEntry.SUBTYPE_MANUAL_IN+"','"+GodownEntry.SUBTYPE_SYNC_IN+"','"+GodownEntry.SUBTYPE_MOVE_IN+"') " + timeCondition
+				+" (select id from GodownEntry f where f.type='"+GodownEntry.TYPE_IN+"' and f.subType in ('"+GodownEntry.SUBTYPE_MANUAL_IN+"','"+GodownEntry.SUBTYPE_SYNC_IN+"','"+GodownEntry.SUBTYPE_IMPORT_IN+"') " + timeCondition
 				+" and warehouseID in (select id from WareHouse where orgUnitCode='" + orgUnitCoding + "')) where 1=1 " + goodsNameCondition + gradeCondition
 				+" group by po.externalCode, po.name,po.specification order by po.externalCode";
 			
@@ -7732,7 +7732,7 @@
 			//一次性物品信息入库数量-退库单
 			outStorageSummarySql = "select po.externalCode, case when po.specification is null then po.name else po.name || '['|| po.specification ||']' end name, -1 * sum(gei.amount) amount from DisposableGoods po "
 				+" left join GodownEntryItem gei on po.id=gei.disposableGoodsId"
-				+" and gei.godownEntry_id in (select id from GodownEntry f where f.type='" + GodownEntry.TYPE_OUT + "' " + timeCondition
+				+" and gei.godownEntry_id in (select id from GodownEntry f where f.subtype='" + GodownEntry.SUBTYPE_MANUAL_OUT + "' " + timeCondition
 				+" and warehouseID in (select id from WareHouse where orgUnitCode='" + orgUnitCoding + "')) where 1=1 " + goodsNameCondition + gradeCondition
 				+" group by po.externalCode, po.name,po.specification order by po.externalCode";
 			
@@ -7797,12 +7797,12 @@
 				long returnAmount = returnSummaryMap.get("amount") == null ? 0 : ((Number)returnSummaryMap.get("amount")).longValue();
 				long outTotalAmount = invoiceAmount + receiveAmount + returnAmount;
 				
-				if(goodsPlanAmount != 0 && inTotalAmount != 0 && outTotalAmount != 0){
+				/*logger.debug("##########externalCode=" + goodsPlanSummaryMap.get("externalCode") + ",goodsPlanAmount=" +goodsPlanAmount+ 
+						",inTotalAmount=" +inTotalAmount+ ",outTotalAmount=" +outTotalAmount);*/
+				if(goodsPlanAmount != 0 || inTotalAmount != 0 || outTotalAmount != 0){
 					GoodsAmountSummaryByGrade vo = new GoodsAmountSummaryByGrade();
 					vo.setExternalCode((String)goodsPlanSummaryMap.get("externalCode"));
 					vo.setName((String)goodsPlanSummaryMap.get("name"));
-					/*logger.debug("##########externalCode=" + vo.getExternalCode() + ",goodsPlanAmount=" +goodsPlanAmount+ 
-							",inTotalAmount=" +inTotalAmount+ ",outTotalAmount=" +outTotalAmount);*/
 					vo.setGoodsPurchaseAmount(goodsPlanAmount);
 					vo.setInStorageAmount(inTotalAmount);
 					vo.setOutStorageAmount(outTotalAmount);