Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
===================================================================
diff -u -r12895 -r12898
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java	(.../PackingManager.java)	(revision 12895)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java	(.../PackingManager.java)	(revision 12898)
@@ -104,6 +104,6 @@
 			String basketBarcode, String idCardInstanceID, String sterilizerName,
 			String sterileFrequency,String confirmContinue,HttpSession session) ;
 	public boolean addTousseInstanceToIdCardInstance(
-			IDCardInstance idCardInstance, PackingTask task,
+			IDCardInstance idCardInstance, PackingTask packingTask,
 			TousseInstance tousseInstance);
 }
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r12895 -r12898
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 12895)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 12898)
@@ -2532,12 +2532,12 @@
 	/**
 	 * 将新产生的器械包实例与标识牌实例进行绑定
 	 * @param idCardInstance 标识牌实例
-	 * @param task 装配任务，自定义装配则为null
+	 * @param packingTask 装配任务，自定义装配则为null
 	 * @param tousseInstance 器械包实例
 	 * @return 绑定成功，返回true，否则返回false
 	 */
 	public boolean addTousseInstanceToIdCardInstance(
-			IDCardInstance idCardInstance, PackingTask task,
+			IDCardInstance idCardInstance, PackingTask packingTask,
 			TousseInstance tousseInstance) {
 		boolean addSuccess = false;
 		
@@ -2552,10 +2552,10 @@
 		
 		objectDao.saveOrUpdate(tousseInstance);
 		
-		if (task != null){
+		if (packingTask != null){
 			// 获取一个标识牌信息
 			String sql = String
-					.format("where po.idCardInstanceID=%s and po.packingTaskID = %s",idCardInstance.getId(),task.getId());
+					.format("where po.idCardInstanceID=%s and po.packingTaskID = %s",idCardInstance.getId(),packingTask.getId());
 			IDCardInfoForPackingTask idCardInfo = (IDCardInfoForPackingTask)objectDao.getBySql(IDCardInfoForPackingTask.class.getSimpleName(), sql);
 			if(idCardInfo == null){
 				throw new RuntimeException("未获取到和装配任务相关的标识牌信息!");