“修改报表”

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

@@ -2021,6 +2021,58 @@ public class TMSController extends BaseRESTfulController {
     }
 
 
+    @ApiOperation(value="获取内转报表")
+    @PostMapping("/getInwardList")
+    public Map<String, Object> getInwardList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        String startTime,
+                                                        String endTime,
+                                                        String orgCode) {
+        if (mapValue!=null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getInwardList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode);
+    }
+
+
+
+
+
+    @ApiOperation(value="获取采购订单报表")
+    @PostMapping("/getPurchaseOrderList")
+    public Map<String, Object> getPurchaseOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String startTime,
+                                             String endTime,
+                                             String orgCode) {
+        if (mapValue!=null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getPurchaseOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode);
+    }
+
+
+
+    @ApiOperation(value="获取销售订单列表")
+    @PostMapping("/getSaleOrderList")
+    public Map<String, Object> getSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    String startTime,
+                                                    String endTime,
+                                                    String orgCode) {
+        if (mapValue!=null){
+            mapValue=new HashMap<>();
+        }
+        return tmsTruckFeign.getSaleOrderList(mapValue,apiId,pageNum,pageSize,startTime,endTime,orgCode);
+    }
+
+
     @PostMapping("/sendMeasureCommission")
     public Map<String, Object> sendMeasureCommission(@RequestBody(required = false) Map<String, Object> map){
         return  tmsTruckFeign.sendMeasureCommission(map);

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

@@ -626,6 +626,35 @@ public interface TmsTruckFeign {
     @ApiOperation(value = "获取收货作业照片")
     @PostMapping("/api/v1/truckTms/tmstruckreceiptresults/getReceivingPhotoByUrl")
     public Map<String,Object> getReceivingPhotoByUrl(@RequestParam String orderNumber);
+
+
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getInwardList")
+    Map<String, Object> getInwardList(@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);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getPurchaseOrderList")
+    Map<String, Object> getPurchaseOrderList(@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);
+
+    @PostMapping("/api/v1/truckTms/statisticalReport/getSaleOrderList")
+    Map<String, Object> getSaleOrderList(@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);
 }
 
 

src/main/resources/application-dev.yml

@@ -10,7 +10,7 @@ openfeign:
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
   AmsFeign:
-    url: ${AMSFEIGN_URL:172.16.33.162:8015}
+    url: ${AMSFEIGN_URL:localhost:8015}
   BmsshipFeign:
     url: ${BMSSHIPFEIGN_URL:172.16.33.162:8007}
   BmstrainFeign: