Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r31122 -r31431
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 31122)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 31431)
@@ -1021,6 +1021,16 @@
 			if(tousseDefinition.isForeignOrSplitTousse()){
 				foreignTousseReturnGoodsItems.add(newItem);
 			}
+			// XKYY-190 PC端的退货功能增加对外部代理灭菌包的支持,不需要显示“是否重装”和“是否重发”
+			if(tousseDefinition.isForeignProxyTousse()){
+				if(newItem.isRepacking()){
+					throw new RuntimeException(tousseDefinition.getTousseType() + "不支持退货重装！");
+				}
+				if(StringUtils.equals("是", newItem.getIsDelivery())){
+					throw new RuntimeException(tousseDefinition.getTousseType() + "不支持退货重发！");
+				}
+			}
+			
 			List<TousseInstance> tousseInstanceList = newItem.getTousseInstanceList();
 			if(CollectionUtils.isEmpty(tousseInstanceList)){
 				throw new SystemException(String.format("请扫描要退货的【%s】的包条码",tousseDefinition.getName()));
@@ -2029,9 +2039,10 @@
 							if (!TousseDefinition.PACKAGE_TYPE_INSIDE
 									.equals(tousseType) && !TousseDefinition.PACKAGE_TYPE_DRESSING
 									.equals(tousseType) && !TousseDefinition.PACKAGE_TYPE_DISINFECTION
-									.equals(tousseType) && !tousseDefinition.isForeignOrSplitTousse()) {
+									.equals(tousseType) && !tousseDefinition.isForeignOrSplitTousse()
+									&& !TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(tousseType)) {
 								// 验证器械包类型
-								throw new RuntimeException("只能退货普通器械包或敷料包或消毒物品或外来器械");
+								throw new RuntimeException("只能退货普通器械包或敷料包或消毒物品或外来器械或外部代理灭菌包");
 							}
 							if (TousseInstance.STATUS_RETURNED
 									.equals(tousseInstance.getStatus())) {
Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java
===================================================================
diff -u -r31114 -r31431
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 31114)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/action/ReturnGoodsRecordAction.java	(.../ReturnGoodsRecordAction.java)	(revision 31431)
@@ -17,7 +17,6 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.FastDateFormat;
 import org.apache.struts2.convention.annotation.Action;
@@ -31,7 +30,6 @@
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseDefinitionUtils;
-import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodBatchStockManager;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
 import com.forgon.disinfectsystem.entity.assestmanagement.ApplicationSpecificationHelper;
@@ -53,7 +51,6 @@
 import com.forgon.tools.MathTools;
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.StrutsResponseUtils;
-import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 import com.forgon.tools.json.JSONUtil;
 import com.forgon.tools.util.StrutsUtils;
@@ -601,7 +598,9 @@
 								+ ";"
 								+ TousseDefinition.PACKAGE_TYPE_DRESSING
 								+ ";"
-								+ TousseDefinition.PACKAGE_TYPE_DISINFECTION);
+								+ TousseDefinition.PACKAGE_TYPE_DISINFECTION
+								+ ";"
+								+ TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY);
 		return tousseDefinition;
 	}
 	/**
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r31145 -r31431
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 31145)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 31431)
@@ -2440,7 +2440,7 @@
 	}
 	
 	/**
-	 * 搜索器械包(器械包类型为器械包、消毒物品、敷料包)，用于退货
+	 * 搜索器械包(器械包类型为器械包、消毒物品、敷料包、外部代理灭菌)，用于退货
 	 * @return
 	 */
 	public void searchComboTousseDataForReturnGoods() {
@@ -2452,7 +2452,7 @@
 			
 			// 只搜索器械包（包含敷料包和消毒物品）
 			String[] searchTousseTypeArray = new String[]{TousseDefinition.PACKAGE_TYPE_INSIDE,
-					TousseDefinition.PACKAGE_TYPE_DRESSING,TousseDefinition.PACKAGE_TYPE_DISINFECTION };
+					TousseDefinition.PACKAGE_TYPE_DRESSING,TousseDefinition.PACKAGE_TYPE_DISINFECTION,TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY };
 			
 			List<Map<String, Object>> mapList = tousseDefinitionManager.searchTousseByKeywordAndTousseTypeArr(
 					spell, searchTousseTypeArray ,false ,false,false,null);