Redeem 1 år sedan
förälder
incheckning
eb610368e5

+ 1 - 0
src/main/java/com/steerinfo/dil/config/RequestFilter.java

@@ -94,6 +94,7 @@ public class RequestFilter implements Filter {
                params.put("dilCompanyList",dilCompanyListObject);
                params.put("rootCompanyMap",rootCompanyMapObject);
                params.put("accessToken",accessToken);
+               log.info("url:"+url);
                log.info("params:"+params.toJSONString());
                //将新的RequestBody写入新的请求对象保存
                ServletRequest requestWrapper = new RequestWrapper(httpRequest, params.toJSONString());

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

@@ -772,4 +772,23 @@ public class AMScontroller  extends BaseRESTfulController {
     public RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map) {
         return amsFeign.saleDispatchList(map);
     }
+
+    @ApiOperation(value = "批量新增发运通知单", notes = "批量新增发运通知单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/saleAddPl")
+    public RESTfulResult saleAddPl(@RequestBody Map<String, Object> map) {
+        return amsFeign.saleAddPl(map);
+    }
+
+
+    @ApiOperation(value = "打印获取退货重量", notes = "打印获取退货重量")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/getMoney/{id}")
+    public RESTfulResult getMoney(@PathVariable String id) {
+        return amsFeign.getprintstr(id);
+    }
 }

+ 15 - 0
src/main/java/com/steerinfo/dil/controller/ReportController.java

@@ -43,4 +43,19 @@ public class ReportController {
                                       Integer pageSize){
         return reportFeign.getFactoryCarNum(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
     }
+
+    @ApiOperation(value="展示型钢汽运销售去向")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getDestination")
+    Map<String, Object> getDestination(@RequestBody(required=false) HashMap<String,Object> mapValue,
+                                      Integer apiId,
+                                      Integer pageNum,
+                                      Integer pageSize){
+        return reportFeign.getDestination(mapValue == null ? new HashMap<>() : mapValue,apiId,pageNum,pageSize);
+    }
 }

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

@@ -229,6 +229,14 @@ public class TMSController extends BaseRESTfulController {
         return tmsFeign.saleDispatchOrder(map);
     }
 
+    @ApiOperation(value = "批量销售派发运输订单")
+    @ApiImplicitParam(name = "map", value = "JSON格式数据", required = true, dataType = "Map<String, Object>")
+    @PostMapping(value = "/saleDispatchOrderList")
+    @LogAround(foreignKeys = {"transOrderId"}, foreignKeyTypes = {"运输订单"})
+    public Map<String, Object> saleDispatchOrderList(@RequestBody(required = false) Map<String, Object> map) {
+        return tmsFeign.saleDispatchOrderList(map);
+    }
+
     @ApiOperation(value = "查询销售运输订单")
     @PostMapping("/getSaleTransOrderList")
     public Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,

+ 6 - 1
src/main/java/com/steerinfo/dil/feign/AmsFeign.java

@@ -275,11 +275,16 @@ public interface AmsFeign {
     @PostMapping(value = "api/v1/ams/amstransrequirements/saleUpdate")
     RESTfulResult saleUpdate(@RequestBody Map<String, Object> map);
 
-
     @PostMapping(value = "api/v1/ams/amstransrequirements/saleDispatchList")
     RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map);
 
     @PostMapping(value = "api/v1/ams/amstransrequirements/amsTransRequirementcorn")
     RESTfulResult amsTransRequirementcorn();
 
+    @PostMapping(value = "api/v1/ams/amstransrequirements/saleAddPl")
+    RESTfulResult saleAddPl(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements//getMoney/{id}")
+    RESTfulResult getprintstr(@PathVariable String id);
+
 }

+ 6 - 0
src/main/java/com/steerinfo/dil/feign/ReportFeign.java

@@ -22,4 +22,10 @@ public interface ReportFeign {
                                          @RequestParam Integer apiId,
                                          @RequestParam  Integer pageNum,
                                          @RequestParam  Integer pageSize);
+
+    @PostMapping(value = "api/v1/report/destination/getDestination")
+    Map<String, Object> getDestination(@RequestBody(required = false) HashMap<String, Object> map,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam  Integer pageNum,
+                                      @RequestParam  Integer pageSize);
 }

+ 3 - 0
src/main/java/com/steerinfo/dil/feign/TmsFeign.java

@@ -93,6 +93,9 @@ public interface TmsFeign {
     @PostMapping("api/v1/tms/omstransorders/saleDispatchOrder")
     Map<String, Object> saleDispatchOrder(@RequestBody(required = false) Map<String, Object> map);
 
+    @PostMapping("api/v1/tms/omstransorders/saleDispatchOrderList")
+    Map<String, Object> saleDispatchOrderList(@RequestBody(required = false) Map<String, Object> map);
+
     @PostMapping("api/v1/tms/omstransorders/getSaleTransOrderList")
     Map<String, Object> getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,  @RequestParam Integer apiId,
                                               @RequestParam Integer pageNum,