Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
===================================================================
diff -u -r15259 -r15952
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java	(.../ForeignProxyDisinfectionTableManager.java)	(revision 15259)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java	(.../ForeignProxyDisinfectionTableManager.java)	(revision 15952)
@@ -6,6 +6,7 @@
 
 import com.forgon.results.handler.LendGoodsBriefHandler;
 import com.forgon.results.handler.ResultBackHandler;
+
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
@@ -22,6 +23,7 @@
 import com.forgon.disinfectsystem.entity.sterilizationmanager.foreignproxydisinfection.ForeignProxyItem;
 import com.forgon.disinfectsystem.sterilizationmanager.foreignproxydisinfection.service.ForeignProxyDisinfectionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
+import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
 
@@ -218,4 +220,19 @@
 		}
 		return json.toString();
 	}
+	
+	// 合并打印
+	public String mergeLoadToussePrintData(String idsStr) {
+		try {
+			String[] idStrs = StringUtils.split(idsStr, ',');
+			
+			JSONObject jsonObject = new JSONObject();
+			foreignProxyDisinfectionManager.loadToussePrintData(idStrs, jsonObject);
+			jsonObject.put("success", true);
+			return jsonObject.toString();
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return null;
+	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/printForeignProxyDisinfectionApplication.js
===================================================================
diff -u -r15855 -r15952
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/printForeignProxyDisinfectionApplication.js	(.../printForeignProxyDisinfectionApplication.js)	(revision 15855)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/printForeignProxyDisinfectionApplication.js	(.../printForeignProxyDisinfectionApplication.js)	(revision 15952)
@@ -10,36 +10,60 @@
 	      progress:true,
 	      closable:false
 	  });
-	  Ext.Ajax.timeout=300*000;
-	  Ext.Ajax.request({
-		  timeout: 300*000,
-	      url : WWWROOT + '/disinfectSystem/foreignProxyDisinfectionAction!mergeLoadToussePrintData.do',
-	      params : {ids : ids},
-	      success : function(response){
-	    	  var result = Ext.decode(response.responseText);
-	    	  	result.depart = depart;
-	    	  	result.departBarcode = departBarcode;
-	    		result.printUser = curUserName;
-	    		result.currentOrgUnitName = currentOrgUnitName;
-	    		result.printTime = Ext.util.Format.date(new Date(), 'Y-m-d H:i');
-	    		// 发料人默认改为当前用户
-	    		if (isUndefinedOrNullOrEmpty(result.sender)) {
-	    			result.sender = curUserName;
-	    		}
-	    		printForeignProxyDisinfectionApplications(result, printType);
-	    	  
-	    	  if (printType == 0){
-//	    		  updatePrintStatus(ids);
-	    	  }
-	    	  
-	          hideMessageBox(true);
-	          grid.dwrReload();
-	      },
-	      failure: function(response){
-	          showResult("打印失败！");
-	          hideMessageBox(true);
-	      }
-	  });
+//	  Ext.Ajax.timeout=300*000;
+//	  Ext.Ajax.request({
+//		  timeout: 300*000,
+//	      url : WWWROOT + '/disinfectSystem/foreignProxyDisinfectionAction!mergeLoadToussePrintData.do',
+//	      params : {ids : ids},
+//	      success : function(response){
+//	    	  var result = Ext.decode(response.responseText);
+//	    	  	result.depart = depart;
+//	    	  	result.departBarcode = departBarcode;
+//	    		result.printUser = curUserName;
+//	    		result.currentOrgUnitName = currentOrgUnitName;
+//	    		result.printTime = Ext.util.Format.date(new Date(), 'Y-m-d H:i');
+//	    		// 发料人默认改为当前用户
+//	    		if (isUndefinedOrNullOrEmpty(result.sender)) {
+//	    			result.sender = curUserName;
+//	    		}
+//	    		printForeignProxyDisinfectionApplications(result, printType);
+//	    	  
+//	    	  if (printType == 0){
+////	    		  updatePrintStatus(ids);
+//	    	  }
+//	    	  
+//	          hideMessageBox(true);
+//	          grid.dwrReload();
+//	      },
+//	      failure: function(response){
+//	          showResult("打印失败！");
+//	          hideMessageBox(true);
+//	      }
+//	  });
+	  // dwr 方式
+	  DWREngine.setAsync(false);
+	  ForeignProxyDisinfectionTableManager.mergeLoadToussePrintData(ids,
+			function(resultStr) {
+				if (resultStr != null) {
+			    	  var result = Ext.decode(resultStr);
+			    	  	result.depart = depart;
+			    	  	result.departBarcode = departBarcode;
+			    		result.printUser = curUserName;
+			    		result.currentOrgUnitName = currentOrgUnitName;
+			    		result.printTime = Ext.util.Format.date(new Date(), 'Y-m-d H:i');
+			    		// 发料人默认改为当前用户
+			    		if (isUndefinedOrNullOrEmpty(result.sender)) {
+			    			result.sender = curUserName;
+			    		}
+			    		printForeignProxyDisinfectionApplications(result, printType);
+			    	  
+			    	  if (printType == 0){
+//			    		  updatePrintStatus(ids);
+			    	  }
+				}
+			});
+	  DWREngine.setAsync(true);
+	  hideMessageBox(true);
 }
 
 function printForeignProxyDisinfectionApplications(foreignProxyDisinfectionApplicationsInfo, printType) {
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r15924 -r15952
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 15924)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 15952)
@@ -286,6 +286,7 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/RecyclingApplicationTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/PrintConfigTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/ForeignTousseApplicationTableManager.js"></script>
+<script type="text/javascript" src="${ctx}/dwr/interface/ForeignProxyDisinfectionTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/InvoicePlanTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/InvoiceTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/FormPrintTemplateTableManager.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r15941 -r15952
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 15941)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 15952)
@@ -215,6 +215,7 @@
 							batchPrintForeignProxyDisinfectionApplications(departToAppIdsMap[depart],depart ,0);
 						}
 					}
+					grid.dwrReload();
 				}
 			});
 }
@@ -1427,7 +1428,7 @@
 	    					if (btn == 'yes') {
 	    						var depart = top.Ext.getCmp("depart").getValue();
 	    						batchPrintForeignProxyDisinfectionApplications(id,depart ,0);
-//	    						grid.dwrReload();
+	    						grid.dwrReload();
 	    					}
 	    				});
 			}