Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r37486 -r37574
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 37486)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 37574)
@@ -507,6 +507,162 @@
 
 }
 
+//FSSDERMYY-28：保存一次性物品退货
+function saveReturnGoodsFunction(saveType){
+	if (!form.getForm().isValid()) {
+		showResult('请正确填写表单各值');
+		return false;
+	}
+
+	if (returnGoodsItemStore.getCount() < 1) {
+		showResult('退货详细信息列表不能为空');
+		return false;
+	}
+	top.Ext.MessageBox.confirm("请确认", "是否保存" + entityName + "信息？", function (btn) {
+		if (btn == 'yes') {
+
+			//获取grid数据
+			getReturnGoodsDetailGridData();
+			top.Ext.getCmp("depart").enable();
+			var departCoding = top.Ext.getCmp("departCoding").getValue();
+
+			if (isShowStoreCodeCombo(departCoding)) {
+				top.Ext.getCmp("storeCode").setRawValue(top.Ext.getCmp("storeCode").getValue());  //后台存倉庫編碼
+			} else {
+				top.Ext.getCmp("storeCode").setRawValue('');
+			}
+
+			form.form.submit({
+				url: WWWROOT + '/disinfectSystem/returnGoodsRecordAction!saveReturnGoodsRecord.do',
+				method: 'POST',
+				waitMsg: '正在保存数据，请稍候',
+				waitTitle: '提交表单',
+				success: function (form, action) {
+					if (action.result.success) {
+						showResult('保存成功');
+						if(saveType == 1){
+							printReturnGoodsFunction();
+						}else {
+							// 打印为0的批次
+							printZeroStockBatches(action.result);
+						}
+						grid.dwrReload();
+						top.Ext.getCmp('returnGoodsRecordWin').close();
+					} else if (action.result.error) {
+						showResult(action.result.error);
+					} else if (action.result.errMsg) {
+						showResult(action.result.errMsg);
+					} else {
+						showResult('保存失败');
+					}
+				},
+				failure: function (form, action) {
+					top.Ext.getCmp("depart").disable();// 禁止修改科室
+					if (action.result.error) {
+						showResult(action.result.error);
+					} else if (action.result.errMsg) {
+						showResult(action.result.errMsg);
+					} else {
+						showResult('保存失败');
+					}
+				}
+			});
+		}
+	});
+}
+
+//FSSDERMYY-28：打印一次性物品退货
+function printReturnGoodsFunction(){
+	var title = "";
+	DWREngine.setAsync(false);
+	SupplyRoomConfigTableManager.getStartTimeObject(function (config) {
+		if (config != null) {
+			title = config.unitName;
+		}
+	});
+	DWREngine.setAsync(true);
+	var operator = top.Ext.getCmp('operator').getValue();
+	var returnTime = new Date(top.Ext.getCmp('returnTime').getValue()).format('Y-m-d');
+	var depart = top.Ext.getCmp('depart').getValue();
+	var totalMoney = top.Ext.getCmp('totalMoney').getValue();
+	var remark = top.Ext.getCmp('remark').getValue();
+	var returnGoodsItems = getReturnGoodsDetailGridDataToPrint();
+	printReturnGoodsRecord(title, operator, returnTime, depart, totalMoney, remark, returnGoodsItems, 0);
+}
+
+//FSSDERMYY-28：保存器械包退货
+function saveReturnTousseFunction(saveType){
+	top.Ext.MessageBox.confirm("请确认", "是否保存" + entityName + "信息？", function (btn) {
+		if (btn == 'yes') {
+			if (!form.getForm().isValid()) {
+				showResult('请正确填写表单各值');
+				return false;
+			}
+			// 校验申请科室是否有问题
+			if (!isDepartValid()) {
+				showResult('申请科室不一致！');
+				return false;
+			}
+
+			//获取tree columns数据
+			var returnTousseItems = getReturnTousseDetailGridData2();
+
+			if (returnTousseItems.length == 0) {
+				showResult('退货详细信息列表不能为空');
+				return false;
+			}
+			var returnTousseItemStr = top.Ext.encode(returnTousseItems);
+			top.Ext.getCmp('returnTousseItemStr').setValue(returnTousseItemStr);
+			form.form.submit({
+				url: WWWROOT + '/disinfectSystem/returnGoodsRecordAction!saveReturnTousseRecord.do',
+				method: 'POST',
+				waitMsg: '正在保存数据，请稍候',
+				waitTitle: '提交表单',
+				success: function (form, action) {
+					if (action.result.success) {
+						if(saveType == 1){
+							printReturnTousseFunction();
+						}
+						grid.dwrReload();
+						top.Ext.getCmp('returnTousseRecordWin').close();
+					} else if (action.result.message) {
+						showResult(action.result.message);
+					} else {
+						showResult('保存失败');
+					}
+				},
+				failure: function (form, action) {
+					if (action.result.error) {
+						showResult(action.result.error);
+					} else if (action.result.message) {
+						showResult(action.result.message);
+					} else {
+						showResult('保存失败');
+					}
+				}
+			});
+		}
+	});
+}
+
+//FSSDERMYY-28：打印器械包退货
+function printReturnTousseFunction(){
+	var title = "";
+	DWREngine.setAsync(false);
+	SupplyRoomConfigTableManager.getStartTimeObject(function (config) {
+		if (config != null) {
+			title = config.unitName;
+		}
+	});
+	DWREngine.setAsync(true);
+	var operator = top.Ext.getCmp('operator').getValue();
+	var returnTime = new Date(top.Ext.getCmp('returnTime').getValue()).format('Y-m-d');
+	var depart = top.Ext.getCmp('depart').getValue();
+	var remark = top.Ext.getCmp('remark').getValue();
+	var returnTousseItems = getReturnTousseDetailGridData(false);
+	printReturnTousseRecord(title, operator, returnTime, depart, remark, returnTousseItems, 0);
+}
+
 // 清空批次和价格
 function clearBatchNumberAndPrice() {
 	diposableGoodsBatchNumStore.removeAll();
@@ -1315,86 +1471,21 @@
 		}],
 		buttonAlign: 'center',
 		buttons: [{
-			text: '打印',
+			text: id?'打印':'保存并打印',
 			handler: function () {
-				var title = "";
-				DWREngine.setAsync(false);
-				SupplyRoomConfigTableManager.getStartTimeObject(function (config) {
-					if (config != null) {
-						title = config.unitName;
-					}
-				});
-				DWREngine.setAsync(true);
-				var operator = top.Ext.getCmp('operator').getValue();
-				var returnTime = new Date(top.Ext.getCmp('returnTime').getValue()).format('Y-m-d');
-				var depart = top.Ext.getCmp('depart').getValue();
-				var totalMoney = top.Ext.getCmp('totalMoney').getValue();
-				var remark = top.Ext.getCmp('remark').getValue();
-				var returnGoodsItems = getReturnGoodsDetailGridDataToPrint();
-				printReturnGoodsRecord(title, operator, returnTime, depart, totalMoney, remark, returnGoodsItems, 0);
+				if(id){
+					printReturnGoodsFunction();
+				}else {
+					saveReturnGoodsFunction(1);
+				}
 			}
 		}, {
 			text: '保存',
 			id: 'saveBtn',
 			hidden: SSTS_ReturnGoodsRecord_Create && SSTS_ReturnGoodsRecord_Update,
 			disabled: !enableBtn,
 			handler: function () {
-				if (!form.getForm().isValid()) {
-					showResult('请正确填写表单各值');
-					return false;
-				}
-
-				if (returnGoodsItemStore.getCount() < 1) {
-					showResult('退货详细信息列表不能为空');
-					return false;
-				}
-				top.Ext.MessageBox.confirm("请确认", "是否保存" + entityName + "信息？", function (btn) {
-					if (btn == 'yes') {
-
-						//获取grid数据
-						getReturnGoodsDetailGridData();
-						top.Ext.getCmp("depart").enable();
-						var departCoding = top.Ext.getCmp("departCoding").getValue();
-
-						if (isShowStoreCodeCombo(departCoding)) {
-							top.Ext.getCmp("storeCode").setRawValue(top.Ext.getCmp("storeCode").getValue());  //后台存倉庫編碼
-						} else {
-							top.Ext.getCmp("storeCode").setRawValue('');
-						}
-
-						form.form.submit({
-							url: WWWROOT + '/disinfectSystem/returnGoodsRecordAction!saveReturnGoodsRecord.do',
-							method: 'POST',
-							waitMsg: '正在保存数据，请稍候',
-							waitTitle: '提交表单',
-							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) {
-									showResult(action.result.errMsg);
-								} else {
-									showResult('保存失败');
-								}
-								grid.dwrReload();
-								top.Ext.getCmp('returnGoodsRecordWin').close();
-							},
-							failure: function (form, action) {
-								top.Ext.getCmp("depart").disable();// 禁止修改科室
-								if (action.result.error) {
-									showResult(action.result.error);
-								} else if (action.result.errMsg) {
-									showResult(action.result.errMsg);
-								} else {
-									showResult('保存失败');
-								}
-							}
-						});
-					}
-				});
+				saveReturnGoodsFunction(0);
 			}
 		}, {
 			text: '取消',
@@ -2253,77 +2344,21 @@
 		}],
 		buttonAlign: 'center',
 		buttons: [{
-			text: '打印',
+			text: id?'打印':'保存并打印',
 			handler: function () {
-				var title = "";
-				DWREngine.setAsync(false);
-				SupplyRoomConfigTableManager.getStartTimeObject(function (config) {
-					if (config != null) {
-						title = config.unitName;
-					}
-				});
-				DWREngine.setAsync(true);
-				var operator = top.Ext.getCmp('operator').getValue();
-				var returnTime = new Date(top.Ext.getCmp('returnTime').getValue()).format('Y-m-d');
-				var depart = top.Ext.getCmp('depart').getValue();
-				var remark = top.Ext.getCmp('remark').getValue();
-				var returnTousseItems = getReturnTousseDetailGridData(false);
-				printReturnTousseRecord(title, operator, returnTime, depart, remark, returnTousseItems, 0);
+				if(id){
+					printReturnTousseFunction();
+				}else {
+					saveReturnTousseFunction(1);
+				}
 			}
 		}, {
 			text: '保存',
 			id: 'saveBtn',
 			hidden: SSTS_ReturnGoodsRecord_Create && SSTS_ReturnGoodsRecord_Update,
 			disabled: !enableBtn,
 			handler: function () {
-				top.Ext.MessageBox.confirm("请确认", "是否保存" + entityName + "信息？", function (btn) {
-					if (btn == 'yes') {
-						if (!form.getForm().isValid()) {
-							showResult('请正确填写表单各值');
-							return false;
-						}
-						// 校验申请科室是否有问题
-						if (!isDepartValid()) {
-							showResult('申请科室不一致！');
-							return false;
-						}
-
-						//获取tree columns数据
-						var returnTousseItems = getReturnTousseDetailGridData2();
-
-						if (returnTousseItems.length == 0) {
-							showResult('退货详细信息列表不能为空');
-							return false;
-						}
-						var returnTousseItemStr = top.Ext.encode(returnTousseItems);
-						top.Ext.getCmp('returnTousseItemStr').setValue(returnTousseItemStr);
-						form.form.submit({
-							url: WWWROOT + '/disinfectSystem/returnGoodsRecordAction!saveReturnTousseRecord.do',
-							method: 'POST',
-							waitMsg: '正在保存数据，请稍候',
-							waitTitle: '提交表单',
-							success: function (form, action) {
-								if (action.result.success) {
-									grid.dwrReload();
-									window.close();
-								} else if (action.result.message) {
-									showResult(action.result.message);
-								} else {
-									showResult('保存失败');
-								}
-							},
-							failure: function (form, action) {
-								if (action.result.error) {
-									showResult(action.result.error);
-								} else if (action.result.message) {
-									showResult(action.result.message);
-								} else {
-									showResult('保存失败');
-								}
-							}
-						});
-					}
-				});
+				saveReturnTousseFunction(0)
 			}
 		}, {
 			text: '发货',