Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
===================================================================
diff -u -r38784 -r40662
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java	(.../PackingManagerTests.java)	(revision 38784)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java	(.../PackingManagerTests.java)	(revision 40662)
@@ -6,6 +6,7 @@
 
 import javax.servlet.http.HttpSession;
 
+import com.forgon.serialnumber.model.SerialNum;
 import com.forgon.tools.MathTools;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.date.DateTools;
@@ -34,6 +35,7 @@
 import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail;
 import com.forgon.disinfectsystem.entity.packing.PackingRecord;
 import com.forgon.disinfectsystem.entity.packing.PackingTask;
+import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
 import com.forgon.disinfectsystem.entity.recyclingrecord.RecyclingRecord;
 import com.forgon.disinfectsystem.entity.tousseitem.TousseItem;
 import com.forgon.disinfectsystem.entity.urgent.UrgentLevel;
@@ -2012,4 +2014,80 @@
 		objectDao.refresh(foreignTousseApplication);
 		assertEquals(InvoicePlan.DELIVERSTATUS_PARTDELIVERED,foreignTousseApplication.getDeliverStatus());
 	}
+	/**
+	 * 测试自动批量入筐
+	 * 准备3个包 2个来源与清洗筐116 1个来源与清洗筐117
+	 */
+	@Test
+	public void autobasketInsertion(){
+		//准备数据
+		
+		Container sContainer01 = containerManager.getContainer("灭菌筐01");
+		Container rContainer116 = containerManager.getContainer("清洗筐116");
+		Container rContainer117 = containerManager.getContainer("清洗筐117");
+		String cleaningContainerIds = rContainer116.getId() + ";" + rContainer117.getId();
+		containerManager.saveOrUpdate(sContainer01, cleaningContainerIds);
+		
+		ClassifyBasket cb116 = new ClassifyBasket();
+		cb116.setContainerBarcode(rContainer116.getBarcode());
+		objectDao.save(cb116);
+		ClassifyBasket cb117 = new ClassifyBasket();
+		cb116.setContainerBarcode(rContainer117.getBarcode());
+		objectDao.save(cb117);
+		
+		TousseDefinition td_Test开胸包 = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包");
+    	TousseDefinition td_Test缝合包 = tousseDefinitionManager.getTousseDefinitionByName("Test缝合包");
+    	TousseDefinition td_Test开口包 = tousseDefinitionManager.getTousseDefinitionByName("Test开口包");
+    	String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
+		TousseInstance ti1 = new TousseInstance();
+		ti1.setTousseFixedBarcode(false);
+		ti1.setTousseDefinition(td_Test开胸包);
+		ti1.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		ti1.setTousseName(td_Test开胸包.getName());
+		ti1.setClassifyBasket_id(cb116.getId());
+		ti1.setStatus(TousseInstance.STATUS_REVIEWED);
+		ti1.setOrgUnitCoding(orgUnitCoding);
+		objectDao.saveOrUpdate(ti1);
+		
+		TousseInstance ti2 = new TousseInstance();
+		ti2.setTousseFixedBarcode(false);
+		ti2.setTousseDefinition(td_Test缝合包);
+		ti2.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		ti2.setTousseName(td_Test缝合包.getName());
+		ti2.setClassifyBasket_id(cb116.getId());
+		ti2.setStatus(TousseInstance.STATUS_REVIEWED);
+		ti2.setOrgUnitCoding(orgUnitCoding);
+		objectDao.saveOrUpdate(ti2);
+		
+		TousseInstance ti3 = new TousseInstance();
+		ti3.setTousseFixedBarcode(false);
+		ti3.setTousseDefinition(td_Test开口包);
+		ti3.setBarcode(serialNumManager.getSerialNumberStr(SerialNum.TYPE_BARCODE));
+		ti3.setTousseName(td_Test开口包.getName());
+		ti3.setClassifyBasket_id(cb117.getId());
+		ti3.setStatus(TousseInstance.STATUS_REVIEWED);
+		ti3.setOrgUnitCoding(orgUnitCoding);
+		objectDao.saveOrUpdate(ti3);
+		Map<Long, Long> cntainerBindingInfo = new HashMap<Long, Long>();
+		cntainerBindingInfo.put(cb116.getId(), sContainer01.getId());
+		cntainerBindingInfo.put(cb117.getId(), sContainer01.getId());
+		List<TousseInstance> tis = new ArrayList<TousseInstance>();
+		tis.add(ti1);
+		tis.add(ti2);
+		tis.add(ti3);
+		packingManager.autobasketInsertion(tis, cntainerBindingInfo);
+		objectDao.refresh(ti1);
+		objectDao.refresh(ti2);
+		objectDao.refresh(ti3);
+		assertNotNull("检验入筐是否成功",ti1.getReviewBasket_id());
+		assertNotNull("检验入筐是否成功",ti2.getReviewBasket_id());
+		assertNotNull("检验入筐是否成功",ti3.getReviewBasket_id());
+		ReviewedBasket reviewedBasket1 = (ReviewedBasket)objectDao.getById(ReviewedBasket.class.getSimpleName(), ti1.getReviewBasket_id());
+		assertEquals(sContainer01.getId(),reviewedBasket1.getContainer().getId());
+		ReviewedBasket reviewedBasket2 = (ReviewedBasket)objectDao.getById(ReviewedBasket.class.getSimpleName(), ti1.getReviewBasket_id());
+		assertEquals(sContainer01.getId(),reviewedBasket2.getContainer().getId());
+		ReviewedBasket reviewedBasket3 = (ReviewedBasket)objectDao.getById(ReviewedBasket.class.getSimpleName(), ti1.getReviewBasket_id());
+		assertEquals(sContainer01.getId(),reviewedBasket3.getContainer().getId());
+	}
+	
 }