Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r27878 -r28356
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 27878)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 28356)
@@ -4604,7 +4604,12 @@
                 orgUnitCoding.add(supplyRoomConfig.getOrgUnitCoding());
             }
         }
-        if(!orgUnitCoding.contains(tousseInstance.getLocation())){
+        //如果有做过二次发货的,取二次发货后的包实例所在位置
+        String location = tousseInstance.getLocation_2();
+        if(StringUtils.isBlank(location)){
+        	location = tousseInstance.getLocation();
+        }
+        if(!orgUnitCoding.contains(location)){
             throw new RuntimeException(String.format("只能扫描发货到流转科室的器械包!"));
         }
         String warnMessage = validInvalidDate(tousseInstance);