Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r15754 -r15768
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15754)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15768)
@@ -56,6 +56,9 @@
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecordMaterial;
 import com.forgon.disinfectsystem.packingrecordclassifybasket.service.PackingRecordClassifyBasketManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
+import com.forgon.log.model.Log;
+import com.forgon.log.service.LogManager;
+import com.forgon.log.service.LogManagerImpl;
 import com.forgon.security.model.User;
 import com.forgon.security.service.UserManager;
 import com.forgon.serialnumber.model.SerialNum;
@@ -97,6 +100,8 @@
 	
 	private UserManager userManager;
 	
+	private LogManager appLogManager;
+	
 	private PackingRecordClassifyBasketManager packingRecordClassifyBasketManager;
 	
 	public void setPackingRecordClassifyBasketManager(
@@ -108,6 +113,10 @@
 		this.userManager = userManager;
 	}
 
+	public void setAppLogManager(LogManager appLogManager) {
+		this.appLogManager = appLogManager;
+	}
+
 	public void setPositionManager(PositionManager positionManager) {
 		this.positionManager = positionManager;
 	}
@@ -951,9 +960,13 @@
 	}
 	
 	public String getBarcodeInfoForWash(String barcode) {
+		
 		BarcodeDevice barcodeDevice = barcodeManager
 				.getBarcodeByBarcode(barcode);
+		String barcodeType = null;
+		String retString = null;
 		if (barcodeDevice instanceof Rinser) {
+			barcodeType = "清洗机";
 			// 清洗机
 			Rinser rinser = (Rinser) barcodeDevice;
 			JSONBuilder builder = new JSONStringer().object().key("success")
@@ -969,53 +982,65 @@
 						.endObject();
 			}
 			builder.endArray().endObject().endObject();
-			return builder.toString();
+			retString = builder.toString();
 
 		} else if (barcodeDevice instanceof CleanMethod) {
+			barcodeType = "清洗程序";
 			// 清洗程序
 			CleanMethod cleanMethod = (CleanMethod) barcodeDevice;
-			return new JSONStringer().object().key("success").value(true)
+			retString =  new JSONStringer().object().key("success").value(true)
 					.key("barcode").value(barcode).key("type")
 					.value("cleanMethod").key("data").object().key("barcode")
 					.value(cleanMethod.getBarcode()).key("name")
 					.value(cleanMethod.getCleanMethod()).endObject()
 					.endObject().toString();
 
 		} else if (barcodeDevice instanceof Container) {
-			return buildJsonResultForWashContainer((Container) barcodeDevice);
+			barcodeType = "篮筐";
+			retString = buildJsonResultForWashContainer((Container) barcodeDevice);
 		} else if (barcodeDevice instanceof User) {
+			barcodeType = "用户";
 			// 用户
 			User user = (User) barcodeDevice;
 			if(!user.isBelongsToCurrentLoginUserOrgs()){
-				return JSONUtil.buildErrorMsgJsonResult("不能设置为该用户");
+				retString = JSONUtil.buildErrorMsgJsonResult("不能设置为该用户");
+			}else{
+				JsonObject jsonObj = new JsonObject();
+				JsonObject userObj = new JsonObject();
+				jsonObj.addProperty("success", true);
+				jsonObj.addProperty("barcode", barcode);
+				jsonObj.addProperty("type", "user");
+				userObj.addProperty("name", user.getName());
+				userObj.addProperty("fullName", user.getFullName());
+				jsonObj.add("data", userObj);
+				retString = jsonObj.toString();
 			}
-			JsonObject jsonObj = new JsonObject();
-			JsonObject userObj = new JsonObject();
-			jsonObj.addProperty("success", true);
-			jsonObj.addProperty("barcode", barcode);
-			jsonObj.addProperty("type", "user");
-			userObj.addProperty("name", user.getName());
-			userObj.addProperty("fullName", user.getFullName());
-			jsonObj.add("data", userObj);
-			return jsonObj.toString();
+			
 		} else if(barcodeDevice instanceof Position){
+			barcodeType = "位置";
 			Position ps = (Position)barcodeDevice;
 			if(ps.rinserPosition()){
-				return positionManager.getPositionJsonType(ps,true).toString();
+				retString = positionManager.getPositionJsonType(ps,true).toString();
 			}else{
-				return JSONUtil.buildErrorMsgJsonResult("请扫描清洗机的位置!");
+				retString = JSONUtil.buildErrorMsgJsonResult("请扫描清洗机的位置!");
 			}
 		}else {
 			JSONObject json = userManager.user2json(userManager.getUserByBarcode(barcode));
 			if(json != null){
+				barcodeType = "用户";
 				JSONObject jout = JSONUtil.buildJsonObject(true);
 				jout.put("barcode", barcode);
 				jout.put("type", "user");
 				jout.put("data", json);
-				return jout.toString();
+				retString = jout.toString();
+			}else{
+				barcodeType = "错误条码";
+				retString = JSONUtil.buildErrorMsgJsonResult("条码无效");
 			}
-			return JSONUtil.buildErrorMsgJsonResult("条码无效");
 		}
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), "清洗模块", Log.TYPE_ADD,"清洗消毒扫描条码：" 
+		+ barcode + ",条码类型：" + barcodeType, Log.CLIENT_TYPE_ANDROID);
+		return retString;
 	}
 	
 	private String buildJsonResultForWashContainer(Container container) {