Index: forgon-core/src/main/java/com/forgon/log/dwr/table/LogTableManager.java
===================================================================
diff -u -r12331 -r16404
--- forgon-core/src/main/java/com/forgon/log/dwr/table/LogTableManager.java	(.../LogTableManager.java)	(revision 12331)
+++ forgon-core/src/main/java/com/forgon/log/dwr/table/LogTableManager.java	(.../LogTableManager.java)	(revision 16404)
@@ -9,6 +9,7 @@
 import org.apache.commons.lang.StringUtils;
 
 import com.forgon.component.grid.GridManager;
+import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.log.jmesatable.assembler.LogTable;
 import com.forgon.log.model.Log;
 import com.forgon.log.service.LogManager;
@@ -62,4 +63,9 @@
 	public String findLogs(Map<String, List<String>> parameterMap){
 		return gridManager.renderGrid(parameterMap, Log.class.getSimpleName(), null,null);
 	}
+	
+	public void log(String model, String fun, String details) {
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), model, fun,
+				details.toString());
+	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js
===================================================================
diff -u -r16382 -r16404
--- ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js	(.../auxiliaryInvoiceForm.js)	(revision 16382)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/auxiliaryInvoiceForm.js	(.../auxiliaryInvoiceForm.js)	(revision 16404)
@@ -11,6 +11,7 @@
 			if(record != null){
 				record.set('added',false);
 			}
+			sendDeleteScannedGoodsLog(rows[i].data);
 		}
 	}
 }
@@ -793,6 +794,7 @@
 }
 function addTousse(){
 	var rows = top.Ext.getCmp('auxiliaryInvoice_sendOutGoodsDetail').getSelectionModel().getSelections();// 返回值为
+	var addTousses = [];
 	if (rows) {
 		for ( var i = 0; i < rows.length; i++) {
 //			var name = rows[i].data['name'];
@@ -825,11 +827,16 @@
 			
 			addOneTousse(rows[i]);
 			rows[i].set('added',true);
+			addTousses.push(goods);
 		}
+		if(addTousses.length > 0){
+			addSendGoodsLog(addTousses);
+		}
 		auxiliaryInvoice_refreshTotalAmount();
 		top.Ext.getCmp('auxiliaryInvoice_sendOutGoodsDetail').getSelectionModel().clearSelections();
 	}
 }
+
 function addOneTousse(r){
 	var tousse = r.data;
 	var goods = getSendOutGoodsByBarcode(tousse.barcode);
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java
===================================================================
diff -u -r16386 -r16404
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 16386)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/action/InvoiceAction.java	(.../InvoiceAction.java)	(revision 16404)
@@ -1741,6 +1741,13 @@
 		}
 		return goodsList;
 	}
+	
+	/**
+	 * 界面上操作 
+	 * 
+	 * 2014-9-4
+	 * forgonvoid
+	 */
 
 	
 	/**
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.jsp
===================================================================
diff -u -r16146 -r16404
--- ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.jsp	(.../customInvoiceForm.jsp)	(revision 16146)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.jsp	(.../customInvoiceForm.jsp)	(revision 16404)
@@ -54,6 +54,7 @@
 <!-- 紧急度 -->
 <script src="${ctx}/disinfectsystem/common/urgency.js"></script>
 <script type="text/javascript" src="customInvoiceForm.js"></script>
+<script type="text/javascript" src="invoice.js"></script>
 
 <script type="text/javascript">
     var SSTS_DeviceMaintenance_Create = true;
Index: forgon-core/src/main/java/com/forgon/log/action/LogAction.java
===================================================================
diff -u -r15864 -r16404
--- forgon-core/src/main/java/com/forgon/log/action/LogAction.java	(.../LogAction.java)	(revision 15864)
+++ forgon-core/src/main/java/com/forgon/log/action/LogAction.java	(.../LogAction.java)	(revision 16404)
@@ -1,6 +1,9 @@
 package com.forgon.log.action;
 
 import org.apache.commons.lang.StringUtils;
+import org.apache.struts2.convention.annotation.Action;
+import org.apache.struts2.convention.annotation.Namespace;
+import org.apache.struts2.convention.annotation.ParentPackage;
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.vo.LoginUserData;
@@ -13,6 +16,9 @@
  * 
  * 2009-3-28 下午04:12:43
  */
+@ParentPackage(value = "default")
+@Namespace(value = "/disinfectSystem")
+@Action(value = "logAction")
 public class LogAction {
 	private Log log;
 	private LogManager appLogManager;
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r16386 -r16404
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 16386)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 16404)
@@ -95,6 +95,7 @@
 			var amount =  rows[i].data['count'];
 			sendOutGoodsStore.remove(rows[i]);
 			updateAmount1(name,amount);
+			sendDeleteScannedGoodsLog(rows[i].data);
 		}
 	}
 }
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r16395 -r16404
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 16395)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 16404)
@@ -1132,6 +1132,8 @@
 	 * @param barcodeObjMap
 	 */
 	private List<SubmitInvoiceItem> parseParameters(JSONArray jsonArrayInvoiceItems,SubmitInvoiceContext submitInvoiceContext) {
+		JSONObject invoiceLog = new JSONObject();
+		JSONArray invoiceItemsLogInfo = new JSONArray();
 		List<SubmitInvoiceItem> submitInvoiceItems = new LinkedList<SubmitInvoiceItem>();
 		DisposableGoodsServiceContext disposableGoodsServiceContext = submitInvoiceContext.getDisposableGoodsServiceContext();
 		for (int i = 0; i < jsonArrayInvoiceItems.size(); i++) {
@@ -1196,7 +1198,14 @@
 			}else{
 				
 			}
+			JSONObject invoiceItemLogInfo = new JSONObject();
+			invoiceItemLogInfo.put("barcode", barcode);
+			invoiceItemLogInfo.put("amount", amount);
+			invoiceItemsLogInfo.add(invoiceItemLogInfo);
 		}
+		invoiceLog.put("invoiceItems", invoiceItemsLogInfo);
+		// 记录发货提交的条码和数量
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), "发货", "发货提交数据", invoiceLog.toString());
 		return submitInvoiceItems;
 	}
 
@@ -3525,6 +3534,7 @@
 				}
 			}
 			JsonObject dataJSONObject = buildJSONObjectForTousseInstance(tousseInstanc);
+			logScannedTousse(dataJSONObject);
 			datasJSONArray.add(dataJSONObject);
 		}
 		return datasJSONArray;
@@ -3540,6 +3550,12 @@
 		return resultTousseInstanceList;
 	}
 	
+	private void logScannedTousse(JsonObject dataJSONObject){
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), "发货", "发货扫描数据", dataJSONObject.toString());
+	}
+	private void logScannedTousses(JsonArray datasJSONArray){
+		appLogManager.saveLog(AcegiHelper.getLoginUser(), "发货", "发货扫描数据", datasJSONArray.toString());
+	}
 	/**
 	 * 根据固定条码的包实例获取能发货的包实例
 	 * @param fixedBarcodeTousseInstance
@@ -3741,7 +3757,9 @@
 					result.addProperty("success", true);
 					result.addProperty("barcode", barcode);
 					result.addProperty("type", "tousseInstance");
-					result.add("data", buildJSONObjectForTousseInstance(tousseInstance));
+					JsonObject dataJSONObject = buildJSONObjectForTousseInstance(tousseInstance);
+					result.add("data", dataJSONObject);
+					logScannedTousse(dataJSONObject);
 		//				result.addProperty("type", "tousseInstanceList");
 		//				result.add("fixedBarcodeInfo", getFixedBarcodeInfo(tousseInstance, resultTousseInstanceList));
 		//				result.add(
@@ -3764,7 +3782,9 @@
 					result.addProperty("success", true);
 					result.addProperty("barcode", barcode);
 					result.addProperty("type", "tousseInstance");
-					result.add("data", buildJSONObjectForTousseInstance(tousseInstance));
+					JsonObject dataJSONObject = buildJSONObjectForTousseInstance(tousseInstance);
+					result.add("data", dataJSONObject);
+					logScannedTousse(dataJSONObject);
 	//				result.addProperty("type", "tousseInstanceList");
 	//				result.add("fixedBarcodeInfo", getFixedBarcodeInfo(tousseInstance, resultTousseInstanceList));
 	//				result.add(
@@ -3810,7 +3830,9 @@
 				result.addProperty("success", true);
 				result.addProperty("barcode", barcode);
 				result.addProperty("type", "tousseInstance");
-				result.add("data", buildJSONObjectForTousseInstance(tousseInstance));
+				JsonObject dataJSONObject = buildJSONObjectForTousseInstance(tousseInstance);
+				result.add("data", dataJSONObject);
+				logScannedTousse(dataJSONObject);
 				result.add("tips", tips);
 				return result;
 			}else{
@@ -3825,7 +3847,9 @@
 				if(mapResult != null && mapResult.get("result") != null){
 					List<TousseInstance> tousseInstanceList = (List<TousseInstance>)mapResult.get("result");
 					if(CollectionUtils.isNotEmpty(tousseInstanceList)){
-						result.add("data",buildJSONArrayForTousseInstances(tousseInstanceList));
+						JsonArray datasJSONArray = buildJSONArrayForTousseInstances(tousseInstanceList);
+						result.add("data", datasJSONArray);
+						logScannedTousses(datasJSONArray);
 					}else{
 						return buildErrorMsgJsonResult("未找到符合条件的器械包");
 					}
@@ -3868,8 +3892,9 @@
 				result.addProperty("success", true);
 				result.addProperty("barcode", barcode);
 				result.addProperty("type", "tousseInstancesInContainer");
-				result.add("data",
-						buildJSONArrayForTousseInstances(tousseInstances));
+				JsonArray datasJSONArray = buildJSONArrayForTousseInstances(tousseInstances);
+				result.add("data", datasJSONArray);
+				logScannedTousses(datasJSONArray);
 				result.add("tips", tips);
 				return result;
 			}else if(Container.CONTAINER_PURPOSE_VIRTUAL.equals(((Container) barcodeDevice).getPurpose())){
@@ -3905,8 +3930,9 @@
 				result.addProperty("success", true);
 				result.addProperty("barcode", barcode);
 				result.addProperty("type", "tousseInstancesInContainer");
-				result.add("data",
-						buildJSONArrayForTousseInstances(tousseInstances));
+				JsonArray datasJSONArray = buildJSONArrayForTousseInstances(tousseInstances);
+				result.add("data", datasJSONArray);
+				logScannedTousses(datasJSONArray);
 				result.add("tips", tips);
 				return result;
 			}else{
@@ -4197,7 +4223,9 @@
 					result.addProperty("success", true);
 					result.addProperty("barcode", barcode);
 					result.addProperty("type", "tousseInstance");
-					result.add("data", buildJSONObjectForTousseInstance(tousseInstance));
+					JsonObject dataJSONObject = buildJSONObjectForTousseInstance(tousseInstance);
+					result.add("data", dataJSONObject);
+					logScannedTousse(dataJSONObject);
 		//				result.addProperty("type", "tousseInstanceList");
 		//				result.add("fixedBarcodeInfo", getFixedBarcodeInfo(tousseInstance, resultTousseInstanceList));
 		//				result.add(
@@ -4220,7 +4248,9 @@
 					result.addProperty("success", true);
 					result.addProperty("barcode", barcode);
 					result.addProperty("type", "tousseInstance");
-					result.add("data", buildJSONObjectForTousseInstance(tousseInstance));
+					JsonObject dataJSONObject = buildJSONObjectForTousseInstance(tousseInstance);
+					result.add("data", dataJSONObject);
+					logScannedTousse(dataJSONObject);
 	//				result.addProperty("type", "tousseInstanceList");
 	//				result.add("fixedBarcodeInfo", getFixedBarcodeInfo(tousseInstance, resultTousseInstanceList));
 	//				result.add(
@@ -4265,7 +4295,9 @@
 				result.addProperty("success", true);
 				result.addProperty("barcode", barcode);
 				result.addProperty("type", "tousseInstance");
-				result.add("data", buildJSONObjectForTousseInstance(tousseInstance));
+				JsonObject dataJSONObject = buildJSONObjectForTousseInstance(tousseInstance);
+				result.add("data", dataJSONObject);
+				logScannedTousse(dataJSONObject);
 				result.add("tips", tips);
 				return result;
 			}else{
@@ -4281,7 +4313,10 @@
 					List<TousseInstance> tousseInstanceList = (List<TousseInstance>)mapResult.get("result");
 					filterTousseInstanceByInvoiceType(invoiceType, tousseInstanceList);
 					if(CollectionUtils.isNotEmpty(tousseInstanceList)){
-						result.add("data",buildJSONArrayForTousseInstances(tousseInstanceList));
+						JsonArray datasJSONArray = buildJSONArrayForTousseInstances(tousseInstanceList);
+						result.add("data", datasJSONArray);
+						logScannedTousses(datasJSONArray);
+						
 					}else{
 						return buildErrorMsgJsonResult("未找到符合条件的器械包");
 					}
@@ -4332,8 +4367,9 @@
 				result.addProperty("success", true);
 				result.addProperty("barcode", barcode);
 				result.addProperty("type", "tousseInstancesInContainer");
-				result.add("data",
-						buildJSONArrayForTousseInstances(tousseInstances));
+				JsonArray datasJSONArray = buildJSONArrayForTousseInstances(tousseInstances);
+				result.add("data", datasJSONArray);
+				logScannedTousses(datasJSONArray);
 				result.add("tips", tips);
 				return result;
 			}else if(Container.CONTAINER_PURPOSE_VIRTUAL.equals(((Container) barcodeDevice).getPurpose())){
@@ -4370,8 +4406,9 @@
 				result.addProperty("success", true);
 				result.addProperty("barcode", barcode);
 				result.addProperty("type", "tousseInstancesInContainer");
-				result.add("data",
-						buildJSONArrayForTousseInstances(tousseInstances));
+				JsonArray datasJSONArray = buildJSONArrayForTousseInstances(tousseInstances);
+				result.add("data", datasJSONArray);
+				logScannedTousses(datasJSONArray);
 				result.add("tips", tips);
 				return result;
 			}else{
@@ -8132,6 +8169,7 @@
 
 		Set<Long> tousseDefinitionIdSet = new HashSet<Long>();
 		Set<Long> invoicePlanIdSet = new HashSet<Long>();
+		Map<String,JSONObject> tousseDefinitionInfoMap = new HashMap<String, JSONObject>();
 		List<InvoicePlan> invoicePlanList = invoicePlanManager
 				.getInvoicePlanListByOrgUnitCodingsAndTousseType(
 						Arrays.asList(departCode), null, "普通器械包,外来器械包");
@@ -8174,6 +8212,15 @@
 						if (!DatabaseUtil.isPoIdValid(tousseDefinitionId)) {
 							continue;
 						}
+						if(tousseItem.isInsideTousse()){
+							JSONObject jsonObj = tousseDefinitionInfoMap.get(tousseDefinitionId.toString());
+							if(jsonObj == null){
+								jsonObj = new JSONObject();
+								tousseDefinitionInfoMap.put(tousseDefinitionId.toString(), jsonObj);
+							}
+							int totalNotSendAmount = JSONUtil.optInt(jsonObj, "notSendAmount", 0);
+							jsonObj.put("notSendAmount", totalNotSendAmount+totalNotSendAmount);
+						}
 						tousseDefinitionIdSet.add(tousseDefinitionId);
 					}
 				}
@@ -8237,7 +8284,12 @@
 						obj.put("noBiologicalMonitoring", false);
 						obj.put("biologicalMonitoringNoResult", false);
 						obj.put("biologicalMonitoringFail", false);
+						obj.put("notSendAmount", 0);
 						
+						JSONObject jsonObject = tousseDefinitionInfoMap.get(td.getId().toString());
+						if(jsonObject != null){
+							obj.put("notSendAmount", JSONUtil.optInt(jsonObject, "notSendAmount", 0));
+						}
 						JSONObject jsonVo = (JSONObject) biologicalMonitoringInfoObjs.get(barcode);
 						if (jsonVo != null) {
 							String noBiologicalMonitoring = jsonVo.optString("noBiologicalMonitoring");
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.jsp
===================================================================
diff -u -r15436 -r16404
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.jsp	(.../operationReservationInvoiceView.jsp)	(revision 15436)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.jsp	(.../operationReservationInvoiceView.jsp)	(revision 16404)
@@ -32,6 +32,7 @@
 <script type="text/javascript" src="${ctx}/dwr/util.js"></script>
 <script type="text/javascript" src="invoicePrint.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/invoice/operationReservationInvoiceView.js"></script>
+<script type="text/javascript" src="invoice.js"></script>
 
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
===================================================================
diff -u -r16376 -r16404
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 16376)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 16404)
@@ -69,6 +69,7 @@
 <script type="text/javascript" src="invoicePlanExtractedView.js"></script>
 <script type="text/javascript" src="invoicePlanExtractedForm.js"></script>
 <script type="text/javascript" src="auxiliaryInvoiceForm.js"></script>
+<script type="text/javascript" src="invoice.js"></script>
 <script type="text/javascript">
 	var project = '${profile}';
     var SSTS_DeviceMaintenance_Create = true;
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r16055 -r16404
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 16055)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 16404)
@@ -257,6 +257,7 @@
 			var amount =  rows[i].data['count'];
 			sendOutGoodsStore.remove(rows[i]);
 			updateAmount1(name,amount);
+			sendDeleteScannedGoodsLog(rows[i].data);
 		}
 	}
 }
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoice.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoice.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoice.js	(revision 16404)
@@ -0,0 +1,23 @@
+function sendDeleteScannedGoodsLog(goods){
+	Ext.Ajax.request({
+		url : WWWROOT + '/disinfectSystem/logAction!saveLog.do',
+		params : {model : "发货",type:"删除扫描物品",description: Ext.encode(goods)},
+		success : function(response, options) {
+			
+		},
+		failure : function(form, action) {
+		}
+	});
+}
+
+function addSendGoodsLog(goods){
+	Ext.Ajax.request({
+		url : WWWROOT + '/disinfectSystem/logAction!saveLog.do',
+		params : {model : "发货",type:"添加发货物品",description: Ext.encode(goods)},
+		success : function(response, options) {
+			
+		},
+		failure : function(form, action) {
+		}
+	});
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js
===================================================================
diff -u -r15581 -r16404
--- ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 15581)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/customInvoiceForm.js	(.../customInvoiceForm.js)	(revision 16404)
@@ -94,6 +94,7 @@
 			var amount =  rows[i].data['count'];
 			sendOutGoodsStore.remove(rows[i]);
 			updateAmount1(name,amount);
+			sendDeleteScannedGoodsLog(rows[i].data);
 		}
 	}
 }