Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r25473 -r25652
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 25473)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 25652)
@@ -257,6 +257,8 @@
 		}
 		saveOrUpdateWashAndDisinfectRecordAndMaterials_internal(washRecord,
 				classifyBasketInfoMap, materials);
+		// 美雅洁接口处理
+		margeProcess(washRecord);
 	}
 
 	private void saveOrUpdateWashAndDisinfectRecordAndMaterials_internal(
@@ -680,8 +682,6 @@
 				updatePackingTaskAndTousseInstanceWashTime(recordId, orgWashStartTime, orgWashEndTime,startDateStr,endDateStr);
 			}
 		}
-		// 美雅洁接口处理
-		margeProcess(washRecord);
 	}
 	private Map<Long, ClassifyBasket> getClassifyBasketInfoMap(
 			String classifyBasketInfo) {
@@ -712,6 +712,8 @@
 			List<WashAndDisinfectRecordMaterial> materials) {
 		saveOrUpdateWashAndDisinfectRecordAndMaterials_internal(washRecord,
 				classifyBasketInfoMap, materials);
+		// 美雅洁接口处理
+		margeProcess(washRecord);
 	}
 
 	/**