Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java
===================================================================
diff -u -r16729 -r17325
--- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java	(.../TousseIntoBasketRestrictionsTests.java)	(revision 16729)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/TousseIntoBasketRestrictionsTests.java	(.../TousseIntoBasketRestrictionsTests.java)	(revision 17325)
@@ -47,7 +47,7 @@
 		TousseDefinition td = tousseDefinitionManager.getTousseDefinitionByName("Test开胸包");
 		//空篮筐
 		String params = "[{barcode:'019000001',scanedGoods:[{name:'Test开口包',tousseDefinitionID:" + td2.getId() + ",type:'器械包',amount:5}]}]";
-		JSONObject result = recyclingRecordManager.recycleTousseIntoBasket("" + td.getId(),3,params);
+		JSONObject result = recyclingRecordManager.recycleTousseIntoBasket("" + td.getId(),3,"",params);
 		boolean success = result.optBoolean("success");
 		assertEquals(true, success);
 		
@@ -79,7 +79,7 @@
 		
 		//篮筐内已经放入物品占80%体积，继续放60%的东西
 		String params2 = "[{barcode:'019000001',scanedGoods:[{name:'Test开胸包',putBasketMaxAmount:5,type:'器械包',amount:1},{name:'Test开口包',putBasketMaxAmount:0,type:'器械包',amount:3}]}]";
-		JSONObject result2 = recyclingRecordManager.recycleTousseIntoBasket("" + td.getId(),3,params2);
+		JSONObject result2 = recyclingRecordManager.recycleTousseIntoBasket("" + td.getId(),3,"",params2);
 		
 		JSONObject data2 = result2.optJSONObject("data");
 		assertEquals(1, data2.optInt("amount"));
@@ -97,12 +97,12 @@
 		
 		//篮筐已满是否还能继续放东西
 		String params3 = "[{barcode:'019000001',scanedGoods:[{name:'Test开口包',type:'器械包',amount:3}]}]";
-		JSONObject result3 = recyclingRecordManager.recycleTousseIntoBasket("" + td.getId(),3,params3);
+		JSONObject result3 = recyclingRecordManager.recycleTousseIntoBasket("" + td.getId(),3,"",params3);
 		boolean success2 = result3.optBoolean("success");
 		assertEquals(false, success2);
 		
 		String params4 = "[{barcode:'019000001',scanedGoods:[]}]";
-		JSONObject result4 = recyclingRecordManager.recycleTousseIntoBasket(""+td2 .getId(),3,params4);
+		JSONObject result4 = recyclingRecordManager.recycleTousseIntoBasket(""+td2 .getId(),3,"",params4);
 		
 		JSONObject obj4 = result4.optJSONObject("data");
 		assertEquals(3, obj4.optInt("amount"));
@@ -127,15 +127,15 @@
 		//当前发的物品占篮筐体积  1号篮筐 0.35   2号篮筐  0.3
 		TousseDefinition td_Test开颅包 = tousseDefinitionManager.getTousseDefinitionByName("Test开颅包");
 		String params = "[{barcode:'019000001',scanedGoods:[]},{barcode:'019000002',scanedGoods:[]}]";
-		JSONObject result = recyclingRecordManager.recycleTousseIntoBasket(""+td_Test开颅包.getId(),3,params);
+		JSONObject result = recyclingRecordManager.recycleTousseIntoBasket(""+td_Test开颅包.getId(),3,"",params);
 		assertNotNull(result);
 		JSONObject obj = result.optJSONObject("data");
 		assertEquals(3, obj.optInt("amount"));
 		
 		setDBClassifyBasket();
 		//再次入筐后体积   1号篮筐 1.2834   2号篮筐  1.1   所以物品只能入筐5个;入五个后：1号篮筐体积：0.9333,2号筐：0.8
 		String params2 = "[{barcode:'019000001',scanedGoods:[]},{barcode:'019000002',scanedGoods:[]}]";
-		JSONObject result2 = recyclingRecordManager.recycleTousseIntoBasket(""+td_Test开颅包.getId(),8,params2);
+		JSONObject result2 = recyclingRecordManager.recycleTousseIntoBasket(""+td_Test开颅包.getId(),8,"",params2);
 		assertNotNull(result2);
 		boolean success = result2.optBoolean("success");
 		assertEquals(false, success);
@@ -149,7 +149,7 @@
 		objectDao.saveOrUpdate(td);
 		//0.0667
 		String params3 = "[{barcode:'019000001',scanedGoods:[]}]";
-		JSONObject result3 = recyclingRecordManager.recycleTousseIntoBasket(""+td.getId(),4,params3);
+		JSONObject result3 = recyclingRecordManager.recycleTousseIntoBasket(""+td.getId(),4,"",params3);
 		assertNotNull(result3);
 		JSONObject obj3 = result3.optJSONObject("data");
 		assertEquals(3, obj3.optInt("amount"));