Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java
===================================================================
diff -u -r40732 -r41615
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java	(.../PackingManagerTests.java)	(revision 40732)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerTests.java	(.../PackingManagerTests.java)	(revision 41615)
@@ -48,6 +48,7 @@
 import com.forgon.disinfectsystem.exception.RecyclingRecordException;
 import com.forgon.disinfectsystem.packing.dwr.table.PackingTableManager;
 import com.forgon.disinfectsystem.packing.service.PackingManager;
+import com.forgon.disinfectsystem.packing.vo.WaitPackingTaskTaskParam;
 import com.forgon.disinfectsystem.recyclingrecord.service.RecyclingRecordManager;
 import com.forgon.disinfectsystem.washanddisinfectmanager.washanddisinfectrecord.service.WashAndDisinfectRecordManager;
 
@@ -1942,7 +1943,12 @@
 			JSONObject returnObj = new JSONObject();
 			int pageIndex = 0;
 			int pageSize = 10;
-			taskVos = packingManager.getWaitPackingTaskJson(taskGroup,basketBarcode,returnObj,pageIndex, pageSize, null);
+			WaitPackingTaskTaskParam param = new WaitPackingTaskTaskParam();
+			param.setPageIndex(pageIndex);
+			param.setPageSize(pageSize);
+			param.setTaskGroup(taskGroup);
+			param.setBasketBarcode(basketBarcode);
+			taskVos = packingManager.getWaitPackingTaskJson(param,returnObj);
 			retObj.put("data", taskVos);
 			JSONUtil.addSuccess(retObj, true);
 		} catch (Exception e1) {
@@ -1962,7 +1968,12 @@
 			JSONObject returnObj = new JSONObject();
 			int pageIndex = 0;
 			int pageSize = 10;
-			taskVos = packingManager.getWaitPackingTaskJson(taskGroup,basketBarcode,returnObj,pageIndex, pageSize, null);
+			WaitPackingTaskTaskParam param = new WaitPackingTaskTaskParam();
+			param.setPageIndex(pageIndex);
+			param.setPageSize(pageSize);
+			param.setTaskGroup(taskGroup);
+			param.setBasketBarcode(basketBarcode);
+			taskVos = packingManager.getWaitPackingTaskJson(param,returnObj);
 			retObj.put("data", taskVos);
 			JSONUtil.addSuccess(retObj, true);
 		} catch (Exception e1) {
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerForGetWaitPackingTaskJsonTests.java
===================================================================
diff -u -r40779 -r41615
--- ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerForGetWaitPackingTaskJsonTests.java	(.../PackingManagerForGetWaitPackingTaskJsonTests.java)	(revision 40779)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/packing/service/PackingManagerForGetWaitPackingTaskJsonTests.java	(.../PackingManagerForGetWaitPackingTaskJsonTests.java)	(revision 41615)
@@ -4,7 +4,6 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -22,6 +21,7 @@
 import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket;
 import com.forgon.disinfectsystem.packing.service.PackingManagerImpl;
 import com.forgon.disinfectsystem.packing.vo.WaitPackingTaskItemVo;
+import com.forgon.disinfectsystem.packing.vo.WaitPackingTaskTaskParam;
 import com.forgon.disinfectsystem.packing.vo.WaitPackingTaskVo;
 import com.forgon.disinfectsystem.packing.vo.WaitPackingTaskVoGroupClassifyBasket;
 
@@ -55,7 +55,14 @@
 		ClassifyBasket classifyBasket清洗筐117 = NewPackingTaskCommon.newClassifyBasket(objectDao, container清洗筐117);
 		NewPackingTaskCommon.newPackingTask(objectDao, td, classifyBasket清洗筐117, null, taskType, container清洗筐117, Constants.ORG_UNIT_CODE_NEIKE);
 		String tousseOrDepart = null;
-		List<WaitPackingTaskVo> waitPackingTaskVos = packingManager.getWaitPackingTaskTaskVoList(null, Constants.TASKGROUP_CHANGGUZU, basketBarcodes, returnObj, tousseOrDepart, pageIndex, pageSize, null, false, null);
+		WaitPackingTaskTaskParam param = new WaitPackingTaskTaskParam();
+		param.setPageIndex(pageIndex);
+		param.setPageSize(pageSize);
+		param.setTaskGroup(Constants.TASKGROUP_CHANGGUZU);
+		param.setBasketBarcode(basketBarcodes);
+		param.setTousseOrDepart(tousseOrDepart);
+		param.setSettleAccountsDepartCoding(PackingManagerImpl.NULLSETTLEACCOUNTSDEPARTCODINGSTR);
+		List<WaitPackingTaskVo> waitPackingTaskVos = packingManager.getWaitPackingTaskTaskVoList(param, returnObj, null, false);
 		
 		assertNotNull("有装配任务",waitPackingTaskVos);
 		
@@ -85,7 +92,13 @@
 		NewPackingTaskCommon.newPackingTask(objectDao, td, classifyBasket清洗筐117, null, taskType, container清洗筐117, Constants.ORG_UNIT_CODE_NEIKE);
 		String tousseOrDepart = null;
 		List<WaitPackingTaskVoGroupClassifyBasket> waitPackingTaskVoGroupClassifyBaskets = new ArrayList<WaitPackingTaskVoGroupClassifyBasket>();
-		packingManager.getWaitPackingTaskTaskVoList(null, Constants.TASKGROUP_CHANGGUZU, basketBarcodes, returnObj, tousseOrDepart, pageIndex, pageSize, waitPackingTaskVoGroupClassifyBaskets, true, null);
+		WaitPackingTaskTaskParam param = new WaitPackingTaskTaskParam();
+		param.setPageIndex(pageIndex);
+		param.setPageSize(pageSize);
+		param.setTaskGroup(Constants.TASKGROUP_CHANGGUZU);
+		param.setBasketBarcode(basketBarcodes);
+		param.setTousseOrDepart(tousseOrDepart);
+		packingManager.getWaitPackingTaskTaskVoList(param, returnObj, waitPackingTaskVoGroupClassifyBaskets, true);
 		
 		assertNotNull("有装配任务",waitPackingTaskVoGroupClassifyBaskets);
 		assertEquals("装配任务有两个文件夹 一个篮筐一个文件夹", 2 , waitPackingTaskVoGroupClassifyBaskets.size());
@@ -124,7 +137,14 @@
 		NewPackingTaskCommon.newPackingTask(objectDao, td, classifyBasket清洗筐117, null, taskType, container清洗筐117, null);
 		String tousseOrDepart = null;
 		List<WaitPackingTaskVoGroupClassifyBasket> waitPackingTaskVoGroupClassifyBaskets = new ArrayList<WaitPackingTaskVoGroupClassifyBasket>();
-		packingManager.getWaitPackingTaskTaskVoList(null, Constants.TASKGROUP_CHANGGUZU, basketBarcodes, returnObj, tousseOrDepart, pageIndex, pageSize, waitPackingTaskVoGroupClassifyBaskets, true, PackingManagerImpl.NULLSETTLEACCOUNTSDEPARTCODINGSTR);
+		WaitPackingTaskTaskParam param = new WaitPackingTaskTaskParam();
+		param.setPageIndex(pageIndex);
+		param.setPageSize(pageSize);
+		param.setTaskGroup(Constants.TASKGROUP_CHANGGUZU);
+		param.setBasketBarcode(basketBarcodes);
+		param.setTousseOrDepart(tousseOrDepart);
+		param.setSettleAccountsDepartCoding(PackingManagerImpl.NULLSETTLEACCOUNTSDEPARTCODINGSTR);
+		packingManager.getWaitPackingTaskTaskVoList(param, returnObj, waitPackingTaskVoGroupClassifyBaskets, true);
 		JSONArray departments = packingManager.loadWaitPackingTaskDepart(Constants.TASKGROUP_CHANGGUZU);
 		 // 验证结果不为空
 	    assertNotNull("待打包任务科室列表不应为null", departments);
@@ -165,7 +185,13 @@
 		NewPackingTaskCommon.newPackingTask(objectDao, td, classifyBasket清洗筐117, null, taskType, container清洗筐117, Constants.ORG_UNIT_CODE_NEIKE);
 		String tousseOrDepart = null;
 		List<WaitPackingTaskVoGroupClassifyBasket> waitPackingTaskVoGroupClassifyBaskets = new ArrayList<WaitPackingTaskVoGroupClassifyBasket>();
-		packingManager.getWaitPackingTaskTaskVoList(null, Constants.TASKGROUP_SHUKEZU, basketBarcodes, returnObj, tousseOrDepart, pageIndex, pageSize, waitPackingTaskVoGroupClassifyBaskets, true, null);
+		WaitPackingTaskTaskParam param = new WaitPackingTaskTaskParam();
+		param.setPageIndex(pageIndex);
+		param.setPageSize(pageSize);
+		param.setTaskGroup(Constants.TASKGROUP_SHUKEZU);
+		param.setBasketBarcode(basketBarcodes);
+		param.setTousseOrDepart(tousseOrDepart);
+		packingManager.getWaitPackingTaskTaskVoList(param, returnObj, waitPackingTaskVoGroupClassifyBaskets, true);
 		assertEquals("没有装配任务",0, waitPackingTaskVoGroupClassifyBaskets.size());
 	}
 	/**
@@ -190,7 +216,14 @@
 		NewPackingTaskCommon.newPackingTask(objectDao, td, classifyBasket清洗筐117, null, taskType, container清洗筐117, Constants.ORG_UNIT_CODE_NEIKE);
 		String tousseOrDepart = null;
 		List<WaitPackingTaskVoGroupClassifyBasket> waitPackingTaskVoGroupClassifyBaskets = new ArrayList<WaitPackingTaskVoGroupClassifyBasket>();
-		List<WaitPackingTaskVo> waitPackingTaskVos = packingManager.getWaitPackingTaskTaskVoList(null, Constants.TASKGROUP_SHUKEZU, basketBarcodes, returnObj, tousseOrDepart, pageIndex, pageSize, waitPackingTaskVoGroupClassifyBaskets, false, null);
+		WaitPackingTaskTaskParam param = new WaitPackingTaskTaskParam();
+		param.setPageIndex(pageIndex);
+		param.setPageSize(pageSize);
+		param.setTaskGroup(Constants.TASKGROUP_SHUKEZU);
+		param.setBasketBarcode(basketBarcodes);
+		param.setTousseOrDepart(tousseOrDepart);
+		
+		List<WaitPackingTaskVo> waitPackingTaskVos = packingManager.getWaitPackingTaskTaskVoList(param, returnObj, waitPackingTaskVoGroupClassifyBaskets, false);
 		assertEquals("没有装配任务",0 , waitPackingTaskVoGroupClassifyBaskets.size());
 		assertEquals("没有装配任务",0 , waitPackingTaskVos.size());
 		@SuppressWarnings("unused")