修改

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

@@ -2022,18 +2022,20 @@ public class TMSController extends BaseRESTfulController {
 
 
     @ApiOperation(value="获取内转报表")
-    @PostMapping("/getInwardList")
-    public Map<String, Object> getInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+    @PostMapping("/getPurchaseInwardList")
+    public Map<String, Object> getPurchaseInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                         Integer apiId,
                                                         Integer pageNum,
                                                         Integer pageSize,
                                                         String startTime,
                                                         String endTime,
-                                                        String orgCode) {
-        if (mapValue!=null){
+                                                        String orgCode,
+                                                        String isPage,
+                                                        String index) {
+        if (mapValue==null){
             mapValue=new HashMap<>();
         }
-        return tmsTruckFeign.getInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode);
+        return tmsTruckFeign.getPurchaseInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
     }
 
 
@@ -2048,11 +2050,32 @@ public class TMSController extends BaseRESTfulController {
                                              Integer pageSize,
                                              String startTime,
                                              String endTime,
-                                             String orgCode) {
-        if (mapValue!=null){
+                                             String orgCode,
+                                                    String isPage,
+                                                    String index) {
+        if (mapValue==null){
             mapValue=new HashMap<>();
         }
-        return tmsTruckFeign.getPurchaseOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode);
+        return tmsTruckFeign.getPurchaseOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
+    }
+
+
+
+    @ApiOperation(value="获取采购订单报表")
+    @PostMapping("/getInwardInFactory")
+    public Map<String, Object> getInwardInFactory(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String startTime,
+                                                    String endTime,
+                                                    String orgCode,
+                                                    String isPage,
+                                                  String index) {
+        if (mapValue==null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardInFactory(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
     }
 
 
@@ -2065,11 +2088,13 @@ public class TMSController extends BaseRESTfulController {
                                                     Integer pageSize,
                                                     String startTime,
                                                     String endTime,
-                                                    String orgCode) {
-        if (mapValue!=null){
+                                                    String orgCode,
+                                                    String isPage,
+                                                   String index) {
+        if (mapValue==null){
             mapValue=new HashMap<>();
         }
-        return tmsTruckFeign.getSaleOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode);
+        return tmsTruckFeign.getSaleOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode,isPage,index);
     }
 
 

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

@@ -629,14 +629,16 @@ public interface TmsTruckFeign {
 
 
 
-    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardList")
-    Map<String, Object> getInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseInwardList")
+    Map<String, Object> getPurchaseInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
                                       @RequestParam("apiId") Integer apiId,
                                       @RequestParam("pageNum") Integer pageNum,
                                       @RequestParam("pageSize") Integer pageSize,
                                       @RequestParam("startTime") String startTime,
                                       @RequestParam("endTime") String endTime,
-                                      @RequestParam("orgCode") String orgCode);
+                                      @RequestParam("orgCode") String orgCode,
+                                      @RequestParam("isPage") String isPage,
+                                      @RequestParam("index") String index);
 
     @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseOrderList")
     Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -645,7 +647,9 @@ public interface TmsTruckFeign {
                                               @RequestParam("pageSize") Integer pageSize,
                                               @RequestParam("startTime") String startTime,
                                               @RequestParam("endTime") String endTime,
-                                              @RequestParam("orgCode") String orgCode);
+                                              @RequestParam("orgCode") String orgCode,
+                                              @RequestParam("isPage") String isPage,
+                                             @RequestParam("index") String index);
 
     @PostMapping("/api/v1/truckTms/statisticalReport/getSaleOrderList")
     Map<String, Object> getSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -654,7 +658,20 @@ public interface TmsTruckFeign {
                                          @RequestParam("pageSize") Integer pageSize,
                                          @RequestParam("startTime") String startTime,
                                          @RequestParam("endTime") String endTime,
-                                         @RequestParam("orgCode") String orgCode);
+                                         @RequestParam("orgCode") String orgCode,
+                                         @RequestParam("isPage") String isPage,
+                                         @RequestParam("index") String index);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardInFactory")
+    Map<String, Object> getInwardInFactory(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam("apiId") Integer apiId,
+                                           @RequestParam("pageNum") Integer pageNum,
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("startTime") String startTime,
+                                           @RequestParam("endTime") String endTime,
+                                           @RequestParam("orgCode") String orgCode,
+                                           @RequestParam("isPage") String isPage,
+                                           @RequestParam("index") String index);
 }
 
 

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: