修改

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

@@ -1697,4 +1697,21 @@ public class AMScontroller{
     public Map<String, Object> refuseDispatchSaleOrderList(@RequestBody List<Map<String, Object>> mapList) {
         return amsFeign.refuseDispatchSaleOrderList(mapList);
     }
+
+    @ApiOperation(value="获取零星订单的物资详情")
+    @PostMapping(value = "/getSporadic")
+    public Map<String, Object> getSporadic(Integer sporadicId) {
+        return amsFeign.getSporadic(sporadicId);
+    }
+
+    @ApiOperation(value = "查零星订单物资详情")
+    @PostMapping("/getSporadicOfOrder")
+    public Map<String, Object> getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer sporadicId
+    ) {
+        return amsFeign.getSporadicOfOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,sporadicId);
+    }
 }

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

@@ -2077,4 +2077,18 @@ public class TMSController extends BaseRESTfulController {
 
 
 
+
+
+    @ApiOperation(value="查询零星中转统计报表")
+    @PostMapping("/getLXInwardReport")
+    public Map<String, Object> getLXInwardReport(@RequestBody(required=false) Map<String,Object> mapValue,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String startTime,
+                                           String endTime
+    ){
+        return tmsTruckFeign.getLXInwardReport(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
+    }
+
 }

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

@@ -1538,4 +1538,15 @@ public interface AmsFeign {
 
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/refuseDispatchSaleOrderList")
     Map<String, Object> refuseDispatchSaleOrderList(List<Map<String, Object>> mapList);
+
+    @PostMapping(value = "/api/v1/ams/amstrucksporadicorders/getSporadic")
+    Map<String, Object> getSporadic(@RequestParam Integer sporadicId);
+
+
+    @PostMapping("/api/v1/ams/amstrucksporadicorders/getSporadicOfOrder")
+    Map<String, Object> getSporadicOfOrder(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                        @RequestParam Integer apiId,
+                                                        @RequestParam Integer pageNum,
+                                                        @RequestParam Integer pageSize,
+                                                        @RequestParam Integer sporadicId);
 }

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

@@ -485,6 +485,15 @@ public interface TmsTruckFeign {
 
     @PostMapping("api/v1/truckTms/tmstrucktimetaskresults/JudgeTimeTaskPause")
     Map<String, Object> JudgeTimeTaskPause(@RequestBody Map<String, Object> map);
+
+    @PostMapping("api/v1/truckTms/statisticalReport/getLXInwardReport")
+    Map<String, Object> getLXInwardReport(@RequestBody(required = false) Map<String, Object> mapValue,
+                                     @RequestParam Integer apiId,
+                                     @RequestParam Integer pageNum,
+                                     @RequestParam Integer pageSize,
+                                     @RequestParam String startTime,
+                                     @RequestParam String endTime);
+
 }
 
 

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:localhost:8015}
+    url: ${AMSFEIGN_URL:172.16.33.162:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign:
@@ -22,7 +22,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8008}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.162:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -30,9 +30,9 @@ openfeign:
   WMSFeign:
     url: ${WMSFEIGN_URL:172.16.33.162:8012}
   OMSFeign:
-    url: ${OMSFEIGN_URL:localhost:8016}
+    url: ${OMSFEIGN_URL:172.16.33.166:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
+    url: ${RMSFEIGN_HRL:172.16.33.166:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server: