Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r13752 -r13802
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 13752)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 13802)
@@ -150,7 +150,7 @@
 		List<String> excludeTypelist = new ArrayList<String>();
 		excludeTypelist.add(InvoicePlan.TYPE_PROXYDISINFECTION);
 		excludeTypelist.add(InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION);
-		excludeTypelist.add(InvoicePlan.TYPE_SECOND_SUPPLY_ROOM);
+//		excludeTypelist.add(InvoicePlan.TYPE_SECOND_SUPPLY_ROOM);
 		excludeTypelist.add(InvoicePlan.TYPE_APPLYING_FOR_RETURN_FORM);
 		
 		//是否显示外来器械包申请单
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r13755 -r13802
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 13755)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 13802)
@@ -2486,6 +2486,8 @@
 			
 			for(String tdName : tdNamesList){
 				tousseInstances.clear();
+				departmentArray.clear();
+				virtualSeqNumArray.clear();
 				//如果待装配数量小于等于0时跳出循环
 				if(needPackingAmount <= 0){
 					break;
Index: forgon-core/src/main/java/com/forgon/log/model/Log.java
===================================================================
diff -u -r13224 -r13802
--- forgon-core/src/main/java/com/forgon/log/model/Log.java	(.../Log.java)	(revision 13224)
+++ forgon-core/src/main/java/com/forgon/log/model/Log.java	(.../Log.java)	(revision 13802)
@@ -34,6 +34,7 @@
 	public static final String MODEL_BASEDATA = "基础数据";
 	public static final String MODEL_INTERFERE = "干预模块";
 	public static final String MODEL_DISPOSABLEGOODS_WRITEBACK = "一次性物品回写";
+	public static final String MODEL_TOUSSEDEFINITION = "器械包定义";
 	
 	public static final String TYPE_ADD = "A";//添加
 	public static final String TYPE_UPDATE = "U";//修改
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r13800 -r13802
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 13800)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 13802)
@@ -470,6 +470,10 @@
 					|| TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType())){
 				updateOtherEntityTousseName(td.getOrginalName() , td);
 			}
+			//器械包定义名称修改输出到日志
+			appLogManager.saveLog(AcegiHelper.getLoginUser(),
+					Log.MODEL_TOUSSEDEFINITION, Log.TYPE_UPDATE, "id:" + td.getId() + 
+					",oldName:"+ td.getOrginalName() + ",newName:"+ td.getName());
 		}
 		
 		if(ancestorID == null){
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java
===================================================================
diff -u -r12331 -r13802
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java	(.../MaintainAction.java)	(revision 12331)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/action/MaintainAction.java	(.../MaintainAction.java)	(revision 13802)
@@ -7,14 +7,19 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.servlet.http.HttpServletResponse;
+
 import org.apache.commons.collections4.map.MultiValueMap;
 import org.apache.commons.lang.StringUtils;
 import org.apache.struts2.convention.annotation.Action;
 import org.apache.struts2.convention.annotation.Namespace;
 import org.apache.struts2.convention.annotation.ParentPackage;
 import org.hibernate.Query;
+
 import com.forgon.databaseadapter.service.DateQueryAdapter;
+import com.forgon.dataupdater.model.UpdateDataContext;
+import com.forgon.dataupdater.service.DataUpdater;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
@@ -26,6 +31,7 @@
 import com.forgon.disinfectsystem.recyclingapplication.service.InvoicePlanManager;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.hibernate.ObjectDao;
+
 import edu.emory.mathcs.backport.java.util.Collections;
 
 /**
@@ -52,7 +58,12 @@
 	
 	private SupplyRoomConfigManager supplyRoomConfigManager;
 	
+	private DataUpdater dataUpdater;
 	
+	public void setDataUpdater(DataUpdater dataUpdater) {
+		this.dataUpdater = dataUpdater;
+	}
+
 	public void setSupplyRoomConfigManager(
 			SupplyRoomConfigManager supplyRoomConfigManager) {
 		this.supplyRoomConfigManager = supplyRoomConfigManager;
@@ -327,4 +338,14 @@
 	public void addCommonSupplier(){
 		maintainManager.addCommonSupplier();
 	}
+	
+	/**
+	 * 器械包定义去下划线处理方法
+	 * @param updateDataContext
+	 */
+	public void deleteUnderline(){
+		UpdateDataContext updateDataContext = new UpdateDataContext();
+		updateDataContext.setDataUpdater(dataUpdater);
+		maintainManager.UpdateData_4_0_5_4_0_6(updateDataContext);
+	}
 }
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java
===================================================================
diff -u -r12331 -r13802
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java	(.../MaintainManager.java)	(revision 12331)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManager.java	(.../MaintainManager.java)	(revision 13802)
@@ -2,6 +2,7 @@
 
 import java.util.Map;
 
+import com.forgon.dataupdater.model.UpdateDataContext;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
 
 /**
@@ -71,4 +72,10 @@
 	
 	public void addCommonSupplier();
 	
+	/**
+	 * 器械包定义去下划线处理方法
+	 * @param updateDataContext
+	 */
+	public void UpdateData_4_0_5_4_0_6(UpdateDataContext updateDataContext);
+	
 }
Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java
===================================================================
diff -u -r13769 -r13802
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java	(.../MaintainManagerImpl.java)	(revision 13769)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/basic/service/MaintainManagerImpl.java	(.../MaintainManagerImpl.java)	(revision 13802)
@@ -1320,7 +1320,11 @@
 		}
 	}
 	
-	private void UpdateData_4_0_5_4_0_6(UpdateDataContext updateDataContext) {
+	/**
+	 * 器械包定义去下划线处理方法
+	 * @param updateDataContext
+	 */
+	public void UpdateData_4_0_5_4_0_6(UpdateDataContext updateDataContext) {
 		DataUpdater dataUpdater = updateDataContext.getDataUpdater();
 		String msg = null;
 		msg = String