Index: ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r17654 -r17655
--- ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 17654)
+++ ssts-web/src/main/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 17655)
@@ -32,6 +32,7 @@
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTransactionalTestNGSpringContextTests;
+import org.testng.annotations.Test;
 
 import test.forgon.constant.Constants;
 import test.forgon.disinfectsystem.invoicemanager.service.DataGenerater;
@@ -81,6 +82,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
 import com.forgon.disinfectsystem.entity.goodsstock.GoodsStock;
 import com.forgon.disinfectsystem.entity.idcarddefinition.IDCardDefinition;
+import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.recyclingapplication.RecyclingApplication;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
@@ -376,6 +378,7 @@
 		tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
 		tousseDefinition1.setForDisplay(true);
 		tousseDefinition1.setPackageType("纸塑");
+		tousseDefinition1.setUnit("");
 		
 		
 		objectDao.saveOrUpdate(materialInstance1);
@@ -421,6 +424,7 @@
 		tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
 		tousseDefinition2.setForDisplay(true);
 		tousseDefinition2.setPackageType("纸塑");
+		tousseDefinition2.setUnit("");
 		
 		materialInstances = new ArrayList<MaterialInstance>();
 		materialInstances.add(materialInstance2);
@@ -461,6 +465,7 @@
 		tousseDefinition3.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
 		tousseDefinition3.setForDisplay(true);
 		tousseDefinition3.setPackageType("纸塑");
+		tousseDefinition3.setUnit("");
 		
 		materialInstances = new ArrayList<MaterialInstance>();
 		materialInstances.add(materialInstance3);
@@ -777,6 +782,10 @@
 		String jsonParam = stringer.toString();
 		return jsonParam;
 	}
+//	@Test
+//	public void test() {
+//		initCSSDDataWithTrans();
+//	}
 	/**
 	 * 
 	 */
@@ -2020,6 +2029,7 @@
 		tousseDefinition1.setIsCustomPacking(TousseDefinition.STR_YES);
 		tousseDefinition1.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
 		tousseDefinition1.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
+		tousseDefinition1.setUnit("");
 		// 自动入筐的数量
 		tousseDefinition1.setPackingAmountPerVirtualBasket(5);
 		//包装类型
@@ -2055,6 +2065,7 @@
 		tousseDefinition2.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
 		tousseDefinition2.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
 		tousseDefinition2.setExternalCode("1002GYT2AA");
+		tousseDefinition2.setUnit("");
 		//是否整包清洗
 		tousseDefinition2.setIsCleanedEntirely(TousseDefinition.STR_NO);
 		tousseDefinition2.setIsCustomPacking(TousseDefinition.STR_YES);
@@ -2090,12 +2101,33 @@
 		tousseDefinition2.getMaterialInstances().add(materialInstance55);
 		tousseDefinition2.getMaterialInstances().add(materialInstance66);
 		tousseDefinitionManager.saveOrUpdate(tousseDefinition2);
-		//为“Test开颅包”绑定一个标识牌
-		IDCardDefinition iDCardDefinition = new IDCardDefinition();
-		iDCardDefinition.setTousseDefinitionID(tousseDefinition2.getId());
-		objectDao.saveOrUpdate(iDCardDefinition);
-
+		//为“Test开颅包”绑定一个标识牌，并且有四个标识牌实例
+		IDCardDefinition iDCardDefinition1 = new IDCardDefinition();
+		iDCardDefinition1.setTousseDefinitionID(tousseDefinition2.getId());
+		iDCardDefinition1.setCurIdCardInstanceBarcode("010316313");
+		objectDao.saveOrUpdate(iDCardDefinition1);
 		
+		IDCardInstance iDCardInstance1 = new IDCardInstance();
+		iDCardInstance1.setIdCardDefinitionID(iDCardDefinition1.getId());
+		iDCardInstance1.setBarcode("010316310");
+		
+		IDCardInstance iDCardInstance2 = new IDCardInstance();
+		iDCardInstance2.setIdCardDefinitionID(iDCardDefinition1.getId());
+		iDCardInstance2.setBarcode("010316311");
+		
+		IDCardInstance iDCardInstance3 = new IDCardInstance();
+		iDCardInstance3.setIdCardDefinitionID(iDCardDefinition1.getId());
+		iDCardInstance3.setBarcode("010316312");
+		
+		IDCardInstance iDCardInstance4 = new IDCardInstance();
+		iDCardInstance4.setIdCardDefinitionID(iDCardDefinition1.getId());
+		iDCardInstance4.setBarcode("010316313");
+		
+		objectDao.saveOrUpdate(iDCardInstance1);
+		objectDao.saveOrUpdate(iDCardInstance2);
+		objectDao.saveOrUpdate(iDCardInstance3);
+		objectDao.saveOrUpdate(iDCardInstance4);
+		
 		TousseDefinition tousseDefinition3 = new TousseDefinition();
 		tousseDefinition3.setName("Test开口包");
 		tousseDefinition3.setTaskGroup("术科组");
@@ -2108,6 +2140,7 @@
 		tousseDefinition3.setExternalCode("1003GYT3AA");
 		tousseDefinition3.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
 		tousseDefinition3.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
+		tousseDefinition3.setUnit("");
 		// 自动入筐的数量
 		tousseDefinition3.setPackingAmountPerVirtualBasket(20);
 		//是否整包清洗
@@ -2145,6 +2178,7 @@
 		tousseDefinition4.setExternalCode("9001GYT4AA");
 		tousseDefinition4.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
 		tousseDefinition4.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
+		tousseDefinition4.setUnit("");
 		// 自动入筐的数量
 		tousseDefinition4.setPackingAmountPerVirtualBasket(33);
 		//是否整包清洗
@@ -2199,6 +2233,7 @@
 		tousseDefinition5.getMaterialInstances().add(materialInstance10);
 		tousseDefinition5.setHandlerDepartCode(Constants.ORG_UNIT_CODE_OR);
 		tousseDefinition5.setHandlerDepartName(Constants.ORG_UNIT_NAME_OR);
+		tousseDefinition5.setUnit("");
 		tousseDefinitionManager.saveOrUpdate(tousseDefinition5);
 		
 		TousseDefinition tousseDefinition6 = new TousseDefinition();
@@ -2238,6 +2273,7 @@
 		tousseDefinition6.getMaterialInstances().add(materialInstance14);
 		tousseDefinition6.setHandlerDepartCode(Constants.ORG_UNIT_CODE_OR);
 		tousseDefinition6.setHandlerDepartName(Constants.ORG_UNIT_NAME_OR);
+		tousseDefinition6.setUnit("");
 		tousseDefinitionManager.saveOrUpdate(tousseDefinition6);
 		
 		TousseDefinition tousseDefinition7 = new TousseDefinition();
@@ -2252,6 +2288,7 @@
 		tousseDefinition7.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
 		tousseDefinition7.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
 		tousseDefinition7.setExternalCode("1009");
+		tousseDefinition7.setUnit("");
 		//是否整包清洗
 		tousseDefinition7.setIsCleanedEntirely(TousseDefinition.STR_NO);
 		tousseDefinition7.setIsCustomPacking(TousseDefinition.STR_YES);
@@ -2281,6 +2318,7 @@
 		tousseDefinition8.setAssetsBelong(Constants.ORG_UNIT_NAME_DISINFECT);
 		tousseDefinition8.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
 		tousseDefinition8.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
+		tousseDefinition8.setUnit("");
 		tousseDefinition8.setIncludeImplant(0);
 		tousseDefinition8.setIsCleanedEntirely("是");
 		tousseDefinition8.setIsCustomPacking("否");
@@ -2303,6 +2341,7 @@
 		tousseDefinition9.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
 		tousseDefinition9.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
 		tousseDefinition9.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
+		tousseDefinition9.setUnit("");
 
 		tousseDefinition9.getMaterialInstances().add(materialInstance1);
 		tousseDefinition9.getMaterialInstances().add(materialInstance2);
@@ -2319,6 +2358,7 @@
 		tousseDefinition10.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
 		tousseDefinition10.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
 		tousseDefinition10.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
+		tousseDefinition10.setUnit("");
 		//包装类型
 		tousseDefinition10.setPackageType("纸塑");
 		
@@ -2334,6 +2374,7 @@
 		tousseDefinition11.setTousseType(TousseDefinition.PACKAGE_TYPE_INSIDE);
 		tousseDefinition11.setHandlerDepartCode(Constants.ORG_UNIT_CODE_CSSD);
 		tousseDefinition11.setHandlerDepartName(Constants.ORG_UNIT_NAME_CSSD);
+		tousseDefinition11.setUnit("");
 		//包装类型
 		tousseDefinition11.setPackageType("纸塑");