Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java
===================================================================
diff -u -r26085 -r29322
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java	(.../PackingTableManagerTests.java)	(revision 26085)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/PackingTableManagerTests.java	(.../PackingTableManagerTests.java)	(revision 29322)
@@ -986,7 +986,8 @@
 		assertEquals(20, tousseInstances2.size());
 		
 		assertEquals("Test开胸包", tousseInstances.get(0).getTousseName());
-		assertEquals("棉布", tousseInstances.get(0).getPackageType());
+		//多个装配任务时,取包定义的装配类型
+		assertEquals(td.getPackageType(), tousseInstances.get(0).getPackageType());
 		
 		packingTask1 = packingManager.getUnfinishedTask(Long.valueOf(1), "010000116", td.getId(), 1);
 		assertNull(packingTask1);  // 装配任务完成后被删除