Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API

src/main/java/com/steerinfo/dil/controller/OTMSController.java

@@ -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;
     }
 

src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -808,8 +808,10 @@ public class TMSController extends BaseRESTfulController {
                                                     Integer resultType,
                                                     Integer materialId,
                                                     Integer supplierId,
-                                                    String con) {
-        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,materialId,supplierId, con);
+                                                    String con,
+                                                    String startTime,
+                                                    String endTime) {
+        return tmsTrainFeign.getTmstrainWagonLoad(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, resultType,materialId,supplierId, con,startTime,endTime);
     }
 
 
@@ -1974,7 +1976,7 @@ public class TMSController extends BaseRESTfulController {
                                                       Integer apiId,
                                                       Integer pageNum,
                                                       Integer pageSize,String startTime, String endTime,Integer resultType,String con) {
-        return tmsTrainFeign.getLoadResultToSendMC(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
+        return tmsTrainFeign.getWeightResult(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, resultType,startTime,endTime,con);
     }
 
     @ApiOperation(value = "批量新增计量委托")

src/main/java/com/steerinfo/dil/feign/TmsTrainFeign.java

@@ -33,7 +33,9 @@ public interface TmsTrainFeign {
                                               @RequestParam("resultType") Integer resultType,
                                               @RequestParam("materialId")Integer materialId,
                                               @RequestParam("supplierId")Integer supplierId,
-                                                    @RequestParam("con") String con);
+                                                    @RequestParam("con") String con,
+                                                    @RequestParam("startTime")String startTime,
+                                                    @RequestParam("endTime")String endTime);
 
 
     @PostMapping(value = "api/v1/trainTms/tmstrainloadingresults/insertTmstrainLoadingResult")

src/main/resources/application-prod.yml

@@ -21,7 +21,7 @@ openfeign:
   QmsTruckFeign:
     url: ${QMSTRUCKFEIGN_URL:172.16.33.166:8047}
   TmsTrainFeign:
-    url: ${TMSTRAINFEIGN_URL:localhost:8086}
+    url: ${TMSTRAINFEIGN_URL:172.16.33.166:8086}
   TmsTruckFeign:
     url: ${TMSTRUCKFEIGN_URL:172.16.33.166:8088}
   TmsshipFeign: