Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

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

@@ -1189,9 +1189,8 @@ 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,carrierSsoId, con);
+                                                      @RequestParam String carrierSsoId) {
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType,carrierSsoId);
     }
 
     @ApiModelProperty(value = "展示批次信息")
@@ -1364,12 +1363,11 @@ public class AMScontroller{
                                          Integer apiId,
                                          Integer pageNum,
                                          Integer pageSize,
-                                         Integer issueStatus,
-                                         String con){
+                                         Integer issueStatus){
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus,con);
+        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus);
     }
 
     @PostMapping("getSaleOrderInfoes")
@@ -1651,4 +1649,10 @@ public class AMScontroller{
     public Map<String, Object> getBenPrice(@RequestBody Map<String,Object> map){
         return amsFeign.getBenPrice(map);
     }
+
+    @ApiOperation(value="批量拒绝定向派单")
+    @PostMapping(value = "/refuseDispatchSaleOrderList")
+    public Map<String, Object> refuseDispatchSaleOrderList(@RequestBody List<Map<String, Object>> mapList) {
+        return amsFeign.refuseDispatchSaleOrderList(mapList);
+    }
 }

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

@@ -1202,8 +1202,7 @@ public interface AmsFeign {
                                                       @RequestParam Integer pageSize,
                                                       @RequestParam Integer apiId,
                                                       @RequestParam Integer dispatchType,
-                                                      @RequestParam String carrierSsoId,
-                                                      @RequestParam String con) ;
+                                                      @RequestParam String carrierSsoId) ;
 
     @PostMapping("/api/v1/ams/amstruckinwardrequirement/getPurchaseIdByBatch")
     Map<String, Object> getPurchaseIdByBatch(@RequestBody(required = false) Map<String,Object> mapValue,
@@ -1323,8 +1322,7 @@ public interface AmsFeign {
                                  @RequestParam Integer apiId,
                                  @RequestParam Integer pageNum,
                                  @RequestParam Integer pageSize,
-                                 @RequestParam Integer issueStatus,
-                                 @RequestParam String con);
+                                 @RequestParam Integer issueStatus);
 
 
     @ApiOperation(value="查询未上报的销售订单信息")
@@ -1511,4 +1509,7 @@ public interface AmsFeign {
 
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getBenPrice")
     Map<String, Object> getBenPrice(@RequestBody Map<String, Object> map);
+
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/refuseDispatchSaleOrderList")
+    Map<String, Object> refuseDispatchSaleOrderList(List<Map<String, Object>> mapList);
 }

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -147,7 +147,7 @@
         FROM (
                  SELECT
                         RC.CAPACITY_ID        "capacityId",
-                        RC.CARRIER_ID         "carrierId",
+                        RCC.CARRIER_ID         "carrierId",
                         RC.CAPACITY_NUMBER     "capacityNumber",
                         RCA.CARRIER_NAME       "carrierName",
                         RC.INSERT_UPDATE_REMARK "remark"