'销售钢材'

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

@@ -1417,11 +1417,12 @@ public class AMScontroller{
     public Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                   Integer pageNum,
                                                   Integer pageSize,
-                                                  Integer apiId) {
+                                                  Integer apiId,
+                                                  String consigneeSsoId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId,consigneeSsoId);
     }
 
     @ApiOperation(value="查询已上报销售订单信息")
@@ -1429,11 +1430,12 @@ public class AMScontroller{
     Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
-                                               @RequestParam Integer apiId){
+                                               @RequestParam Integer apiId,
+                                               @RequestParam(required = false) String consigneeSsoId){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId);
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId,consigneeSsoId);
     }
 
     @ApiModelProperty(value = "展示销售公司已审核的订单")
@@ -1449,11 +1451,12 @@ public class AMScontroller{
                                                               Integer apiId,
                                                               String con,
                                                               Integer shipperId,
-                                                              Integer saleType
+                                                              Integer saleType,
+                                                              String consigneeSsoId
 //                                                              String startDate,
 //                                                              String endDate
     ){
-        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType);
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con, shipperId,saleType,consigneeSsoId);
     }
 
     @PostMapping("getAmsSaleOrderApprovedes")
@@ -1849,4 +1852,16 @@ public class AMScontroller{
     public RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId) {
         return amsFeign.getAllSaleMessages(saleOrderId);
     }
+
+    @ApiModelProperty(value = "修改承运商授权")
+    @PostMapping("/updateTruckNoCarrier")
+    public Map<String,Object> updateTruckNoCarrier(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.updateTruckNoCarrier(mapValue);
+    }
+
+    @ApiModelProperty(value = "批量上传销售订单")
+    @PostMapping("/uploadSaleOrderList")
+    public Map<String,Object> uploadSaleOrderList(@RequestBody List<Map<String,Object>> saleOrderIdList) {
+        return amsFeign.uploadSaleOrderList(saleOrderIdList);
+    }
 }

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

@@ -1349,7 +1349,8 @@ public interface AmsFeign {
     Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
                                            @RequestParam Integer pageNum,
                                            @RequestParam Integer pageSize,
-                                           @RequestParam Integer apiId);
+                                           @RequestParam Integer apiId,
+                                           @RequestParam(required = false) String consigneeSsoId);
 
     @ApiOperation(value="查询已上报销售订单信息")
     @ApiImplicitParams({
@@ -1359,7 +1360,8 @@ public interface AmsFeign {
     Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
                                                @RequestParam Integer pageNum,
                                                @RequestParam Integer pageSize,
-                                               @RequestParam Integer apiId);
+                                               @RequestParam Integer apiId,
+                                               @RequestParam(required = false) String consigneeSsoId);
 
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
     Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1368,7 +1370,8 @@ public interface AmsFeign {
                                                        @RequestParam("apiId") Integer apiId,
                                                        @RequestParam("con") String con,
                                                        @RequestParam Integer shipperId,
-                                                       @RequestParam(required = false) Integer saleType
+                                                       @RequestParam(required = false) Integer saleType,
+                                                       @RequestParam(required = false) String consigneeSsoId
 //                                                       @RequestParam String startDate,
 //                                                       @RequestParam String endDate
     );
@@ -1633,4 +1636,12 @@ public interface AmsFeign {
     //查询出销售订单下的所有数据
     @PostMapping(value = "/api/v1/ams/amssaleorders/getAllSaleMessages")
     RESTfulResult getAllSaleMessages(@RequestParam Integer saleOrderId);
+
+    // 修改承运商授权
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateTruckNoCarrier")
+    Map<String, Object> updateTruckNoCarrier(@RequestBody Map<String, Object> mapValue);
+
+    // 批量上传销售订单到金蝶
+    @PostMapping(value = "/api/v1/ams/amssaleorders/uploadSaleOrderList")
+    Map<String, Object> uploadSaleOrderList(@RequestBody List<Map<String, Object>> saleOrderIdList);
 }