Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r15864 -r15988
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15864)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15988)
@@ -205,7 +205,16 @@
 		setWashRecordWorkLoadInfo(washRecord);
 		
 		objectDao.saveOrUpdate(washRecord);
-		
+		JSONObject param = getWRRecordMsg(washRecord);
+		if(isNewRecord){
+			appLogManager.saveLog(AcegiHelper.getLoginUser(),
+					Log.MODEL_WASH, "A", "id:" + washRecord.getId() + ",data:"
+							+ param.toString());
+		}else{
+			appLogManager.saveLog(AcegiHelper.getLoginUser(),
+					Log.MODEL_WASH, "U", "id:" + washRecord.getId() + ",data:"
+							+ param.toString());
+		}
 		// 更新装配任务的清洗时间等信息
 		updatePackingTaskWashInfo(washRecord);
 
@@ -502,10 +511,15 @@
 		try {
 			objectDao.excuteSQL(sql1);
 			objectDao.excuteSQL(sql2);
+			Long recordId = washAndDisinfectRecord.getId();
+			String logMsg = "serialNumber : " + washAndDisinfectRecord.getSerialNumber();
 			washAndDisinfectRecord.setWashAndDisinfectMaterials(null);
 			washAndDisinfectRecord.setClassifyBaskets(null);
 			saveOrUpdate(washAndDisinfectRecord);
 			objectDao.delete(washAndDisinfectRecord);
+			appLogManager.saveLog(AcegiHelper.getLoginUser(),
+					Log.MODEL_WASH, "D", "id:" + recordId + ",data:"
+							+ logMsg);
 		} catch (Exception e) {
 			message = "{'success':'false','message':'流水号为:"
 					+ washAndDisinfectRecord.getSerialNumber()
@@ -1151,4 +1165,88 @@
 		}
 		return null;
 	}
+	/**
+	 * 
+	 */
+	private JSONObject getWRRecordMsg(WashAndDisinfectRecord wr){
+		JSONObject params = new JSONObject();
+		if(wr != null){
+			params.put("washAndDisinfectRecordId", wr.getId());
+			params.put("serialNumber", wr.getSerialNumber());
+			params.put("startDate", wr.getStartDateStr());
+			params.put("endDate", wr.getEndDateStr());
+			params.put("washStatus", wr.getWashStatus());
+			params.put("washingMode", wr.getWashingMode());
+			params.put("operator", wr.getOperator());
+			params.put("operatorCode", wr.getOperatorCode());
+			params.put("disinfectIdentification", wr.getDisinfectIdentification());
+			params.put("cycleCounter", wr.getCycleCounter());
+			params.put("washDataAmount", wr.getWashDataAmount());
+			params.put("disinfectProgram", wr.getDisinfectProgram());
+			params.put("orgUnitCoding", wr.getOrgUnitCoding());
+			params.put("generalMaterialAmount", wr.getGeneralMaterialAmount());
+			params.put("operateMaterialAmount", wr.getOperateMaterialAmount());
+			params.put("foreignMaterialAmount", wr.getForeignMaterialAmount());
+			params.put("secondWashForeignAmount", wr.getSecondWashForeignAmount());
+			params.put("disinfectMaterialAmount", wr.getDisinfectMaterialAmount());
+			params.put("washMaterialAmount", wr.getWashMaterialAmount());
+			// 添加器械包信息
+			List<TousseInstance> tis = wr.getTousseInstanceList();
+			JSONArray tousseArray = new JSONArray();
+			if(tis != null && tis.size() > 0){
+				for(TousseInstance ti : tis){
+					JSONObject obj = new JSONObject();
+					obj.put("tousseId", ti.getId());
+					obj.put("name", ti.getTousseName());
+					obj.put("barcode", ti.getBarcode());
+					tousseArray.add(obj);
+				}
+				params.put("TousseInstanceList", tousseArray);
+			}else{
+				params.put("TousseInstanceList", "");
+			}
+			// 添加清洗篮筐信息
+			List<ClassifyBasket> basketList = wr.getClassifyBaskets();
+			JSONArray basketArray = new JSONArray();
+			if(basketList != null && basketList.size()>0){
+				for(ClassifyBasket cb : basketList){
+					JSONObject obj = new JSONObject();
+					obj.put("containerName", cb.getContainerName());
+					obj.put("containerBarcode", cb.getContainerBarcode());
+					Set<ClassifiedItem>  cis = cb.getClassfiedItems();
+					JSONArray cisArray = new JSONArray();
+					if(cis != null && cis.size() > 0){
+						for(ClassifiedItem ci : cis){
+							JSONObject ciObj = new JSONObject();
+							ciObj.put("id", ci.getId());
+							ciObj.put("name", ci.getName());
+							ciObj.put("itemType", ci.getItemType());
+							ciObj.put("amount", ci.getAmount());
+							cisArray.add(ciObj);
+						}
+					}
+					obj.put("ClassfiedItems",cisArray);
+					basketArray.add(obj);
+				}
+				params.put("ClassifyBasketList", basketArray);
+			}else{
+				params.put("ClassifyBasketList", "");
+			}
+			// 添加清洗不入框材料信息
+			List<WashAndDisinfectRecordMaterial> wrMaterils = wr.getWashAndDisinfectMaterials();
+			JSONArray wrMaterilArray = new JSONArray();
+			if(wrMaterils != null && wrMaterils.size() > 0){
+				for(WashAndDisinfectRecordMaterial wrm : wrMaterils){
+					JSONObject wrmObj = new JSONObject();
+					wrmObj.put("id",wrm.getId());
+					wrmObj.put("name", wrm.getMaterialDefinition().getNameSpecification());
+					wrmObj.put("amount", wrm.getAmount());
+					wrMaterilArray.add(wrmObj);
+				}
+			}
+			params.put("WashAndDisinfectRecordMaterials", wrMaterilArray);
+		}
+		
+		return params;
+	}
 }