集成框计算

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

@@ -37,26 +37,11 @@ public class AMScontroller{
                                        Integer apiId,
                                        Integer pageNum,
                                        Integer pageSize,
-                                       Integer status) {
+                                       Integer status,String con) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAllPurPlan(mapValue, apiId, pageNum, pageSize, status);
-    }
-
-    /*
-        框计算
-     */
-    @PostMapping("/getAllPurPlan/{apiId}")
-    public Map<String, Object> getDetailListByCon(@PathVariable("apiId") Integer apiId,
-                                            @RequestBody(required = false) Map<String, Object> mapValue,
-                                            Integer pageNum,
-                                            Integer pageSize,
-                                            String con) {
-        if (mapValue == null) {
-            mapValue = new HashMap<>();
-        }
-        return amsFeign.getDetailListByCon(apiId, mapValue, pageNum, pageSize, con);
+        return amsFeign.getAllPurPlan(mapValue, apiId, pageNum, pageSize, status, con);
     }
 
     @ApiOperation(value = "通过Id查询请车作业")
@@ -125,8 +110,8 @@ public class AMScontroller{
                                            Integer pageNum,
                                            Integer pageSize,
                                            Integer planId,
-                                           Integer status) {
-        return amsFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status);
+                                           Integer status, String con) {
+        return amsFeign.getDecomposedPlan(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, planId, status, con);
     }
 
 

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

@@ -41,8 +41,9 @@ public class OMSController {
                                           Integer orderStatus,
                                           Integer planId,
                                           Integer orderType,
-                                                Integer fuelOrder) {
-        return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize, orderStatus, planId, orderType, fuelOrder);
+                                          Integer fuelOrder, String con) {
+        return omsFeign.getAllTruckOrder(mapValue == null? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
+                orderStatus, planId, orderType, fuelOrder, con);
     }
 
     @ApiOperation(value = "不适用表头返回数据")
@@ -93,9 +94,9 @@ public class OMSController {
 
 
     @ApiOperation(value = "派单")
-    @PostMapping("/dispatchOrder")
-    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map) {
-        return omsFeign.dispatchOrder(map);
+    @PostMapping("/dispatchOrder/{orderId}")
+    public Map<String, Object> dispatchOrder(@PathVariable("orderId") Integer orderId) {
+        return omsFeign.dispatchOrder(orderId);
     }
 
     @ApiOperation(value = "逻辑删除运单")
@@ -132,10 +133,11 @@ public class OMSController {
                                                Integer pageSize,
                                                @PathVariable Integer orderReceiveStatus,
                                                Integer orderType,
-                                               Integer orderStatus
+                                               Integer orderStatus,
+                                                     String con
     ){
         return omsFeign.getReceiveRefuseOrder(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum,
-                pageSize, orderReceiveStatus, orderType, orderStatus);
+                pageSize, orderReceiveStatus, orderType, orderStatus, con);
     }
 
 
@@ -195,10 +197,9 @@ public class OMSController {
                                               Integer pageSize,
                                               @PathVariable Integer orderReceiveStatus,
                                               Integer orderType,
-                                              Integer orderStatus,
-                                                    Integer fuelOrder){
+                                              Integer orderStatus, Integer fuelOrder,String con){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderReceiveStatus, orderType, orderStatus, fuelOrder);
+                orderReceiveStatus, orderType, orderStatus, fuelOrder, con);
     }
 
     /**

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

@@ -711,14 +711,8 @@ public interface AmsFeign {
                                 @RequestParam("apiId") Integer apiId,
                                 @RequestParam("pageNum") Integer pageNum,
                                 @RequestParam("pageSize") Integer pageSize,
-                                @RequestParam("status") Integer status);
-
-    @PostMapping("api/v1/ams/amstruckpurplans/getAllPurPlan/{apiId}")
-    public Map<String, Object> getDetailListByCon(@PathVariable("apiId") Integer apiId,
-                                            @RequestBody(required=false) Map<String,Object> mapValue,
-                                            @RequestParam("pageNum")Integer pageNum,
-                                            @RequestParam("pageSize")Integer pageSize,
-                                            @RequestParam("con")String con);
+                                @RequestParam("status") Integer status,
+                                @RequestParam("con") String con);
 
     @PostMapping ("api/v1/ams/amstruckpurplans/getPurPlanById/{planId}")
     public Map<String, Object> getPurPlanById(@PathVariable("planId")Integer planId);
@@ -744,7 +738,9 @@ public interface AmsFeign {
                                            @RequestParam("pageNum") Integer pageNum,
                                            @RequestParam("pageSize") Integer pageSize,
                                            @RequestParam("planId") Integer planId,
-                                           @RequestParam("status") Integer status);
+                                           @RequestParam("status") Integer status,
+                                           @RequestParam("con") String con
+    );
 
     //*****************************************内转物流**************************************
     //查询汽运单价

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

@@ -27,8 +27,8 @@ public interface OmsFeign {
                                           @RequestParam("orderStatus") Integer orderStatus,
                                           @RequestParam("planId") Integer planId,
                                           @RequestParam("orderType") Integer orderType,
-                                          @RequestParam("fuelOrder") Integer fuelOrder
-                                                );
+                                          @RequestParam("fuelOrder") Integer fuelOrder,
+                                          @RequestParam("con")String con);
 
     @PostMapping("api/v1/oms/omstruckorders/getAllTruckOrderReturnListMap")
     public Map<String, Object> getAllTruckOrderReturnListMap(
@@ -50,7 +50,7 @@ public interface OmsFeign {
     public Map<String, Object> updateOrder(@RequestBody Map<String, Object> map);
 
     @PostMapping("api/v1/oms/omstruckorders/dispatchOrder/{orderId}")
-    public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> map);
+    public Map<String, Object> dispatchOrder(@PathVariable("orderId") Integer orderId);
 
     @PostMapping("api/v1/oms/omstruckorders/deleteOrder")
     public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,
@@ -67,7 +67,8 @@ public interface OmsFeign {
                                                @RequestParam("pageSize") Integer pageSize,
                                                @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
                                                @RequestParam("orderType") Integer orderType,
-                                               @RequestParam("orderStatus") Integer orderStatus);
+                                               @RequestParam("orderStatus") Integer orderStatus,
+                                                     @RequestParam("con")String con);
 
     @PostMapping("api/v1/oms/omstruckorders/sendMesToDriver")
     public Map<String, Object> sendMesToDriver(@RequestParam("capacityNumber") String capacityNumber,
@@ -95,7 +96,8 @@ public interface OmsFeign {
                                               @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
                                               @RequestParam("orderType") Integer orderType,
                                               @RequestParam("orderStatus") Integer orderStatus,
-                                                    @RequestParam("fuelOrder") Integer fuelOrder);
+                                                    @RequestParam("fuelOrder") Integer fuelOrder,
+                                                    @RequestParam("con")      String con);
     /**
      * 展示承运商接收销售公司已接受的销售订单
      * @param carrierId