Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js
===================================================================
diff -u -r20577 -r20587
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 20577)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washForTouchScreen.js	(.../washForTouchScreen.js)	(revision 20587)
@@ -132,10 +132,13 @@
 
 //删除整个篮筐
 function deleteBasket(deleteButton){
+	var type = $("#basketsUl").find('.btn').text();
 	$(deleteButton).parent().parent().remove();
 	var ids = $(deleteButton).parent().parent().attr('id');
 	$('#'+ ids +'').remove();
-	toCleanTheBasketDatas(ids);
+	if(type == 'containerStatus'){ //判断是篮筐还是器械包，器械包不加载
+	  toCleanTheBasketDatas(ids);
+	}
 }
 
 //载入待清洗篮筐列表
@@ -229,7 +232,7 @@
 	var person = '责任人:' + personInCharge;
   	basketElement += '<input type="hidden">';
   	basketElement += '<i>';
-  	basketElement += '<a href="javascript:void(0);" class="btn" onclick="deleteBasket(this);">删除</a>';
+  	basketElement += '<a href="javascript:void(0);" class="btn" onclick="deleteBasket(this);">'+ type +'</a>';//删除
   	basketElement += '</i>';
   	basketElement += '<span class="add" onclick="toggleItems(this);"></span>';
   	basketElement += '<font class="basketName">'+ basketName +'</font>';
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r20578 -r20587
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 20578)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 20587)
@@ -187,8 +187,10 @@
 					showResult("该篮筐或清洗架未存放清洗物品");
 				}else if(result=="packed"){
 					showResult("该篮筐内部分物品已装配并打印标签，不能再次清洗！");
+				}else if(result=="nonFixedDarcode"){
+					showResult("该器械包条码已不是固定条码，不能直接进行清洗！");
 				}else if(result=="retrospect"){
-						showResult("此器械包为追溯物品，不能直接进行清洗！");
+						showResult("该器械包为追溯物品，不能直接进行清洗！");
 				}else if (result != null && result != "null") {
 					var tousseCounts = [];
 					var materialCounts = [];
@@ -407,7 +409,7 @@
 			if(!isRetrospectTousse){
 			   showResult("此篮筐为第" + result + "次清洗");
 			}else{
-			   showResult("扫描的为不追溯的器械包！");
+			   showResult("扫描的是器械包固定条码！");
 			}
 		},
 		failure : function(response, options) {
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r20578 -r20587
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 20578)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 20587)
@@ -1710,6 +1710,14 @@
 			TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
 			JSONObject result = new JSONObject();
 			result.put("id", tousseInstance.getId());
+			String sql = " where po.tousseDefinition.id = '" + tousseDefinition.getId() + "'";
+			List<TousseInstance> tousseInstances =  objectDao.findBySql(
+					TousseInstance.class.getSimpleName(), sql);
+			for (TousseInstance instance : tousseInstances) {
+				if(instance.getTousseFixedBarcode() == false){
+				   return JSONUtil.buildErrorMsgJsonResult("此器械包条码已不是固定条码，不能直接清洗！");
+				}
+			}
 			if (TousseDefinition.STR_YES
 					.equals(tousseDefinition.getIsTraceable())){
 				return JSONUtil.buildErrorMsgJsonResult("此器械包为追溯物品，不能直接清洗！");
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
===================================================================
diff -u -r20577 -r20587
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 20577)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 20587)
@@ -786,8 +786,8 @@
 		}
 		return contentStr;
 	}
-
 	@Override
+	@SuppressWarnings("unused")
 	public String loadTousseContent(String barcode,boolean isLoadDefaultCleanMethod) {
 		String contentStr = "";
 		int totalGoodsAmount = 0;
@@ -797,6 +797,14 @@
 					.getBarcodeByBarcode(barcode);
 			TousseInstance tousseInstance = (TousseInstance)barcodeDevice;
 			TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
+			String sql = " where po.tousseDefinition.id = '" + tousseDefinition.getId() + "'";
+			List<TousseInstance> tousseInstances =  objectDao.findBySql(
+					TousseInstance.class.getSimpleName(), sql);
+			for (TousseInstance instance : tousseInstances) {
+				if(instance.getTousseFixedBarcode() == false){
+					return "nonFixedDarcode";
+				}
+			}
 			JSONArray array = new JSONArray();
 			if (TousseDefinition.STR_YES
 					.equals(tousseDefinition.getIsTraceable())){