Index: ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java
===================================================================
diff -u -r18101 -r18110
--- ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 18101)
+++ ssts-returngoods/src/main/java/com/forgon/disinfectsystem/returngoodsrecord/service/ReturnGoodsRecordManagerImpl.java	(.../ReturnGoodsRecordManagerImpl.java)	(revision 18110)
@@ -1815,6 +1815,18 @@
 			List<TousseInstance> list = objectDao.findBySql(TousseInstance.class.getSimpleName(), String.format(" where po.invoice_id=%s and po.status in('%s','%s')", invoice.getId(),TousseInstance.STATUS_SHIPPED,TousseInstance.STATUS_SIGNED));
 			if(list != null){
 				for (TousseInstance tousseInstance : list) {
+					TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
+					if(tousseDefinition == null){
+						continue;
+					}
+					String tousseType = tousseDefinition.getTousseType();
+					if (!TousseDefinition.PACKAGE_TYPE_INSIDE
+							.equals(tousseType) && !TousseDefinition.PACKAGE_TYPE_DRESSING
+							.equals(tousseType) && !TousseDefinition.PACKAGE_TYPE_DISINFECTION
+							.equals(tousseType)) {
+						// 验证器械包类型,只能退货普通器械包或敷料包或消毒物品
+						continue;
+					}
 					String name = tousseInstance.getShowTousseName();
 					List<TousseInstance> list2 = nameToTousseListMap.get(name);
 					if(list2 == null){