Index: ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/service/GoodsStockManagerTests.java
===================================================================
diff -u -r17432 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/service/GoodsStockManagerTests.java	(.../GoodsStockManagerTests.java)	(revision 17432)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/goodsstock/service/GoodsStockManagerTests.java	(.../GoodsStockManagerTests.java)	(revision 21808)
@@ -1,5 +1,8 @@
 package test.forgon.disinfectsystem.goodsstock.service;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -10,15 +13,14 @@
 import org.springframework.test.annotation.Rollback;
 import org.testng.annotations.Test;
 
+import test.forgon.constant.Constants;
+import test.forgon.disinfectsystem.AbstractCSSDTest;
+
 import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.runwithtrans.model.RunWithTransNewTask;
 
-import test.forgon.constant.Constants;
-import test.forgon.disinfectsystem.AbstractCSSDTest;
-import static org.testng.Assert.*;
-
 public class GoodsStockManagerTests extends AbstractCSSDTest {
 	private Long tousseDefinitionId;
 	private Long wareHouseId;
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/EquivalenceTest.java
===================================================================
diff -u -r13416 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/EquivalenceTest.java	(.../EquivalenceTest.java)	(revision 13416)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/importbasedata/EquivalenceTest.java	(.../EquivalenceTest.java)	(revision 21808)
@@ -2,12 +2,10 @@
 
 import junit.framework.Assert;
 
-import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsStock;
 import com.forgon.disinfectsystem.entity.basedatamanager.cleanmethod.CleanMethod;
 import com.forgon.disinfectsystem.maintain.importbasedata.equivalence.CleanMethodEquivalence;
 import com.forgon.disinfectsystem.maintain.importbasedata.equivalence.DiposableGoodsEquivalence;
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java
===================================================================
diff -u -r17817 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java	(.../TestPDATousseInvoiceManager.java)	(revision 17817)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDATousseInvoiceManager.java	(.../TestPDATousseInvoiceManager.java)	(revision 21808)
@@ -1,28 +1,26 @@
 package test.forgon.disinfectsystem.invoicemanager.service;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
 import org.apache.commons.collections4.CollectionUtils;
 import org.testng.annotations.Test;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 import test.forgon.disinfectsystem.invoicemanager.model.InvoiceInfo;
 
 import com.forgon.directory.model.BarcodeDevice;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
-import com.forgon.disinfectsystem.entity.assestmanagement.TousseStock;
-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.departmentstock.DepartmentStock;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDABorrowTousseGoodsInvoiceManager.java
===================================================================
diff -u -r17817 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDABorrowTousseGoodsInvoiceManager.java	(.../TestPDABorrowTousseGoodsInvoiceManager.java)	(revision 17817)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestPDABorrowTousseGoodsInvoiceManager.java	(.../TestPDABorrowTousseGoodsInvoiceManager.java)	(revision 21808)
@@ -1,32 +1,31 @@
 package test.forgon.disinfectsystem.invoicemanager.service;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+
 import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.ArrayUtils;
 import org.testng.annotations.Test;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 import test.forgon.disinfectsystem.invoicemanager.model.InvoiceInfo;
 
 import com.forgon.directory.model.BarcodeDevice;
-import com.forgon.disinfectsystem.entity.assestmanagement.TousseStock;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
-import com.forgon.disinfectsystem.entity.departmentstock.DepartmentStock;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.tools.db.DatabaseUtil;
-import com.sun.xml.internal.bind.v2.runtime.unmarshaller.XsiNilLoader.Array;
 
 import edu.emory.mathcs.backport.java.util.Arrays;
 /**
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/maintain/MaintainTests.java
===================================================================
diff -u -r12331 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/maintain/MaintainTests.java	(.../MaintainTests.java)	(revision 12331)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/maintain/MaintainTests.java	(.../MaintainTests.java)	(revision 21808)
@@ -3,11 +3,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.testng.annotations.Test;
 
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
-import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.maintain.basic.service.MaintainManager;
 
 /***
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForProxyDisinfectionTest.java
===================================================================
diff -u -r21095 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForProxyDisinfectionTest.java	(.../InvoiceManagerForProxyDisinfectionTest.java)	(revision 21095)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerForProxyDisinfectionTest.java	(.../InvoiceManagerForProxyDisinfectionTest.java)	(revision 21808)
@@ -1,5 +1,9 @@
 package test.forgon.disinfectsystem.invoicemanager.service;
 
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
@@ -8,17 +12,16 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.testng.annotations.Test;
 
+import test.forgon.constant.Constants;
+import test.forgon.disinfectsystem.AbstractCSSDTest;
+
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.proxydisinfection.ProxyDisinfection;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.recyclingapplication.vo.ApplicationGoodsVo;
 
-import static org.testng.Assert.*;
-import test.forgon.constant.Constants;
-import test.forgon.disinfectsystem.AbstractCSSDTest;
-
 /**
  * 代理灭菌发货的测试用例
  * @author kzh
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java
===================================================================
diff -u -r18168 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java	(.../PDADuplicateInvoice.java)	(revision 18168)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDADuplicateInvoice.java	(.../PDADuplicateInvoice.java)	(revision 21808)
@@ -1,10 +1,10 @@
 package test.forgon.disinfectsystem.invoicemanager.service;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
 
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
@@ -15,12 +15,9 @@
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 
 import com.forgon.directory.model.BarcodeDevice;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
-import com.forgon.tools.json.JSONUtil;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/DeleteTousseDefinitionTest.java
===================================================================
diff -u -r17810 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/DeleteTousseDefinitionTest.java	(.../DeleteTousseDefinitionTest.java)	(revision 17810)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/basedatamanager/toussedefinition/service/DeleteTousseDefinitionTest.java	(.../DeleteTousseDefinitionTest.java)	(revision 21808)
@@ -1,20 +1,20 @@
 package test.forgon.disinfectsystem.basedatamanager.toussedefinition.service;
 
-import org.hibernate.Session;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertFalse;
+import static org.testng.Assert.assertTrue;
+
 import org.testng.annotations.Test;
 
-import com.forgon.directory.model.CssdHandleTousses;
-
 import test.forgon.constant.Constants;
+import test.forgon.disinfectsystem.AbstractCSSDTest;
 
+import com.forgon.directory.model.CssdHandleTousses;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.serialnumber.model.SerialNum;
 import com.forgon.tools.db.DatabaseUtil;
-
-import test.forgon.disinfectsystem.AbstractCSSDTest;
-import static org.testng.Assert.*;
 /**
  * 测试保存或者修改器械包定义
  * @author Chenjiaru 2017-03-09
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDASimpleTousseComplexStatusInvoiceManagerTests.java
===================================================================
diff -u -r17817 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDASimpleTousseComplexStatusInvoiceManagerTests.java	(.../PDASimpleTousseComplexStatusInvoiceManagerTests.java)	(revision 17817)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/PDASimpleTousseComplexStatusInvoiceManagerTests.java	(.../PDASimpleTousseComplexStatusInvoiceManagerTests.java)	(revision 21808)
@@ -1,29 +1,24 @@
 package test.forgon.disinfectsystem.invoicemanager.service;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
+import static org.testng.Assert.assertTrue;
 
 import java.util.Date;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
-import org.apache.commons.collections4.CollectionUtils;
-import org.testng.annotations.Test;
-
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
+
+import org.testng.annotations.Test;
+
 import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
 import test.forgon.disinfectsystem.invoicemanager.model.InvoiceInfo;
 
 import com.forgon.directory.model.BarcodeDevice;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
-import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
-import com.forgon.disinfectsystem.entity.assestmanagement.TousseStock;
-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.departmentstock.DepartmentStock;
-import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.tools.db.DatabaseUtil;
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/ForeignTousseAppDataProvider.java
===================================================================
diff -u -r19934 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/ForeignTousseAppDataProvider.java	(.../ForeignTousseAppDataProvider.java)	(revision 19934)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/dataProvider/application/ForeignTousseAppDataProvider.java	(.../ForeignTousseAppDataProvider.java)	(revision 21808)
@@ -1,18 +1,16 @@
 package test.forgon.disinfectsystem.dataProvider.application;
 
+import java.util.Date;
+
+import net.sf.json.JSONArray;
+import net.sf.json.JSONObject;
+import test.forgon.constant.Constants;
+
 import com.forgon.disinfectsystem.entity.basedatamanager.foreigntoussedefinition.ForeignTousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.foreigntousseapplication.ForeignTousseApplication;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
-import org.testng.annotations.DataProvider;
-import test.forgon.constant.Constants;
-import test.forgon.disinfectsystem.constants.ForeignTousseConstant;
-import test.forgon.disinfectsystem.dataProvider.tousseDefinition.MaterialDataProvider;
 
-import java.util.Date;
-
 /**
  * @author zhonghaowen
  * @apiNote 外来器械包数据驱动
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/OperationReservationMergeInvoiceTests.java
===================================================================
diff -u -r18255 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/OperationReservationMergeInvoiceTests.java	(.../OperationReservationMergeInvoiceTests.java)	(revision 18255)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/OperationReservationMergeInvoiceTests.java	(.../OperationReservationMergeInvoiceTests.java)	(revision 21808)
@@ -1,10 +1,7 @@
 package test.forgon.disinfectsystem.invoicemanager.service;
 import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertNotNull;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -17,9 +14,7 @@
 
 import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.AbstractCSSDTest;
-import test.forgon.disinfectsystem.invoicemanager.model.InvoiceInfo;
 
-import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/common/CssdUtilsTests.java
===================================================================
diff -u -r14104 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/common/CssdUtilsTests.java	(.../CssdUtilsTests.java)	(revision 14104)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/common/CssdUtilsTests.java	(.../CssdUtilsTests.java)	(revision 21808)
@@ -1,5 +1,6 @@
 package test.forgon.disinfectsystem.common;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
 
 import org.testng.annotations.Test;
 
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestMultiForeignTousseInvoiceManager.java
===================================================================
diff -u -r19972 -r21808
--- ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestMultiForeignTousseInvoiceManager.java	(.../TestMultiForeignTousseInvoiceManager.java)	(revision 19972)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/invoicemanager/service/TestMultiForeignTousseInvoiceManager.java	(.../TestMultiForeignTousseInvoiceManager.java)	(revision 21808)
@@ -2,7 +2,7 @@
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertNull;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertTrue;
 
 import java.util.ArrayList;
 import java.util.Date;