Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
===================================================================
diff -u -r25589 -r25591
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java	(.../TousseInstanceUtils.java)	(revision 25589)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java	(.../TousseInstanceUtils.java)	(revision 25591)
@@ -225,8 +225,15 @@
 		obj.put("tousseBarcode", instance.getBarcode());
 		
 		obj.put("depart", instance.getDepart());
-		obj.put("locationForDisplay", instance.getLocationForDisplay());
 		
+		String locationForDisplay = instance.getLocationForDisplay();
+		String locationForDisplay2 = instance.getLocationForDisplay2();
+		// 二次发货的位置，返回给客户端最新的位置
+		if (StringUtils.isNotBlank(locationForDisplay2)){
+			locationForDisplay = locationForDisplay2;
+		}
+		obj.put("locationForDisplay", locationForDisplay);
+		
 		obj.put("status", instance.getStatus());
 		obj.put("packer", packer);
 		obj.put("packTime", packTime);