Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r15993 -r16114
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 15993)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 16114)
@@ -10,6 +10,8 @@
 import java.io.UnsupportedEncodingException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -27,6 +29,7 @@
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.util.PageUtil;
 import com.google.gson.reflect.TypeToken;
+
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
@@ -1361,6 +1364,46 @@
 		}
 		return null;
 	}
+	
+	@SuppressWarnings("unchecked")
+	public void loadForeignTousseIncludeMaterials(){
+		String tousseId = StrutsParamUtils.getPraramValue("id", "");
+		JSONArray materials = new JSONArray();
+		if(StringUtils.isNotBlank(tousseId)){
+			TousseDefinition foreignTousse = tousseDefinitionManager.getTousseDefinitionById(tousseId);
+			if(foreignTousse != null && foreignTousse.getMaterialInstances() != null){
+				for (MaterialInstance materialInstance : foreignTousse.getMaterialInstances()) {
+					JSONObject obj = new JSONObject();
+					obj.put("id", materialInstance.getId());
+					String materialName = materialInstance.getMaterialName();
+					MaterialDefinition materialDefinition = materialInstance.getMaterialDefinition();
+					String washClassifyType = "";
+					if(materialDefinition != null){
+						washClassifyType = materialDefinition.getWashClassifyType();
+						 materialName = CssdUtils.getMaterialName(materialDefinition);
+					}
+					obj.put("materialName",materialName);
+					obj.put("amount", materialInstance.getCount());
+					obj.put("includeImplant",CssdUtils.getMaterialIsImplant(materialInstance));
+					obj.put("minDismantleAmount",
+							materialInstance.getMinDismantleAmount());
+					obj.put("washClassifyType", washClassifyType);
+					materials.add(obj);
+				}
+			}
+		}
+		Collections.sort(materials, new Comparator<JSONObject>() {
+			@Override
+			public int compare(JSONObject m1, JSONObject m2) {
+				return m1.optString("washClassifyType").compareTo(
+						m2.optString("washClassifyType"));
+			}
+		});
+		JSONObject obj = new JSONObject();
+		obj.put("success", true);
+		obj.put("data", materials);
+		StrutsResponseUtils.output(obj);
+	}
 
 	/**
 	 * 根据拼音简拼,五笔码获取器械包(内部器械包和自定义器械包)、一次性物品NAME和ID
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r15993 -r16114
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 15993)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 16114)
@@ -16,7 +16,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.beust.jcommander.ParameterException;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
@@ -26,6 +25,7 @@
 import org.hibernate.Query;
 import org.hibernate.Session;
 
+import com.beust.jcommander.ParameterException;
 import com.forgon.Constants;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
@@ -62,7 +62,6 @@
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
-import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.SqlUtils;
@@ -740,7 +739,7 @@
 		params.showDisableGoods = showDisableGoods;
 		return searchTousseDefinition(params);
 	}
-
+	
 	@SuppressWarnings("unchecked")
 	public JSONObject searchTousseDefinition(SearchTousseDefinitionParams params) {
 		String searchString = params.searchString;
@@ -791,39 +790,6 @@
 			temp.put("isThereIdentificationCard", isThereIdCard);
 			temp.put("suppler", tousseDefinition.getSupplierName());
 			temp.put("includeImplant", tousseDefinition.getIncludeImplant());
-			if (tousseDefinition.isForeignTousse()) {
-				List<MaterialInstance> materialInstances = tousseDefinition
-						.getMaterialInstances();
-				if (materialInstances != null) {
-					JSONArray materilas = new JSONArray();
-					for (MaterialInstance materialInstance : materialInstances) {
-						JSONObject obj = new JSONObject();
-						obj.put("id", materialInstance.getId());
-						String materialName = materialInstance.getMaterialName();
-						MaterialDefinition materialDefinition = materialInstance.getMaterialDefinition();
-						String washClassifyType = "";
-						if(materialDefinition != null){
-							washClassifyType = materialDefinition.getWashClassifyType();
-							 materialName = CssdUtils.getMaterialName(materialDefinition);
-						}
-						obj.put("materialName",materialName);
-						obj.put("amount", materialInstance.getCount());
-						obj.put("includeImplant",CssdUtils.getMaterialIsImplant(materialInstance));
-						obj.put("minDismantleAmount",
-								materialInstance.getMinDismantleAmount());
-						obj.put("washClassifyType", washClassifyType);
-						materilas.add(obj);
-					}
-					Collections.sort(materilas, new Comparator<JSONObject>() {
-						@Override
-						public int compare(JSONObject m1, JSONObject m2) {
-							return m1.optString("washClassifyType").compareTo(
-									m2.optString("washClassifyType"));
-						}
-					});
-					temp.put("materials", materilas);
-				}
-			}
 			mapList.add(temp);
 		}
 		Map<String, Object> map = new HashMap<String, Object>();
Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js
===================================================================
diff -u -r15971 -r16114
--- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 15971)
+++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js	(.../foreignTousseInfoForm.js)	(revision 16114)
@@ -621,23 +621,35 @@
 				var index = foreignTousseJsonStore.findExact("id",tousseDefinitionId);
 				var materials = [];
 				if(index != -1){
-					var materialsJson = foreignTousseJsonStore.getAt(index).get("materials");
-					if(materialsJson != undefined && materialsJson != ""){
-						for(var i = 0;i < materialsJson.length;i++){
-							materials.push({
-								id : materialsJson[i].id,
-								tousseName : materialsJson[i].materialName,
-								includeImplant : materialsJson[i].includeImplant,
-								amount : materialsJson[i].amount,
-								usedAmountOfIncludeImplant : 0,
-								implantAmountOfUseRecord  : 0,
-								minDismantleAmount : materialsJson[i].minDismantleAmount,
-								washClassifyType:materialsJson[i].washClassifyType,
-								type : 'material',
-								leaf : true
-							});
+					Ext4.Ajax.request({
+						url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!loadForeignTousseIncludeMaterials.do',
+						params : {id : tousseDefinitionId},
+						async : false,
+						success : function(response, options) {
+							var result = Ext4.JSON.decode(response.responseText);
+							if(result.success){
+								var materialsJson = result.data;
+								for(var i = 0;i < materialsJson.length;i++){
+									materials.push({
+										id : materialsJson[i].id,
+										tousseName : materialsJson[i].materialName,
+										includeImplant : materialsJson[i].includeImplant,
+										amount : materialsJson[i].amount,
+										usedAmountOfIncludeImplant : 0,
+										implantAmountOfUseRecord  : 0,
+										minDismantleAmount : materialsJson[i].minDismantleAmount,
+										washClassifyType:materialsJson[i].washClassifyType,
+										type : 'material',
+										leaf : true
+									});
+								}
+								
+							}
+						},
+						failure : function(response, opts) {
+							showResult(response.responseText);
 						}
-					}
+					});
 				}
 				var item = getExsistForeignTousseItem(foreignTousseStore,foreignTousseName,suppler);
 				if(item == null){
Index: ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js
===================================================================
diff -u -r16076 -r16114
--- ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 16076)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/printRecyclingDetailWin.js	(.../printRecyclingDetailWin.js)	(revision 16114)
@@ -355,8 +355,10 @@
 			}
 			htmlTable += "</tr>";
 		}
+	}else{
+		return "";
 	}
-	//默认填充空行
+	/*//默认填充空行
 	if(defaultRow > result.length){
 		for(var i = 0 ; i < (defaultRow - result.length) ; i++){
 			htmlTable += "<tr style='height: 7mm;'>";
@@ -366,7 +368,7 @@
 			}
 			htmlTable += "</tr>";
 		}
-	}
+	}*/
 	
 	//合计
 	if(titleConfig.length > 0){
@@ -389,9 +391,12 @@
 function buildDepartTable(data,model){
 	var html ="<table border ='1' cellspacing=0 cellpadding=0 style='border-collapse:collapse' bordercolor='#000000'>";
 	    html += "<tr>";
-		html += "<td style='width: 15mm;height: 139mm;font-size:30px;' align='center'>" + model + "</td>";
-		html += "<td style='width: 195mm;height: 139mm;' valign='top'>";
+		html += "<td style='width: 15mm;font-size:30px;' align='center'>" + model + "</td>";
+		html += "<td style='width: 195mm;' valign='top'>";
 		var result = data[model];
+		if(result.length <= 0){
+			return "";
+		}
 		for(var i = 0 ; i < result.length ; i++){
 			html += ("<strong>" + result[i].showDepart + "：</strong>");
 			for(var j = 0 ; j < result[i].items.length ; j++){
@@ -400,7 +405,7 @@
 			}
 			html += "<br>";
 			html += "--------------------------------------------------------------------------------------------";
-			html += "-----------------------------------------";
+			html += "--------------------";
 			html += "<br>";
 		}
 		html += "</td>"; 
@@ -418,6 +423,9 @@
 	LODOP.ADD_PRINT_TEXT(35,200,"100%",5,"开始时间：" + startDateTime);
 	LODOP.ADD_PRINT_TEXT(35,450,"100%",5,"结束时间： " + endDateTime);
 	
+//	LODOP.SET_PRINT_STYLE("ItemType", 2);
+//	LODOP.ADD_PRINT_TEXT(10,600,"95%",5,"第#页/共&页");
+	
 	var htmlTable ="<table border ='0' style='width: 200mm'>";
 	//普通器械
 	htmlTable += "<tr><td>";