Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js
===================================================================
diff -u -r18209 -r18231
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 18209)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js	(.../goodsTemplateApplicationView.js)	(revision 18231)
@@ -139,14 +139,28 @@
 			if (obj.count <= 0 && !isUndefinedOrNullOrEmpty(behavior) && !isUndefinedOrNullOrEmpty(me.data.children)){
 					obj.count = setOldCount(me.data.children,children[i]);
 			}
-			if(obj.count <= 0){
+
+			//因为非整包清洗下允许材料数量为0,所以这里如果不是整包清洗的计算数量为0也允许添加
+			if(obj.count <= 0 && parentNode.data.isApplyEntireTousse === '是'){
 				nullAmount++;
 			}
 			else{
 				arr.push(obj);
 			}
 		
     	}
+        //如果不是整包申请的情况下，将所以数量为空的都设置成0
+        if (parentNode.data.isApplyEntireTousse === '否'){
+    		var counter = 0;
+            for (var i = 0; i < arr.length; i++){
+            	if (top.Ext4.isEmpty(arr[i].count)){
+                    arr[i].count = 0;
+                    counter++;
+	            }
+            }
+            //如果设置为0的数量等于这个数组的长度,则表示这个消毒物品下的所有材料的都是0,所以这个消毒物品不能添加
+            arr = counter === arr.length ? [] : arr;
+        }
 		if(arr.length > 0 && nullAmount < children.length){
 			parentNode.set("materials", Ext4.JSON.encode(arr));
 		}else{
@@ -1771,6 +1785,10 @@
 		dataIndex : 'name',
 		// flex : 1,
         width : 310,
+        renderer:function (value, metaData, record, rowIdx, colIdx, store){
+            metaData.tdAttr = 'data-qtip="' + value + '"';
+            return value;
+        },
 		sortable: false
 	},{
 		header : "最小单位数量",
@@ -2095,7 +2113,6 @@
 			}
 		});
 		result = result.concat(newData);
-		// console.info(result);
 		return result;
 	}
 
@@ -2657,9 +2674,9 @@
 						store : rightTemplateStore,
                         listeners : {
                             itemmouseenter: function (_this, record, item,  index,  e,  eOpts) {
-                                var tousseDefinitionID = record.get('tousseDefinitionID');
-                                var tousseType = record.get('tousseType');
-                                popGoodTips(tousseDefinitionID + tousseType, item, record);
+                                // var tousseDefinitionID = record.get('tousseDefinitionID');
+                                // var tousseType = record.get('tousseType');
+                                // popGoodTips(tousseDefinitionID + tousseType, item, record);
                             }
                         },
 						tbar : [{
@@ -3859,6 +3876,9 @@
             //将生成的html用对应的id缓存到页面,减少请求服务器次数
             tipManager[cacheId] = tipTable;
         }
+         // target.parentNode.parentNode.setAttribute('data-qtip', tipTable);
+         // target.parentNode.parentNode.setAttribute('data-qwidth', 450);
+         // target.parentNode.parentNode.setAttribute('data-qtitle', title);
     });
 }
 
@@ -3882,6 +3902,7 @@
 	    dismissDelay: 0,
 	    showDelay: 0
 	});
+    top.Ext4.tip.QuickTipManager.init();
 	
 	// Ext.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
 	// Ext4.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
@@ -4277,17 +4298,16 @@
 					tableContent += "</tr>" + content + "</table></br>";
 					record.set("htmlContent",tableContent);
 				}
-//			var maxWidth = grid.getInnerWidth();
-				var maxHeight = grid.getInnerHeight();
-				var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象
+                e.getTarget().setAttribute('data-qtip', tableContent);
+                e.getTarget().setAttribute('data-qwidth', 450);
+                e.getTarget().setAttribute('data-qtitle', '&nbsp<font size=10>申请物品列表:</font>');
+				// var maxWidth = grid.getInnerWidth();
+// 				var maxHeight = grid.getInnerHeight();
+// 				var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象
 				//var align = e.xy[1] > maxHeight / 2 ? 'bl-tr' : 'tl-tr';
-				rowEl.set({
-					'data-qtip' : tableContent,'data-qwidth':450,'data-qtitle':'&nbsp<font size=10>申请物品列表:</font>'},false);
-//
+				// rowEl.set({'data-qtip' : tableContent,'data-qwidth':450,'data-qtitle':'&nbsp<font size=10>申请物品列表:</font>'},false);
 				/*grid.tip.show();
 				 grid.tip.body.dom.innerHTML = tableContent;*/
-			}else{
-
 			}
 		});
 
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r18209 -r18231
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 18209)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 18231)
@@ -1103,8 +1103,7 @@
 			String tousseType = obj.optString("tousseType");
 			String name = obj.optString("name");
 			
-			TousseItem tousseItem = applicationItemMap
-					.get(name);
+			TousseItem tousseItem = applicationItemMap.get(name);
 			if (tousseItem != null) {
 
 				String amountStr = tousseItem.getAmount().toString();
@@ -1118,7 +1117,11 @@
 
 				JSONArray materialsArray = new JSONArray();
 				if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)){
-					TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName(name);
+					// 这里改成用tousseItem的tousseDefinitionId去找TousseDefinition,如果用名字去找的话，他会去找到祖先的TousseDefinition,
+					// 当这个物品是非整包清洗的情况,找出来的材料数量就是模板的数量,这样就会覆盖掉申请单上的数量
+					Long tousseDefinitionId = tousseItem.getTousseDefinitionId();
+					TousseDefinition td = tousseDefinitionManager.getTousseDefinitionById(tousseDefinitionId);
+					// TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName(name);
 					materialsArray = tousseDefinitionManager.getMaterialsOfDisinfectionGoods(td, true);
 					String materialsString = materialsArray.toString();