Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r20587 -r20601
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 20587)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 20601)
@@ -181,24 +181,25 @@
 			success : function(response, options) {
 				var result = response.responseText;
 				result = result.replace(/\r\n/g, "");
+				var results=result.split(",");
 				if(result=="notUsed"){
 					showResult("该篮筐没有装载物品，不能进行清洗");
 				}else if(result=="notExistItemsUsed"){
 					showResult("该篮筐或清洗架未存放清洗物品");
 				}else if(result=="packed"){
 					showResult("该篮筐内部分物品已装配并打印标签，不能再次清洗！");
 				}else if(result=="nonFixedDarcode"){
-					showResult("该器械包条码已不是固定条码，不能直接进行清洗！");
-				}else if(result=="retrospect"){
-						showResult("该器械包为追溯物品，不能直接进行清洗！");
+					showResult(barcode+"不是固定条码，请扫描固定条码！");
+				}else if(results[0]=="retrospect"){
+						showResult(results[1]+"为追溯的包，不能扫描固定条码！");
 				}else if (result != null && result != "null") {
 					var tousseCounts = [];
 					var materialCounts = [];
 					var repeatedly ;
 					var materialArray = new Array();
-					materialArray = result.split("#@");
-					var array = new Array();
-					array = materialArray[0].split(",");
+				    materialArray = result.split("#@");
+				    var array = new Array();
+				    array = materialArray[0].split(",");
 					var root = top.Ext.getCmp('basketTreePanel').root;
 					var node = root.findChild('id', array[0]);
 					if(!isRetrospectTousse){
@@ -409,7 +410,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 -r20590 -r20601
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 20590)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 20601)
@@ -1710,17 +1710,17 @@
 			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(
+			String sql = "where po.tousseDefinition.id = '"
+					   + tousseDefinition.getId()
+					   + "' and po.unTraceableTousse = 1 and po.tousseFixedBarcode = 1 order by id asc";
+			TousseInstance instance =  (TousseInstance) objectDao.getBySql(
 					TousseInstance.class.getSimpleName(), sql);
-			for (TousseInstance instance : tousseInstances) {
-				if(instance.getTousseFixedBarcode() == false || instance.getStatus() != null){
-				   return JSONUtil.buildErrorMsgJsonResult("此器械包条码已不是固定条码，不能直接清洗！");
-				}
+			if(instance == null){
+				return JSONUtil.buildErrorMsgJsonResult(barcode+"不是固定条码，请扫描固定条码！");
 			}
 			if (TousseDefinition.STR_YES
 					.equals(tousseDefinition.getIsTraceable())){
-				return JSONUtil.buildErrorMsgJsonResult("此器械包为追溯物品，不能直接清洗！");
+				return JSONUtil.buildErrorMsgJsonResult(tousseDefinition.getName()+"为可追溯的包，不能扫描固定条码！");
 			}
 			JSONObject tousseJSONObj = new JSONObject();
 			tousseJSONObj.put("barcode", tousseInstance.getBarcode());
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
===================================================================
diff -u -r20590 -r20601
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 20590)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 20601)
@@ -797,18 +797,19 @@
 					.getBarcodeByBarcode(barcode);
 			TousseInstance tousseInstance = (TousseInstance)barcodeDevice;
 			TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
-			String sql = " where po.tousseDefinition.id = '" + tousseDefinition.getId() + "'";
-			List<TousseInstance> tousseInstances =  objectDao.findBySql(
+			String sql = "where po.tousseDefinition.id = '"
+					   + tousseDefinition.getId()
+					   + "' and po.unTraceableTousse = 1 and po.tousseFixedBarcode = 1 order by id asc";
+			TousseInstance instance =  (TousseInstance) objectDao.getBySql(
 					TousseInstance.class.getSimpleName(), sql);
-			for (TousseInstance instance : tousseInstances) {
-				if(instance.getTousseFixedBarcode() == false || instance.getStatus() != null){
-					return "nonFixedDarcode";
-				}
+			if(instance == null){
+				return "nonFixedDarcode";
 			}
 			JSONArray array = new JSONArray();
 			if (TousseDefinition.STR_YES
 					.equals(tousseDefinition.getIsTraceable())){
-				return "retrospect";
+				String content = "retrospect" + "," + tousseDefinition.getName();
+				return content;
 			}
 			List<MaterialInstance> materialInstances = tousseInstance.getTousseDefinition().getMaterialInstances();
 			for(MaterialInstance materialInstance : materialInstances ){
@@ -831,10 +832,8 @@
 						.getCleanMethodByName(tousseDefinition.getCleanMethod());
 				if (cleanMethod != null
 						&& cleanMethod.getCleanMinutes() != null) {
-					
 					object.put("cleanMinutes", cleanMethod.getCleanMinutes());
 				}
-
 				isLoadDefaultCleanMethod = false;// 只需要一个清洗程序即可
 			}
 			for (int i=0;i<array.size();i++){