Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r23573 -r23611
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 23573)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 23611)
@@ -3227,11 +3227,58 @@
 			tousseWeight: tousseWeight,
 			remark: remark
 	}
-    DWREngine.setAsync(false);
-    // 调用服务端的装配器械包的代码
-    PackingTableManager.packingTousse2(JSON.stringify(params),function(rs){
-        if(rs != null){
-            var result = Ext4.decode(rs);
+//    DWREngine.setAsync(false);
+//    // 调用服务端的装配器械包的代码
+//    PackingTableManager.packingTousse2(JSON.stringify(params),function(rs){
+//        if(rs != null){
+//            var result = Ext4.decode(rs);
+//        	var showName = tousseName;
+//    		if (result.success){
+//    			processAfterPacking(printImmediately,result, showName, packAmount);
+//    		}
+//    		else{
+//    			//如果返回失败的结果类型为stockNotEnough(即库存不足,则进行提示)
+//    			if(result.type && (result.type == 'virtualBasketNotEnough')){
+//	    			// TODO: 需确认是否要判断物品是否为器械包
+//	    			Ext4.MessageBox.confirm("请确认", result.message,
+//            				function(btn) {
+//            					if (btn == 'yes') {
+//            						//输入一个true的参数
+//            						params.confirmContinue = 'true';
+//            						PackingTableManager.packingTousse2(JSON.stringify(params),function(rs1){
+//            					        if(rs1 != null){
+//            					            var result = Ext4.decode(rs1);
+//            					            
+//            					            if(result.success){
+//            					            	processAfterConfirmPacking(printImmediately,result, showName, packAmount);
+//            					            	printLabelsAfterConfirmPacking(result.tousses);
+//            					            }
+//            					            
+//            					        }
+//            					    });
+//            					}
+//                		});
+//    			}else{
+//    				var message = result.message;
+//    				if(!message){
+//    					message = '装配失败!';
+//    				}
+//    				showResult(message , null , sstsConfig.messagePauseTimeOnPackingPage);
+//    			}
+//    		}
+//        }
+//    });
+//    DWREngine.setAsync(true);
+    
+    // 改为不用dwr
+    Ext4.Ajax.request({
+		//async: !isFirstOnLoad,
+		async: false,
+		dataType:"json",
+		url: WWWROOT+"/disinfectSystem/packing/packingTousse.mhtml",
+		params : {packingParams : JSON.stringify(params)},
+		success: function(rs) {
+            var result = Ext4.decode(rs.responseText);
         	var showName = tousseName;
     		if (result.success){
     			processAfterPacking(printImmediately,result, showName, packAmount);
@@ -3245,17 +3292,24 @@
             					if (btn == 'yes') {
             						//输入一个true的参数
             						params.confirmContinue = 'true';
-            						PackingTableManager.packingTousse2(JSON.stringify(params),function(rs1){
-            					        if(rs1 != null){
-            					            var result = Ext4.decode(rs1);
-            					            
+            						Ext4.Ajax.request({
+            							//async: !isFirstOnLoad,
+            							async: false,
+            							dataType:"json",
+            							url: WWWROOT+"/disinfectSystem/packing/packingTousse.mhtml",
+            							params : {packingParams : JSON.stringify(params)},
+            							success: function(rs1) {
+            								var result = Ext4.decode(rs1.responseText);
+//            					            
             					            if(result.success){
             					            	processAfterConfirmPacking(printImmediately,result, showName, packAmount);
             					            	printLabelsAfterConfirmPacking(result.tousses);
             					            }
-            					            
-            					        }
-            					    });
+            							},
+            						    error : function(req, textStatus) {
+            						    	showResult('装配失败!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+            						    }
+            						});
             					}
                 		});
     			}else{
@@ -3266,9 +3320,12 @@
     				showResult(message , null , sstsConfig.messagePauseTimeOnPackingPage);
     			}
     		}
-        }
-    });
-    DWREngine.setAsync(true);
+        
+		},
+	    error : function(req, textStatus) {
+	    	showResult('装配失败!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+	    }
+	});
     return true;
 }
 
Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml
===================================================================
diff -u -r23608 -r23611
--- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml	(.../applicationContext-disinfectsystem-service.xml)	(revision 23608)
+++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml	(.../applicationContext-disinfectsystem-service.xml)	(revision 23611)
@@ -2888,6 +2888,6 @@
 	<bean id="zhledControllerManager" class="com.forgon.device.ZHLEDControllerManager"/>
 	<bean id="activityManager" class="com.forgon.system.activity.service.ActivityManager">
 	</bean>
-	<!--<bean id="activityAspect" class="com.forgon.system.activity.service.ActivityAspect">
-	</bean>-->
+	<bean id="activityAspect" class="com.forgon.system.activity.service.ActivityAspect">
+	</bean>
 </beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/systemmanage/system/activityView.js
===================================================================
diff -u -r23571 -r23611
--- ssts-web/src/main/webapp/systemmanage/system/activityView.js	(.../activityView.js)	(revision 23571)
+++ ssts-web/src/main/webapp/systemmanage/system/activityView.js	(.../activityView.js)	(revision 23611)
@@ -38,7 +38,7 @@
 	    store : new Ext.data.Store({
 	    	autoLoad: false,
 			proxy : new Ext.data.HttpProxy({
-				url : WWWROOT + '/system/activityAction!loadAllActivities.do',
+				url : WWWROOT + '/system/activity/loadAllActivities.mhtml',
 				method : 'POST'
 			}),
 			reader : new Ext.data.JsonReader({