|
@@ -181,6 +181,10 @@ public class OTMSController {
|
|
|
@PostMapping("/getReceivingPhotoByUrl")
|
|
|
public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber) throws Exception {
|
|
|
Map<String,Object> map=otmsFeign.getReceivingPhotoByUrl(orderNumber);
|
|
|
+ if(map==null){
|
|
|
+ map =new HashMap<>();
|
|
|
+ return map;
|
|
|
+ }
|
|
|
if(map.containsKey("resultEmptyContainerPhoto") && map.get("resultEmptyContainerPhoto")!=null){
|
|
|
String resultEmptyContainerPhoto = (String) imageFileUtils.downloadFile(map.get("resultEmptyContainerPhoto").toString());
|
|
|
map.put("resultEmptyContainerPhoto",resultEmptyContainerPhoto);
|
|
@@ -206,6 +210,7 @@ public class OTMSController {
|
|
|
String resultSignedNotePhoto =(String) imageFileUtils.downloadFile(map.get("otherPhoto3").toString());
|
|
|
map.put("otherPhoto3",resultSignedNotePhoto);
|
|
|
}
|
|
|
+
|
|
|
return map;
|
|
|
}
|
|
|
|