Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r25408 -r25550
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 25408)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 25550)
@@ -928,7 +928,8 @@
 		if (returnGoodsRecord.getId() != null) {
 			throw new RuntimeException("目前不支持退货记录的修改!");
 		}
-		Long invoicePlanId = returnGoodsRecord.getInvoicePlanId();
+		//设置退货记录的处理科室编码为当前用户所属科室编码
+		returnGoodsRecord.setHandleDepartCode(AcegiHelper.getLoginUser().getCurrentOrgUnitCode());
 		// 先保存一次，若重装，装配任务需记下退货记录Id
 		saveOrUpdate(returnGoodsRecord);
 
@@ -994,6 +995,7 @@
 			//更新仓库库存,并设置器械包的仓库信息
 			updateTousseInstanceGoodsStock(newItem);
 		}
+		Long invoicePlanId = returnGoodsRecord.getInvoicePlanId();
 		if(DatabaseUtil.isPoIdValid(invoicePlanId) && CollectionUtils.isNotEmpty(foreignTousseInstanceList)){
 			throw new RuntimeException("暂不支持从申请单退货外来器械!");
 		}
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
===================================================================
diff -u -r25251 -r25550
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 25251)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 25550)
@@ -678,7 +678,6 @@
 			returnTime = new Date();
 		returnGoodsRecord.setReturnTime(returnTime);
 		returnGoodsRecord.setType("器械包");
-		returnGoodsRecord.setHandleDepartCode(AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig());
 		
 		List<ReturnGoodsItem> newReturnTousseItems = new ArrayList<ReturnGoodsItem>();
 		returnGoodsRecord.setReturnGoodsItems(newReturnTousseItems);