Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r15768 -r15771
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15768)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15771)
@@ -370,6 +370,11 @@
 		if(removeClassifyBasketMap.size() > 0){
 			for (Long classifyBasketId : removeClassifyBasketMap.keySet()) {
 				ClassifyBasket classifyBasket = removeClassifyBasketMap.get(classifyBasketId);
+				//验证篮筐是否已经装配过
+				boolean isPacked = packingRecordClassifyBasketManager.classifyPacked(classifyBasket);
+				if(isPacked){
+					throw new RuntimeException(classifyBasket.getContainerName() + "，部分器械已装配不能删除！");
+				}
 				List<WashAndDisinfectRecord> washRecords = classifyBasket.getWashAndDisinfectRecords();
 				//篮筐未关联清洗记录
 				if(washRecords == null || washRecords.size() == 0){
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
===================================================================
diff -u -r15717 -r15771
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 15717)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 15771)
@@ -178,27 +178,35 @@
 				.getParameter("conCurrent");
 		
 		
-		//根据清洗机配置是否可以再同一台清洗机未清洗完就可以重复使用
-		if(Rinser.CONCURRENT_DISABLE.equals(conCurrent)){
-			String disinfectIdentification = washAndDisinfectRecord.getDisinfectIdentification();
-			//验证该清洗机上一次清洗是否已经结束，如果没有，则不允许添加新清洗记录
-			boolean exist = washAndDisinfectRecordManager.validateWashIsEnd(
-					disinfectIdentification, 
-					washAndDisinfectRecord.getStartDate(), 
-					washAndDisinfectRecord.getEndDate());
-			if(exist && washAndDisinfectRecord.getId() == 0){
-				message = JSONUtil.buildJsonObject(false,disinfectIdentification+"正在清洗,不能添加清洗记录。").toString();
-			}else{
+		try {
+			//根据清洗机配置是否可以再同一台清洗机未清洗完就可以重复使用
+			if (Rinser.CONCURRENT_DISABLE.equals(conCurrent)) {
+				String disinfectIdentification = washAndDisinfectRecord
+						.getDisinfectIdentification();
+				//验证该清洗机上一次清洗是否已经结束，如果没有，则不允许添加新清洗记录
+				boolean exist = washAndDisinfectRecordManager
+						.validateWashIsEnd(disinfectIdentification,
+								washAndDisinfectRecord.getStartDate(),
+								washAndDisinfectRecord.getEndDate());
+				if (exist && washAndDisinfectRecord.getId() == 0) {
+					message = JSONUtil.buildJsonObject(false,
+							disinfectIdentification + "正在清洗,不能添加清洗记录。")
+							.toString();
+				} else {
+					washAndDisinfectRecordManager
+							.saveOrUpdateWashAndDisinfectRecordAndMaterials(
+									washAndDisinfectRecord,
+									classifyBasketInfoMap, materials);
+				}
+			} else {
 				washAndDisinfectRecordManager
-				.saveOrUpdateWashAndDisinfectRecordAndMaterials(
-						washAndDisinfectRecord, classifyBasketInfoMap, materials);
+						.saveOrUpdateWashAndDisinfectRecordAndMaterials(
+								washAndDisinfectRecord, classifyBasketInfoMap,
+								materials);
 			}
-		}else{
-			washAndDisinfectRecordManager
-			.saveOrUpdateWashAndDisinfectRecordAndMaterials(
-					washAndDisinfectRecord, classifyBasketInfoMap, materials);
+		} catch (Exception e) {
+			message = JSONUtil.buildJsonObject(false, e.getMessage()).toString();
 		}
-		
 		HttpServletResponse httpServletResponse = StrutsParamUtils
 				.getResponse();
 		httpServletResponse.setCharacterEncoding("UTF-8");