luobang 3 年之前
父節點
當前提交
f94365f7d9

+ 11 - 0
src/main/java/com/steerinfo/dil/controller/AMScontroller.java

@@ -1703,4 +1703,15 @@ public class AMScontroller{
     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);
+    }
 }

+ 12 - 0
src/main/java/com/steerinfo/dil/controller/TMSController.java

@@ -2044,4 +2044,16 @@ public class TMSController extends BaseRESTfulController {
     ){
         return tmsTruckFeign.getUnLoading(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, startTime, endTime);
     }
+
+    @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);
+    }
 }

+ 7 - 0
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -1542,4 +1542,11 @@ public interface AmsFeign {
     @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);
 }

+ 9 - 1
src/main/java/com/steerinfo/dil/feign/TmsTruckFeign.java

@@ -469,7 +469,15 @@ public interface TmsTruckFeign {
                                      @RequestParam Integer pageSize,
                                      @RequestParam String startTime,
                                      @RequestParam String endTime);
-    }
+
+    @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);
+}
 
 
 

+ 2 - 2
src/main/resources/application-dev.yml

@@ -22,7 +22,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:172.16.33.162:8004}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:192.168.1.107:8008}
+    url: ${TMSTRUCKFEIGN_URL:192.168.1.118:8008}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:172.16.33.162:8003}
   WMSHFeign:
@@ -32,7 +32,7 @@ openfeign:
   OMSFeign:
     url: ${OMSFEIGN_URL:localhost:8016}
   RmsFeign:
-    url: ${RMSFEIGN_HRL:192.168.1.107:8014}
+    url: ${RMSFEIGN_HRL:192.168.1.118:8014}
   JoinFeign:
     url: ${JOINFEIGN_URL:172.16.33.162:8006}
 server: