Index: forgon-core/src/main/java/com/forgon/system/activity/controller/ActivityController.java
===================================================================
diff -u -r39460 -r40049
--- forgon-core/src/main/java/com/forgon/system/activity/controller/ActivityController.java	(.../ActivityController.java)	(revision 39460)
+++ forgon-core/src/main/java/com/forgon/system/activity/controller/ActivityController.java	(.../ActivityController.java)	(revision 40049)
@@ -12,6 +12,7 @@
 
 import net.sf.json.JSONArray;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 
@@ -26,6 +27,8 @@
 @Controller
 @RequestMapping("/system/activity")
 public class ActivityController {
+
+	@Autowired
 	private ActivityManager activityManager;
 
 	public void setActivityManager(ActivityManager activityManager) {
Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java
===================================================================
diff -u -r39460 -r40049
--- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java	(.../ExpensiveGoodsTableManager.java)	(revision 39460)
+++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsTableManager.java	(.../ExpensiveGoodsTableManager.java)	(revision 40049)
@@ -6,7 +6,6 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Collection;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.HashMap;
@@ -18,20 +17,16 @@
 
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.Transformer;
 import org.apache.commons.lang.StringUtils;
 import org.directwebremoting.util.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.alibaba.fastjson.JSONArray;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.forgon.Constants;
 import com.forgon.component.grid.GridManager;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
-import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
-import com.forgon.directory.vo.LoginUserData;
-import com.forgon.disinfectsystem.basedatamanager.supplier.service.ExpensiveGoodsSupplierManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
@@ -42,13 +37,8 @@
 import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsStock;
 import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.datasynchronization.HisMaterialType;
-import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.ExpensiveGoodsSupplier;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.RegistrationCertification;
-import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
-import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
-import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
-import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
@@ -67,20 +57,28 @@
 @Service
 public class ExpensiveGoodsTableManager {
 
+	@Autowired
 	private GridManager gridManager;
 
+	@Autowired
 	private ExpensiveGoodsManager expensiveGoodsManager;
 
+	@Autowired
 	private DateQueryAdapter dateQueryAdapter;
-	
+
+	@Autowired
 	private WareHouseManager wareHouseManager;
 
+	@Autowired
 	private ObjectDao objectDao;
-	
+
+	@Autowired
 	private SupplyRoomConfigManager supplyRoomConfigManager;
-	
+
+	@Autowired
 	private BarcodeManager barcodeManager;
-	
+
+	@Autowired
 	private ExpensiveGoodsInstanceManager expensiveGoodsInstanceManager;
 	
 	public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) {