Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.jsp
===================================================================
diff -u -r20032 -r20033
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.jsp	(.../returnDisposableGoodsByInvoicePlan.jsp)	(revision 20032)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.jsp	(.../returnDisposableGoodsByInvoicePlan.jsp)	(revision 20033)
@@ -30,6 +30,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <script type="text/javascript" src="${ctx}/ext/expand/js/RowExpander.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js"></script>
 <script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js"></script>
 <script type="text/javascript" src="${ctx}/js/extUtils.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js
===================================================================
diff -u -r20032 -r20033
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js	(.../returnDisposableGoodsByInvoicePlan.js)	(revision 20032)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js	(.../returnDisposableGoodsByInvoicePlan.js)	(revision 20033)
@@ -1055,10 +1055,16 @@
 							waitMsg : '正在保存数据，请稍候',
 							waitTitle : '提交表单',
 							success : function(form, action) {
+								function goHistory(){
+									top.Ext.getCmp('returnGoodsRecordWin').close();
+									history.go(-1);
+								}
 								if(action.result.success){
 									showResult('保存成功');
 									// 打印为0的批次
-									printZeroStockBatches(action.result);
+									if(printZeroStockBatches(action.result,goHistory)){
+										return;
+									}
 								} else if (action.result.error){
 									showResult(action.result.error);
 								} else if(action.result.errMsg){
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm_common.js
===================================================================
diff -u -r20030 -r20033
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm_common.js	(.../returnGoodsRecordForm_common.js)	(revision 20030)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm_common.js	(.../returnGoodsRecordForm_common.js)	(revision 20033)
@@ -1,15 +1,15 @@
 
 
-function printZeroStockBatches(obj){
+function printZeroStockBatches(obj,funCallBack){
 	if(!sstsConfig.returnGoodsRecordForm_printZeroStockBatches){
-		return;
+		return false;
 	}
 	var batches = obj.zeroStockBatch;
 	if(isUndefinedOrNull(batches)){
-		return;
+		return false;
 	}
 	if(batches.length == 0){
-		return;
+		return false;
 	}
 	var msg = '有'+batches.length+'个批次库存退货之前库存为0，是否打印这些物品批次？'
 	top.Ext.MessageBox.confirm("请确认",msg,function(btn) {
@@ -19,5 +19,9 @@
 				printDiposableGoodsInfo(batch.barcode,batch.showName,batch.expDate,batch.supplierName,batch.batchNumber,0,batch.specification);
 			}
 		}
+		if(funCallBack){
+			funCallBack();
+		}
 	});
+	return true;
 }
\ No newline at end of file