销售订单更改

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

@@ -490,7 +490,7 @@ public class AMScontroller{
         return amsFeign.getSaleOrderReported(mapValue,pageNum,pageSize,apiId);
     }
     @PostMapping("getAmsSaleOrderApproved")
-    @ApiOperation(value = "查询汽运单价信息")
+    @ApiOperation(value = "查询财务已审批销售订单信息")
     public Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
@@ -517,7 +517,7 @@ public class AMScontroller{
     }
     @PostMapping("/addAmsSaleOrder")
     Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.addAmsSaleOrder(mapVal);
+        return amsFeign.addAmsSaleOrder(mapVal==null?new HashMap<>():mapVal);
     }
     @PostMapping("getAmsSaleOrderBySaleOrderId")
     Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
@@ -542,7 +542,6 @@ public class AMScontroller{
         }
         return amsFeign.getSaleOrderUpdateLog(saleOrderId,mapValue, pageNum, pageSize, apiId);
     }
-
     @GetMapping(value = "getSalePlanName")
     @ApiOperation(value="获取销售计划名称")
     public Map<String, Object> getSalePlanName(){return amsFeign.getSalePlanName();}
@@ -716,6 +715,23 @@ public class AMScontroller{
 
     //销售订单-固定派单-公开派单-日计划
 
+    @ApiModelProperty(value = "展示销售公司已审核的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "105", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListBySaleCompany")
+    public Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con){
+      return   amsFeign.getSaleOrderListBySaleCompany(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+
 
     //展示销售公司已审核销售订单的车序号列表
     @PostMapping("/getSaleOrderList")

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

@@ -284,6 +284,8 @@ public interface AmsFeign {
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
 
+
+
     /**
      * 下拉框
      * @return
@@ -446,6 +448,15 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId);
 
+
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompany")
+     Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("con") String con);
+
     /**
      * 查询财务已审批销售订单信息
      * @param mapValue