合并冲突

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

@@ -981,18 +981,20 @@ public class AMScontroller{
         return amsFeign.lockDispatchSaleOrder(dispatchId, carrierId);
     }
 
-    @ApiOperation(value="查询app端公开抢单")
+    @ApiOperation(value="查询app端承运商已抢到的单")
     @PostMapping("/getLockDispatchSaleOrderList")
     public Map<String, Object> getLockDispatchSaleOrderList(Integer carrierId) {
         return amsFeign.getLockDispatchSaleOrderList(carrierId);
     }
 
+    @ApiOperation(value="查询PC端承运商已抢到的单")
     @PostMapping("/selectDispatchSaleOrderList")
     public Map<String, Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                            Integer apiId,
                                                            Integer pageNum,
-                                                           Integer pageSize){
-        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+                                                           Integer pageSize,
+                                                           Integer carrierId){
+        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierId);
     }
 
     //获取到站名称
@@ -1015,4 +1017,20 @@ public class AMScontroller{
                                                 String con) {
         return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
     }
+
+    @ApiModelProperty(value = "查询PC端公开抢单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "242", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getPCDispatchSaleOrderList")
+    public Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      Integer dispatchType,
+                                                      String con) {
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType, con);
+    }
 }

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

@@ -201,16 +201,15 @@ public class OMSController {
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
-    @PostMapping("/getTransportDispatch/{orderReceiveStatus}")
+    @PostMapping("/getTransportDispatch")
     public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              @PathVariable Integer orderReceiveStatus,
                                               Integer orderType,
                                               Integer orderStatus, Integer fuelOrder,String con){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderReceiveStatus, orderType, orderStatus, fuelOrder, con);
+                 orderType, orderStatus, fuelOrder, con);
     }
 
     /**
@@ -407,8 +406,9 @@ public class OMSController {
     @PostMapping("/addAppTruckOrder")
     public Map<String, Object> addAppTruckOrder(Integer dispatchId,
                                                 Integer orderType,
-                                                Integer driverCapacityId) {
-        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType, driverCapacityId);
+                                                String capacityNumber,
+                                                Integer carrierId) {
+        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType,capacityNumber, carrierId);
         return map;
     }
     //展示销售订单信息
@@ -493,6 +493,27 @@ public class OMSController {
         return omsFeign.selectInfoByDayPlanId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, dayPlanId, orderType);
     }
 
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping("/closeOmstruckOrder")
+    public Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId) {
+        Map<String, Object> map = omsFeign.closeOmstruckOrder(orderId);
+        return map;
+    }
+
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping("/getCapacityAndDriverList")
+    public Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con);
+        return map;
+    }
+
     //查询所有的收货单位
     @GetMapping("/getReceivingUnit")
     public Map<String, Object> getReceivingUnit(){
@@ -505,4 +526,10 @@ public class OMSController {
     public Map<String, Object> getSupplier(){
         return omsFeign.getSupplier();
     }
+
+    @ApiOperation(value = "关闭订单")
+    @PostMapping("/CloseOrder")
+    public  Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map){
+        return  omsFeign.CloseOrder(map);
+    }
 }

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

@@ -579,7 +579,8 @@ public interface AmsFeign {
     Map<String,Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                    @RequestParam("apiId") Integer apiId,
                                                    @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize);
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("carrierId") Integer carrierId);
 
     /**
      * 新增销售订单物资信息
@@ -1103,7 +1104,7 @@ public interface AmsFeign {
     Map<String, Object> lockDispatchSaleOrder(@RequestParam Integer dispatchId,
                                               @RequestParam Integer carrierId);
 
-    @ApiOperation(value="查询app端已抢的销售订单")
+    @ApiOperation(value="查询app端承运商已抢到的单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
     Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
 
@@ -1113,4 +1114,12 @@ public interface AmsFeign {
                                                       @RequestParam Integer pageSize,
                                                       @RequestParam Integer apiId,
                                                       @RequestParam String con) ;
+
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
+    Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @RequestParam Integer pageNum,
+                                                      @RequestParam Integer pageSize,
+                                                      @RequestParam Integer apiId,
+                                                      @RequestParam Integer dispatchType,
+                                                      @RequestParam String con) ;
 }

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

@@ -89,12 +89,11 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorders/selectOrderByOrderId/{orderId}")
     public Map<String, Object> selectOrderByOrderId(@PathVariable("orderId") Integer orderId);
 
-    @PostMapping("api/v1/oms/omstruckorders/getTransportDispatch/{orderReceiveStatus}")
+    @PostMapping("api/v1/oms/omstruckorders/getTransportDispatch")
     public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
-                                              @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
                                               @RequestParam("orderType") Integer orderType,
                                               @RequestParam("orderStatus") Integer orderStatus,
                                               @RequestParam("fuelOrder") Integer fuelOrder,
@@ -259,8 +258,6 @@ public interface OmsFeign {
 
     );
 
-
-
     @ApiOperation(value="车牌号下拉")
     @GetMapping(value = "api/v1/oms/omstruckorders/getDriverCapacity")
     Map<String, Object> getDriverCapacity();
@@ -273,7 +270,20 @@ public interface OmsFeign {
     @PostMapping(value = "api/v1/oms/omstruckorders/addAppTruckOrder")
     Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
                                          @RequestParam Integer orderType,
-                                         @RequestParam Integer driverCapacityId);
+                                         @RequestParam String capacityNumber,
+                                         @RequestParam Integer carrierId);
+
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
+    Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId);
+
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityAndDriverList")
+    Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam String con);
 
     @GetMapping("api/v1/oms/omstruckorders/getReceivingUnit")
     public Map<String, Object> getReceivingUnit();
@@ -281,5 +291,8 @@ public interface OmsFeign {
     //查询所有的发货单位
     @GetMapping("api/v1/oms/omstruckorders/getSupplier")
     public Map<String, Object> getSupplier();
+
+    @PostMapping("api/v1/oms/omstruckorders/CloseOrder")
+    Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map);
 }
 

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

@@ -18,6 +18,9 @@
                            on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
+    <select id="selectHuanPiaoDan">
+
+    </select>
 
     <!--  查询订单子表关联的  -->
     <select id="getOOMMes" parameterType="string" resultType="java.util.Map">