Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r19508 -r20030
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 19508)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 20030)
@@ -728,6 +728,46 @@
 		return saveForReturnDiposableGoods_internal(returnGoodsRecord);
 	}
 	
+	private JSONArray convertToPrintInfo(
+			Set<DisposableGoodsBatchStock> zeroStockBatch) {
+		Set<Long> disposableGoodsBatchIds = new HashSet<Long>();
+		for (DisposableGoodsBatchStock disposableGoodsBatchStock : zeroStockBatch) {
+			if (disposableGoodsBatchStock.getDisposableGoodsBatchId() != null) {
+				disposableGoodsBatchIds.add(disposableGoodsBatchStock
+						.getDisposableGoodsBatchId());
+			}
+		}
+		JSONArray batchs = new JSONArray();
+		Date date = new Date();
+		for (Long id : disposableGoodsBatchIds) {
+
+			DisposableGoodsBatch disposableGoodsBatch = diposableGoodsManager
+					.getDisposableGoodsBatchById(Long.valueOf(id));
+			if (disposableGoodsBatch == null) {
+				continue;
+			}
+			DisposableGoods diposableGoods = disposableGoodsBatch
+					.getDiposableGoods();
+			if (diposableGoods == null) {
+				continue;
+			}
+			JSONObject obj = new JSONObject();
+			String expDate = disposableGoodsBatch.getExpDateStr();
+			// 更新打印状态
+			disposableGoodsBatch.setHasPrinted(Constants.STR_YES);
+			disposableGoodsBatch.setPrintTime(date);
+			diposableGoodsManager.saveOrUpdate(disposableGoodsBatch);
+			obj.put("showName", diposableGoods.getShowName());
+			obj.put("specification", diposableGoods.getSpecification());
+			obj.put("barcode", disposableGoodsBatch.getBarcode());
+			obj.put("expDate", expDate);
+			obj.put("supplierName", disposableGoodsBatch.getSupplierName());
+			obj.put("batchNumber", disposableGoodsBatch.getBatchNumber());
+			
+			batchs.add(obj);
+		}
+		return batchs;
+	}
 	private Map<String,Object> saveForReturnDiposableGoods_internal(ReturnGoodsRecord returnGoodsRecord){
 		String depart = returnGoodsRecord.getDepart();
 		Long warehouseID = returnGoodsRecord.getWarehouseID();
@@ -755,7 +795,7 @@
 		Map<Long, DisposableGoodsBatch> idToDisposableGoodsBatchMap = new HashMap<Long, DisposableGoodsBatch>();
 		Map<Long, DisposableGoodsBatchStock> idToDisposableGoodsBatchStockMap = new HashMap<Long, DisposableGoodsBatchStock>();
 		Map<Long, DisposableGoodsIdentification> idToIdentificationMap = new HashMap<Long, DisposableGoodsIdentification>();
-		
+		Set<DisposableGoodsBatchStock> zeroStockBatch = new HashSet<DisposableGoodsBatchStock>();
 		List<DiposableGoodsItem> returnDiposableGoodsItems = new LinkedList<DiposableGoodsItem>();// 退货明细
 		summaryReturnDiposableGoodsInfo(returnGoodsRecord, disposableGoodsIDsSet, disposableGoodsStockIDsSet, expensiveDisposablegoodsIdsSet,disposableGoodsBatchIDsSet, disposableGoodsBatchStockIDsSet, disposableGoodsBatchNumberSet, disposableGoodsBarcodesSet, identificationIDsSet);
 		// 锁定一次性物品
@@ -790,6 +830,9 @@
 					disposableGoodsStorageAdjustVoTotalList.addAll(disposableGoodsStorageAdjustVoList);
 				}
 			}else{
+				if(disposableGoodsBatchStock.getStorage() == 0){
+					zeroStockBatch.add(disposableGoodsBatchStock);
+				}
 				// 页面传过来的数量为申领规格数量，此处还原为最小单位数量
 				returnGoodsItem.setAmount(Integer.valueOf(ApplicationSpecificationHelper.calculateAmount(returnGoodsItem.getAmount(), disposableGoods.getTransferScale())));
 				List<DisposableGoodsStorageAdjustVo> disposableGoodsStorageAdjustVoList = returnDiposableGoods(warehouseID,depart,returnGoodsItem,idToDisposableGoodsMap,disposableGoodsIDToDisposableGoodsStockMap,idToDisposableGoodsStockMap,idToDisposableGoodsBatchMap,idToDisposableGoodsBatchStockMap,returnDiposableGoodsItems);
@@ -842,6 +885,7 @@
 			}
 		}
 		returnMsg.put("success", true);
+		returnMsg.put("zeroStockBatch", convertToPrintInfo(zeroStockBatch));
 		if(true){
 //			throw new RuntimeException("速度测试!");
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r19293 -r20030
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 19293)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 20030)
@@ -1200,6 +1200,8 @@
 							success : function(form, action) {
 								if(action.result.success){
 									showResult('保存成功');
+									// 打印为0的批次
+									printZeroStockBatches(action.result);
 								} 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
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm_common.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm_common.js	(revision 20030)
@@ -0,0 +1,23 @@
+
+
+function printZeroStockBatches(obj){
+	if(!sstsConfig.returnGoodsRecordForm_printZeroStockBatches){
+		return;
+	}
+	var batches = obj.zeroStockBatch;
+	if(isUndefinedOrNull(batches)){
+		return;
+	}
+	if(batches.length == 0){
+		return;
+	}
+	var msg = '有'+batches.length+'个批次库存退货之前库存为0，是否打印这些物品批次？'
+	top.Ext.MessageBox.confirm("请确认",msg,function(btn) {
+		if(btn=='yes') {
+			for(var i=0;i<batches.length;++i){
+				var batch = batches[i];
+				printDiposableGoodsInfo(batch.barcode,batch.showName,batch.expDate,batch.supplierName,batch.batchNumber,0,batch.specification);
+			}
+		}
+	});
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js
===================================================================
diff -u -r20000 -r20030
--- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 20000)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js	(.../config.js)	(revision 20030)
@@ -1,4 +1,4 @@
-var sstsConfig = {
+var sstsConfig = {
   //洗手护士巡回护士能否不填
   useRecordCircuitNurseAllowBlank : true,
   useRecordWashHandNurseAllowBlank : true,
@@ -229,6 +229,8 @@
   washClassifyTypeFastClearing : true,
   // 隐藏未打印的一次性物品申请单，默认为false
   hideUnprintedDisposableGoodsInvoicePlan: true,
+  //
+  returnGoodsRecordForm_printZeroStockBatches: true,
   //禁用供应室领用记录删除(防止因删除导致回写结果不准确)
   disableReceiveRecordDelete : true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp
===================================================================
diff -u -r15567 -r20030
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp	(.../returnGoodsRecordView.jsp)	(revision 15567)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordView.jsp	(.../returnGoodsRecordView.jsp)	(revision 20030)
@@ -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>
@@ -46,10 +47,12 @@
 <script type="text/javascript" src="${ctx}/ext/fontSize${fontSize}/treepanel/ColumnNodeUI.js"></script>
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/fontSize${fontSize}/treepanel/resources/css/column-tree.css" />
 <script type="text/javascript" src="returnGoodsRecordView.js"></script>
+<script type="text/javascript" src="returnGoodsRecordForm_common.js"></script>
 <script type="text/javascript" src="returnGoodsRecordForm.js"></script>
 <!-- 打印函数 -->
 <script language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/print/printConfig.js" /></script>
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"/>
 <script type="text/javascript" src="${ctx }/ext/ext_datefield/Datetime.js"></script>