Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r25511 -r25516
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 25511)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 25516)
@@ -467,19 +467,9 @@
 		{name : 'id'},
 		{name : 'barcode'},
 		{name : 'name'},
-		{name : 'appRecord'},
-		{name : 'tousseFixedBarcode'},
-		{name : 'showTousseName'},
-		{name : 'diposable'},
 		{name : 'status'},
 		{name : 'depart'},
-		{name : 'batchNumber'}, 
-		{name : 'tousseType'}, 
-		{name : 'typeInfoOnScanned'},
-		{name : 'sterilizerName'}, 
-		{name : 'frequency'},
-		{name : 'isTracable'},
-		{name : 'tousseDefinitionId'}
+		{name : 'batchNumber'}
   ]);
 
 
@@ -544,22 +534,9 @@
 			id : 0,
 			barcode : goods.barcode,
 			name : goods.name,
-			ttsName : goods.ttsName,
-			tousseFixedBarcode : goods.tousseFixedBarcode,
-			showTousseName : goods.showTousseName,
-			scanAmount : goods.scanAmount,
-			diposable : goods.diposable,
 			status : goods.status,
 			depart : goods.depart,
-			batchNumber : goods.batchNumber,
-			tousseType : goods.tousseType,
-			typeInfoOnScanned : goods.typeInfoOnScanned,
-			sterilizerName : goods.sterilizerName,
-			frequency : goods.frequency,
-			isTracable : goods.isTracable,
-			tousseDefinitionId : goods.tousseDefinitionId,
-			externalCode : goods.externalCode,
-			isRoutine : goods.isRoutine
+			batchNumber : goods.batchNumber
 		});
 		sendOutAbnormalGoodsStore.insert(0,newRecord);
 	}
@@ -990,14 +967,16 @@
 			var result = Ext.decode(response.responseText);
 			// 首先处理错误信息
 			if(!isUndefinedOrNullOrEmpty(result.errMsg)){
-				showResult(result.errMsg , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);
-				top.Ext.getCmp('scanText').setValue("");
-				top.Ext.getCmp('scanTextEnd').setValue("");
-				top.Ext.getCmp('scanText').focus();
-				//加入异常物品列表
+					//加入异常物品列表
 				if(result.data[0].barcode != null){
 					addAbnormalGoods(result.data[0]);
 				}
+				
+				showResult(result.errMsg , null , 1);
+				top.Ext.getCmp('scanText').setValue("");
+				top.Ext.getCmp('scanTextEnd').setValue("");
+				top.Ext.getCmp('scanText').focus();
+			
 				return;
 			}
 			if(result.data.length == 0){
@@ -1072,9 +1051,9 @@
 					if(!isUndefinedOrNullOrEmpty(goods.tousseType)){
 						msg = '['+goods.tousseType+']'+'['+getTtsNameByGoods(goods)+']不在发货计划中！';
 					}
-					showResult(msg , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);
 					//加入异常物品列表
 					addAbnormalGoods(goods);
+					showResult(msg , null , 1);
 					continue;
 				}
 				// 唯一条码消毒物品的校验
@@ -1386,20 +1365,9 @@
 				{name : 'id'},
 				{name : 'barcode'},
 				{name : 'name'},
-				{name : 'ttsName'},
-				{name : 'appRecord'},
-				{name : 'showTousseName'},
-				{name : 'scanAmount'},
-				{name : 'tousseInstancesBelongToThisComboTousse'},
-				{name : 'diposable'},
 				{name : 'status'},
 				{name : 'depart'},
-				{name : 'tousseType'},
-				{name : 'tousseFixedBarcode'},
-				{name : 'batchNumber'},
-				{name : 'sterilizerName'},
-				{name : 'frequency'},
-				{name : 'externalCode'}
+				{name : 'batchNumber'}
 			]
 		})
 	});
@@ -1603,12 +1571,7 @@
 			{header : "包状态",dataIndex : 'status',width : 80,  menuDisabled: true},
 	    {header : "回收科室",dataIndex : 'depart',width : 125,  menuDisabled: true},
 	    {header : "name",dataIndex : 'name',hidden : true,menuDisabled: true},
-	    {header : "批次/灭菌日期",dataIndex : 'batchNumber',width : 70,menuDisabled: true},
-	    {header : "灭菌炉名称",dataIndex : 'sterilizerName',width : 200,menuDisabled: true,hidden :true},
-	    {header : "炉次",dataIndex : 'frequency',width : 50,menuDisabled: true,hidden :true},
-	    {id : 'diposable',header : "是否一次性材料",dataIndex : 'diposable',hidden :true,width : 150}
-	   
-	    
+	    {header : "批次/灭菌日期",dataIndex : 'batchNumber',width : 70,menuDisabled: true}
 	]);
 	var cm = new Ext.grid.ColumnModel([
 			{header : "条码",dataIndex : 'barcode',width : 65,menuDisabled: true},
@@ -1657,7 +1620,7 @@
 	function doSaveAction(printInvoiceCallback){
 		var AbnormalGoodsNum = top.Ext.getCmp('sendOutAbnormalGoods').getStore().data.keys;
 		if(AbnormalGoodsNum.length > 0){
-			showResult('请处理完异常物品再提交' , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);
+			showResult('请处理完异常物品再提交' , null , 1);
 			return false;
 		}
 		if (!form.getForm().isValid()) {
@@ -2521,7 +2484,6 @@
 						})
 					})
 				]
-		
 		});
 		
 	
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp
===================================================================
diff -u -r25511 -r25516
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 25511)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.jsp	(.../invoicePlanExtractedView.jsp)	(revision 25516)
@@ -24,8 +24,36 @@
 		background-color: #80ff80;
 	}
 </style>
+	<script type="text/javascript">
+		var project = '${profile}';
+	</script>
+			
+	<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 
-
+	<script type="text/javascript">
+		var returnRecordId = '${param.returnRecordId}';
+		var param_openMode = '${param.openMode}';
+		var param_depart = '${param.depart}';
+		var param_departCode = '${param.departCode}';
+		var fontSize = '${fontSize}';
+	</script>
+</head>
+<body>
+	<script type="text/javascript">	
+			var SSTS_DeviceMaintenance_Create = true;
+			<operation:authorize ifAnyGranted="SSTS_DeviceMaintenance_Create">
+			SSTS_DeviceMaintenance_Create = false;
+			</operation:authorize>
+			var SSTS_DeviceMaintenance_Update = true;
+			<operation:authorize ifAnyGranted="SSTS_DeviceMaintenance_Update">
+			SSTS_DeviceMaintenance_Update = false;
+			</operation:authorize>
+			var SSTS_DeviceMaintenance_Delete = true;
+			<operation:authorize ifAnyGranted="SSTS_DeviceMaintenance_Delete">
+			SSTS_DeviceMaintenance_Delete = false;
+			</operation:authorize>
+	</script>	
+	
 	<%
 		 request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
 
@@ -67,32 +95,6 @@
 		}
 		pageContext.setAttribute("allSterilisationStr", allSterilisationJSONArray.toString());
 	%>
-	<script type="text/javascript">
-		var project = '${profile}';
-			var SSTS_DeviceMaintenance_Create = true;
-			<operation:authorize ifAnyGranted="SSTS_DeviceMaintenance_Create">
-			SSTS_DeviceMaintenance_Create = false;
-			</operation:authorize>
-			var SSTS_DeviceMaintenance_Update = true;
-			<operation:authorize ifAnyGranted="SSTS_DeviceMaintenance_Update">
-			SSTS_DeviceMaintenance_Update = false;
-			</operation:authorize>
-			var SSTS_DeviceMaintenance_Delete = true;
-			<operation:authorize ifAnyGranted="SSTS_DeviceMaintenance_Delete">
-			SSTS_DeviceMaintenance_Delete = false;
-			</operation:authorize>
-	</script>			
-	<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
-
-	<script type="text/javascript">
-			var returnRecordId = '${param.returnRecordId}';
-			var param_openMode = '${param.openMode}';
-			var param_depart = '${param.depart}';
-			var param_departCode = '${param.departCode}';
-			var fontSize = '${fontSize}';
-	</script>
-</head>
-<body>
 	<script type="text/javascript" src="${ctx}/js/common.js"></script>
 	<script type="text/javascript" src="${ctx}/js/Ext2CompUtil.js"></script>
 	<script type="text/javascript" src="${ctx}/js/json3.min.js"></script>
@@ -175,8 +177,5 @@
 
 <input type="hidden" id="userName" value="${userName}">
 
-
-
-
 </body>
 </html>
\ No newline at end of file