Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r13367 -r13368
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13367)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 13368)
@@ -205,7 +205,15 @@
 		
 		recyclingApplication.setSpelling(GB2Alpha.string2Alpha(depart));
 		recyclingApplication.setWbCode(GB2WB.getWBCode(depart));
-		
+		// 设置tousseitem的invoiceplanID
+		List<TousseItem> tousseItems = recyclingApplication.getApplicationItems();
+		if(tousseItems != null){
+			for (TousseItem tousseItem : tousseItems) {
+				if(tousseItem.getInvoicePlanID() == null){
+					tousseItem.setInvoicePlanID(recyclingApplication.getId());
+				}
+			}
+		}
 		objectDao.saveOrUpdate(recyclingApplication);
 	}
 
@@ -551,6 +559,7 @@
 				objectDao.delete(item);
 			}
 		}
+		
 		saveOrUpdate(toSaveRecyclingApplication);
 		if (toSaveRecyclingApplication.getCommittedStatus()) {// 已提交的才在需要
 			addPackingTaskForNoneDisinfectionGoods(toSaveRecyclingApplication,
@@ -611,7 +620,7 @@
 				Long appid = application.getId();
 //				td = tousseDefinitionManager.getTousseDefinitionByNameTypeAndAPPID(tousseName, TousseDefinition.PACKAGE_TYPE_DISINFECTION, appid.toString());
 				td = tousseDefinitionManager.getTousseDefinitionByTousseItem(tousseItem);
-				if(tousseItem.isDisinfection() && td.getForDisplay()){
+				if(tousseItem.isDisinfection() && td!=null && td.getForDisplay()){
 					td = null;// 消毒物品不能直接关联页面上能看到的那个包定义。
 				}
 				if (td == null) {
@@ -2849,6 +2858,8 @@
 							if(!newTousseItem.isDisinfection()){
 								// 这里的包定义是包定义管理看到的包定义，不是实际消毒物品包实例对应的的包定义，所以这里不能设置包定义id
 								newTousseItem.setTousseDefinitionId(td.getId());
+							}else{
+								newTousseItem.setTousseDefinitionId(null);
 							}
 						}
 						newTousseItem.setIsRecycling(td.getIsRecycling());
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r13017 -r13368
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 13017)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 13368)
@@ -930,7 +930,7 @@
 						leftStoreJson.append(",");
 					}
 					TousseDefinition td = tousseDefinitionManager
-							.getTousseDefinitionByName(key);
+							.getTousseDefinitionByTousseItem(tousseItem);
 					
 					JSONObject json = departmentAppTemplateManager.tousseItem2Json(tousseItem,
 							td, tousseDefinitionFloatPercent, true);
@@ -946,7 +946,7 @@
 						rightStoreJson.append(",");
 					}
 					TousseDefinition td = tousseDefinitionManager
-							.getTousseDefinitionByName(key);
+							.getTousseDefinitionByTousseItem(tousseItem);
 					
 					JSONObject json = departmentAppTemplateManager.tousseItem2Json(tousseItem,
 							td, tousseDefinitionFloatPercent,true);