Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js
===================================================================
diff -u -r13248 -r13299
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js	(.../stocktakeView.js)	(revision 13248)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/stocktakeView.js	(.../stocktakeView.js)	(revision 13299)
@@ -6,11 +6,6 @@
 		
 		var type = Ext.getCmp('type').getValue();
 		
-		myMask = new Ext.LoadMask(Ext.getBody(), {
-			msg: '正在加载，请稍候！',
-			removeMask: true
-		});
-		myMask.show();
 		var summaryType = Ext.getCmp('summaryType').getValue();
 		
 		var reportName = "stocktakereport.jasper";
@@ -31,12 +26,17 @@
 			showResult("期初库存、期末库存不能为空！");
 			return false;
 		}
+		myMask = new Ext.LoadMask(Ext.getBody(), {
+			msg: '正在加载，请稍候！',
+			removeMask: true
+		});
+		myMask.show();
 		window.open(WWWROOT+"/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+reportName+"&reportName=stocktakereport&startId="+startId+"&endId="+endId+"&warehouseName="+warehouseName+"&summaryType=" + summaryType + "&type=" + type,'thisIframe','_self');
 	}
 	
 	var diposableGoodsTypeStore = new Ext.data.SimpleStore({
-		fields : [ 'typeName' ],
-		url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsType.do'
+		fields : [ 'typeName','typeValue' ],
+		url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsTypeIncludeAllOption.do'
 	});
 	
 	var summaryTypeStore = new Ext.data.SimpleStore( {
@@ -170,19 +170,21 @@
 					anchor : '95%'
 				}]
 			},{
-				width : 180,
+				width : 210,
 				layout : 'form',
-				labelWidth : 60,
+				labelWidth : 100,
 				items:[{
 					xtype : 'combo',
-					fieldLabel : '材料类型',
+					fieldLabel : '一次性物品类型',
 					id : 'type',
 					name : 'type',
 					minChars : 0,
-					valueField : 'typeName',
+					valueField : 'typeValue',
 					displayField : 'typeName',
 					store : diposableGoodsTypeStore,
 					forceSelection : true,
+					selectOnFocus :true,
+					editable:false,
 					lazyInit : false,
 					triggerAction : 'all',
 					hideTrigger : false,
@@ -191,7 +193,7 @@
 					anchor : '95%'
 				}]
 			},{
-				width : 180,
+				width : 150,
 				layout : 'form',
 				labelWidth : 60,
 				items:[{
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r13298 -r13299
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13298)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13299)
@@ -4230,8 +4230,11 @@
 					+ nameFilterSql
 					+ " group by i.settleaccountsdepart,d.name,d.batch) ";
 		}
-		// 材料发货
-		String materialInvoiceSql = " union all (select i.settleAccountsDepart,ii.materialName,sum(ii.amount),sum(ii.settlementPrice),'材料' as type,'' "
+		
+		String materialInvoiceSql = " ";
+		if(StringUtils.isBlank(typeSearch) || "器械材料".equals(typeSearch)){
+			// 材料发货
+			materialInvoiceSql = " union all (select i.settleAccountsDepart,ii.materialName,sum(ii.amount),sum(ii.settlementPrice),'材料' as type,'' "
 				   	+ " from MaterialInvoice i,"
 				   	+ "MaterialInvoiceItem ii where i.id = ii.materialInvoice_id " 
 				   	+ " and i.orgUnitCoding = '"+handleDeptCode+"'  "
@@ -4240,6 +4243,7 @@
 				   	+ materialNameFilterSql
 				   	+ materialTypeFilterSql
 					+ " group by i.settleaccountsdepart,ii.materialName) ";
+		}
 		// 材料退货
 		String materialReturnSql = " union all (select rr.depart as settleaccountsdepart,ii.materialName,-sum(ii.amount),-sum(ii.settlementPrice),'材料' as type,'' "
 			   	+ " from ReturnMaterialRecord rr,"
@@ -4251,6 +4255,7 @@
 			   	+ materialTypeFilterSql
 				+ " group by rr.depart,ii.materialName) ";
 		
+		//退货
 		String returnGoodsSql = " union all (select rr.depart as settleaccountsdepart,ri.toussename as name,"
 					+ "-sum(ri.amount) as amount,-sum(ri.settlementPrice) as settlementprice,rr.type as type"
 					+ ",ri.batchNumber from returngoodsrecord rr,returngoodsitem ri where rr.id = ri.returngoodsrecord_id and rr.handleDepartCode = '"+handleDeptCode+"' "
@@ -7903,9 +7908,6 @@
 					 for (StockIdentificationOfGoods stockIdentification : stockDiposableGoodBatch.getStockIdentifications()) {
 						 double tempPrice = MathTools.mul(stockIdentification.getAmount(), stockIdentification.getPrice()).doubleValue();
 						 startPrice = MathTools.add(startPrice, tempPrice).doubleValue();
-						 if("810026".equals(vo.getExternalCode())){
-								System.out.println(stockIdentification);
-							}
 					}
 				}
 				
Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java
===================================================================
diff -u -r13089 -r13299
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 13089)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/action/DiposableGoodsAction.java	(.../DiposableGoodsAction.java)	(revision 13299)
@@ -369,6 +369,34 @@
 		return null;
 	}
 
+	/**
+	 * 取得所有的一次性物品类型,包括全部选项
+	 */
+	public void getDiposableGoodsTypeIncludeAllOption() {
+		List<String> list = httpOptionManager
+				.getHttpOptionTextById(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE);
+		String str = "['全部',''],";
+		if (list != null && list.size() > 0) {
+			for (int i = 0; i < list.size(); i++) {
+				str = str + "[ '" + list.get(i) + "','" + list.get(i) + "'],";
+
+			}
+		}
+		StringBuffer buff = new StringBuffer();
+		if (str.length() > 0) {
+			buff.append("[");
+			buff.append(str.substring(0, str.length() - 1));
+			buff.append("]");
+		}
+		HttpServletResponse response = StrutsParamUtils.getResponse();
+		try {
+			response.setCharacterEncoding("utf-8");
+			response.getWriter().print(buff.toString());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+	
 	public void getDiposableGoodsType() {
 		List<String> list = httpOptionManager
 				.getHttpOptionTextById(HttpOption.SYSTEMSETTING_DIPOSABLEGOODS_TYPE);
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r13121 -r13299
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 13121)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 13299)
@@ -65,7 +65,7 @@
 	
 	var tousseTypeStore = new Ext.data.SimpleStore( {
 		fields : ['value'],
-		data : [ ['全部'],['全部器械包'],['器械包'],['消毒物品'],['外来器械包'],['自定义器械包'],['外部代理灭菌包'],['一次性物品'] ]
+		data : [ ['全部'],['全部器械包'],['器械包'],['消毒物品'],['外来器械包'],['自定义器械包'],['外部代理灭菌包'],['一次性物品'],['器械材料'] ]
 	});
 	
 	var searchTypeStore = new Ext.data.SimpleStore( {
@@ -241,7 +241,20 @@
 					editable : false,
 					mode : 'local',
 					triggerAction : 'all',
-					anchor : '95%'
+					anchor : '95%',
+					listeners : {
+						select : function(store,records){
+							if(Ext.getCmp('disposableGoodsType')){
+								if(Ext.getCmp('tousseType').getValue() == '全部' 
+									|| Ext.getCmp('tousseType').getValue() == '一次性物品'){
+									Ext.getCmp('disposableGoodsType').setDisabled(false);
+								}else{
+									Ext.getCmp('disposableGoodsType').setValue('全部');
+									Ext.getCmp('disposableGoodsType').setDisabled(true);
+								}
+							}
+						}
+					}
 				}]
 			}, {
 				columnWidth : .2,