'销售权限'

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

@@ -1085,8 +1085,8 @@ public class AMScontroller{
 
     @ApiOperation(value="抢单/接收订单锁定")
     @PostMapping("/lockDispatchSaleOrder")
-    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,Integer carrierId) {
-        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierId);
+    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,String carrierSsoId) {
+        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierSsoId);
     }
 
     @ApiOperation(value="查询app端承运商已抢到的单")
@@ -1101,8 +1101,8 @@ public class AMScontroller{
                                                            Integer apiId,
                                                            Integer pageNum,
                                                            Integer pageSize,
-                                                           String carrierSSOId){
-        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierSSOId);
+                                                           String carrierSsoId){
+        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierSsoId);
     }
 
     //获取到站名称
@@ -1138,8 +1138,9 @@ public class AMScontroller{
                                                       Integer pageSize,
                                                       Integer apiId,
                                                       Integer dispatchType,
+                                                      @RequestParam String carrierSsoId,
                                                       String con) {
-        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType, con);
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId, con);
     }
 
     @ApiModelProperty(value = "展示批次信息")
@@ -1377,6 +1378,24 @@ public class AMScontroller{
         return amsFeign.issueTruckNo(mapList);
     }
 
+    @ApiOperation(value = "展示车序号下的物资详情")
+    @PostMapping("/getTruckNoMaterialList")
+    public RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId) {
+        return amsFeign.getTruckNoMaterialList(saleOrderMaterialId);
+    }
+
+    @ApiOperation(value = "展示销售订单下的物资详情")
+    @PostMapping("/getSaleMaterialList")
+    public RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId) {
+        return amsFeign.getSaleMaterialList(saleOrderId);
+    }
+
+    @ApiOperation(value = "展示销售派单物资信息")
+    @PostMapping("/getDispatchMaterialList")
+    public RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId) {
+        return amsFeign.getDispatchMaterialList(dispatchId);
+    }
+
     @ApiOperation(value="销售新增定向派单且直接下发")
     @PostMapping("/addDispatchSaleOrder")
     public Map<String,Object> addDispatchSaleOrder(@RequestBody Map<String,Object> mapValue) {
@@ -1498,36 +1517,11 @@ public class AMScontroller{
 
 
     //*******************************下拉框************************
+
+
     @GetMapping("getNoticeTypeId")
     @ApiOperation(value = "得到公告类型Id")
     public Map<String,Object> getNoticeTypeId(){
         return amsFeign.getNoticeTypeId();
     }
-
-
-    @ApiOperation(value = "展示车序号下的物资详情")
-    @PostMapping(value = "/getTruckNoMaterialList")
-    public RESTfulResult getTruckNoMaterialList(@RequestParam Integer saleOrderMaterialId) {
-        return amsFeign.getTruckNoMaterialList(saleOrderMaterialId);
-    }
-
-    @ApiOperation(value = "展示销售派单下的物资详情")
-    @PostMapping(value = "/getDispatchMaterialList")
-    public RESTfulResult getDispatchMaterialList(@RequestParam Integer dispatchId) {
-        return amsFeign.getDispatchMaterialList(dispatchId);
-    }
-
-
-    /**
-     * 展示销售订单下的物资详情
-     * @param saleOrderId
-     * @return
-     */
-    @ApiOperation(value="展示销售订单下的物资详情")
-    @PostMapping(value = "/getSaleMaterialList")
-    public RESTfulResult getSaleMaterialList(@RequestParam Integer saleOrderId){
-        return amsFeign.getSaleMaterialList(saleOrderId);
-    }
-
-
 }

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

@@ -596,7 +596,7 @@ public interface AmsFeign {
                                                    @RequestParam("apiId") Integer apiId,
                                                    @RequestParam("pageNum") Integer pageNum,
                                                    @RequestParam("pageSize") Integer pageSize,
-                                                   @RequestParam("carrierSSOId") String carrierSSOId);
+                                                   @RequestParam("carrierSsoId") String carrierSsoId);
 
     /**
      * 新增销售订单物资信息
@@ -1151,7 +1151,7 @@ public interface AmsFeign {
     @ApiOperation(value="抢单/接收订单锁定")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrder")
     Map<String, Object> lockDispatchSaleOrder(@RequestParam Integer dispatchId,
-                                              @RequestParam Integer carrierId);
+                                              @RequestParam String carrierSsoId);
 
     @ApiOperation(value="查询app端承运商已抢到的单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
@@ -1170,6 +1170,7 @@ public interface AmsFeign {
                                                       @RequestParam Integer pageSize,
                                                       @RequestParam Integer apiId,
                                                       @RequestParam Integer dispatchType,
+                                                      @RequestParam String carrierSsoId,
                                                       @RequestParam String con) ;
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getPurchaseIdByBatch")