Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java
===================================================================
diff -u -r14602 -r21818
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java	(.../ReturnMaterialRecordManagerImpl.java)	(revision 14602)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/service/ReturnMaterialRecordManagerImpl.java	(.../ReturnMaterialRecordManagerImpl.java)	(revision 21818)
@@ -13,10 +13,6 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.Predicate;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-
-import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager;
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
@@ -29,7 +25,6 @@
 import com.forgon.disinfectsystem.returngoodsrecord.service.ReturnGoodsItemVO;
 import com.forgon.disinfectsystem.returnmaterialrecord.model.MaterialItemData;
 import com.forgon.tools.MathTools;
-import com.forgon.tools.SqlBuilder;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.db.InitDbConnection;
 import com.forgon.tools.hibernate.ObjectDao;
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java
===================================================================
diff -u -r13297 -r21818
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java	(.../MonthGoodsDetailSummaryService.java)	(revision 13297)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/MonthGoodsDetailSummaryService.java	(.../MonthGoodsDetailSummaryService.java)	(revision 21818)
@@ -10,8 +10,6 @@
 
 import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntry;
 import com.forgon.disinfectsystem.entity.stocktakerecordmanager.MonthGoodsDetailVo;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsItemVo;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsVo;
 import com.forgon.tools.MathTools;
 import com.forgon.tools.string.StringTools;
 
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/action/ReturnMaterialRecordAction.java
===================================================================
diff -u -r14590 -r21818
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/action/ReturnMaterialRecordAction.java	(.../ReturnMaterialRecordAction.java)	(revision 14590)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returnmaterialrecord/action/ReturnMaterialRecordAction.java	(.../ReturnMaterialRecordAction.java)	(revision 21818)
@@ -15,7 +15,6 @@
 import org.apache.struts2.convention.annotation.ParentPackage;
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
-import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsItem;
 import com.forgon.disinfectsystem.entity.returnmaterialrecord.ReturnMaterialItem;
 import com.forgon.disinfectsystem.entity.returnmaterialrecord.ReturnMaterialRecord;
 import com.forgon.disinfectsystem.returnmaterialrecord.service.ReturnMaterialItemManager;
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/dwr/table/ReportFormsCenterTableManager.java
===================================================================
diff -u -r12331 -r21818
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/dwr/table/ReportFormsCenterTableManager.java	(.../ReportFormsCenterTableManager.java)	(revision 12331)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/dwr/table/ReportFormsCenterTableManager.java	(.../ReportFormsCenterTableManager.java)	(revision 21818)
@@ -1,16 +1,7 @@
 package com.forgon.disinfectsystem.reportforms.dwr.table;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import net.sf.json.JSONObject;
-
-import org.apache.commons.lang.StringUtils;
-
 import com.forgon.component.grid.GridManager;
 import com.forgon.disinfectsystem.reportforms.service.ReportFormsManager;
-import com.forgon.disinfectsystem.reportforms.vo.QualitymonitoringReportVo;
 
 /**
  * @author WangYi
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceQuerySummaryService.java
===================================================================
diff -u -r15302 -r21818
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceQuerySummaryService.java	(.../InvoiceQuerySummaryService.java)	(revision 15302)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/InvoiceQuerySummaryService.java	(.../InvoiceQuerySummaryService.java)	(revision 21818)
@@ -8,8 +8,6 @@
 
 import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceQuery;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceQueryItem;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsItemVo;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsVo;
 import com.forgon.tools.string.StringTools;
 
 /**
Index: ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/dwr/table/SatisfactionSurveyTemplateTableManager.java
===================================================================
diff -u -r14927 -r21818
--- ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/dwr/table/SatisfactionSurveyTemplateTableManager.java	(.../SatisfactionSurveyTemplateTableManager.java)	(revision 14927)
+++ ssts-satisfactionsurvey/src/main/java/com/forgon/disinfectsystem/satisfactionsurvey/dwr/table/SatisfactionSurveyTemplateTableManager.java	(.../SatisfactionSurveyTemplateTableManager.java)	(revision 21818)
@@ -12,7 +12,6 @@
 import com.forgon.component.grid.GridManager;
 import com.forgon.disinfectsystem.entity.satisfactionsurvey.SatisfactionSurveyTemplate;
 import com.forgon.disinfectsystem.satisfactionsurvey.service.SatisfactionSurveyTemplateManager;
-import com.forgon.security.acls.AclHelper;
 import com.forgon.security.service.AclManager;
 
 /**
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialDamageBean.java
===================================================================
diff -u -r18254 -r21818
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialDamageBean.java	(.../MaterialDamageBean.java)	(revision 18254)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialDamageBean.java	(.../MaterialDamageBean.java)	(revision 21818)
@@ -1,7 +1,6 @@
 package com.forgon.disinfectsystem.jasperreports.javabeansource;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 public class MaterialDamageBean {
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java
===================================================================
diff -u -r18101 -r21818
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java	(.../ReturnGoodsRecordManager.java)	(revision 18101)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManager.java	(.../ReturnGoodsRecordManager.java)	(revision 21818)
@@ -8,9 +8,6 @@
 
 import net.sf.json.JSONArray;
 
-import org.apache.commons.lang.StringUtils;
-
-import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsItem;
 import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsRecord;
 import com.google.gson.JsonObject;
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java
===================================================================
diff -u -r16301 -r21818
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java	(.../ForeignTousseAfterUseDeliveryVO.java)	(revision 16301)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java	(.../ForeignTousseAfterUseDeliveryVO.java)	(revision 21818)
@@ -1,6 +1,5 @@
 package com.forgon.disinfectsystem.jasperreports.javabeansource;
 
-import java.util.Date;
 
 
 /**
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java
===================================================================
diff -u -r18101 -r21818
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java	(.../ReturnGoodsRecordTableManager.java)	(revision 18101)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/dwr/table/ReturnGoodsRecordTableManager.java	(.../ReturnGoodsRecordTableManager.java)	(revision 21818)
@@ -17,7 +17,6 @@
 import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
-import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.returngoodsrecord.ReturnGoodsItem;
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/OperationReservationDetail_child.java
===================================================================
diff -u -r18066 -r21818
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/OperationReservationDetail_child.java	(.../OperationReservationDetail_child.java)	(revision 18066)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/OperationReservationDetail_child.java	(.../OperationReservationDetail_child.java)	(revision 21818)
@@ -1,7 +1,6 @@
 package com.forgon.disinfectsystem.jasperreports.javabeansource;
 
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 /**
  * 手术排班报表（查询类型为明细）子报表的javabean