Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java
===================================================================
diff -u -r21082 -r21173
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 21082)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java	(.../GodownEntryManagerImpl.java)	(revision 21173)
@@ -397,6 +397,10 @@
 			}
 			objectDao.update(godownEntryItem);// 更新item
 		}
+		//若是调拨入库单则记录日志
+		if(GodownEntry.SUBTYPE_MOVE_IN.equals(entry.getSubType())){
+			saveLogAppropriateEntry(entry);
+		}
 		return newDisposableGoodsStorageAdjustVoList;
 	}
 	
@@ -1651,7 +1655,10 @@
 				entry.setTargetOrgUnitCode(wareHouse.getOrgUnitCode());
 				entry.setTargetOrgUnitName(wareHouse.getOrgUnitName());
 			}
+			//保存调拨单
 			save(entry);
+			//记录调拨单日志
+			saveLogAppropriateEntry(entry);
 			
 			GodownEntry inEntry = clone(entry);
 			inEntry.setId(null);
@@ -1871,7 +1878,10 @@
 			godownEntryItem.setDiposableGoods(disposableGoodsStock);// 和一次性物品库存关联
 			objectDao.update(godownEntryItem);
 		}
-		
+		//如果调拨出库则记录调拨出库记录
+		if(GodownEntry.SUBTYPE_MOVE_OUT.equals(entry.getSubType())){
+			saveLogAppropriateEntry(entry);
+		}
 		//如果需要回写为true，这时才回写
 		if(needWriteBack){
 			// 回写物资系统
@@ -2848,5 +2858,39 @@
 			jsonObj.put("message", e.getMessage());
 		}
 	}
-
+	
+	//调拨单/调拨入库/调拨出库保存日志
+	private void saveLogAppropriateEntry(GodownEntry entry){
+		List<GodownEntryItem> godownEntryItemList = entry.getItemsList();
+		JSONArray entoryItemJsonArry = new JSONArray();
+		for (GodownEntryItem godownEntryItem : godownEntryItemList) {
+			JSONObject Item = new JSONObject();
+			DisposableGoods disposableGoods = diposableGoodsManager.get(godownEntryItem.getDisposableGoodsID());
+			if(disposableGoods!=null){
+			Item.put("名称", disposableGoods.getName());
+			Item.put("规格", disposableGoods.getSpecification());
+			}
+			Item.put("数量", godownEntryItem.getAmount());
+			Item.put("批次", godownEntryItem.getBatchNumber());
+			Item.put("单价", godownEntryItem.getCost());
+			
+			entoryItemJsonArry.add(Item);
+		}
+		String entrySubType = entry.getSubType();//子类型
+		String operationDescription = "";
+		//子类型为调拨入库/调拨出库若无则调拨单
+		if(StringUtils.isNotEmpty(entrySubType)){
+			 operationDescription = entrySubType+":(单号="+entry.getSerialNumber()+"),"+
+					 							"(仓库="+entry.getWarehouseName()+"),"+
+					 							"(物品明细="+entoryItemJsonArry.toString()+")";
+		}else{
+			 operationDescription = "调拨单:(单号="+entry.getSerialNumber()+"),"+
+					 					"(出库仓库="+entry.getTargetOrgUnitName()+"),"+
+					 					"(入库仓库="+entry.getTargetWareHouseName()+"),"+
+					 					"(物品明细="+entoryItemJsonArry.toString()+")";
+		}
+		//保存日志
+		logger.debug(operationDescription);
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), Log.MODEL_DISPOSABLEGOODS,Log.TYPE_ADD,operationDescription);	
+	}
 }