合并冲突

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

@@ -89,6 +89,14 @@ public class AMScontroller{
         return amsFeign.receptionPurPlan(planId);
     }
 
+    //停用运输计划
+    @PostMapping("/changePlanStatus/{planId}")
+    public Map<String,Object>changePlanStatus(@PathVariable("planId") BigDecimal planId){
+        return amsFeign.changePlanStatus(planId);
+    }
+
+
+
     @ApiOperation(value = "逻辑删除运输计划 状态：3")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
@@ -948,6 +956,11 @@ public class AMScontroller{
     public Map<String,Object> addTruckPlan(@RequestBody  Map<String, Object> mapVal) {
         return amsFeign.addTruckPlan(mapVal);
     }
+    //新增采购内转需求
+    @PostMapping("/addPurInwardRequirement")
+    public Map<String,Object>addPurInwardRequirement(@RequestBody Map<String,Object>mapval){
+        return amsFeign.addPurInwardRequirement(mapval);
+    }
     //删除
     @PostMapping("/deleteTruckPlan/{planId}")
     public Map<String,Object> deleteTruckPlan(@PathVariable("planId") Integer planId) {
@@ -1079,6 +1092,22 @@ public class AMScontroller{
         return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con);
     }
 
+    @PostMapping("/getPurRequirementList")
+    public Map<String, Object> getPurRequirementList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       Integer requirementStatus,
+                                                       String con,
+                                                       String userId,
+                                                       String carrierSsoId,
+                                                       String enableStatus,
+                                                       String planStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getPurRequirementList(mapValue, pageNum, pageSize, apiId,requirementStatus,con,userId, carrierSsoId,enableStatus,planStatus);
+    }
     @ApiOperation(value="查询app端公开抢单")
     @PostMapping("/getDispatchSaleOrderList")
     public Map<String, Object> getDispatchSaleOrderList() {
@@ -1284,6 +1313,7 @@ public class AMScontroller{
         return amsFeign.addSporadicOrders(mapValue);
     }
 
+
     @ApiOperation(value="零星一车多趟新增订单")
     @PostMapping("/addSporadicOrderTimes")
     public Map<String, Object> addSporadicOrderTimes(@RequestBody Map<String,Object> mapValue) {
@@ -1577,4 +1607,10 @@ public class AMScontroller{
     public Map<String,Object> getNoticeTypeId(){
         return amsFeign.getNoticeTypeId();
     }
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping("/lockDispatchSaleOrderList")
+    public Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.lockDispatchSaleOrderList(mapValue);
+    }
 }

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

@@ -98,6 +98,12 @@ public class OMSController {
         return omsFeign.addPurOrder(mapValue);
     }
 
+    //采购内转派单
+    @ApiOperation(value = "采购内转派单")
+    @PostMapping("/addPurInwardOrder")
+    public Map<String,Object> addPurInwardOrder(@RequestBody(required = false) Map<String,Object>mapValue) {
+        return omsFeign.addPurInwardOrder(mapValue);
+    }
 
     @ApiOperation(value = "修改分派计划")
     @PostMapping("/updateOrder")
@@ -105,14 +111,12 @@ public class OMSController {
         return omsFeign.updateOrder(map);
     }
 
-
     @ApiOperation(value = "派单")
     @PostMapping("/dispatchOrder")
     public Map<String, Object> dispatchOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
         return omsFeign.dispatchOrder(mapValue);
     }
 
-
     @ApiOperation(value = "销售派单")
     @PostMapping("/dispatchOrderForSale")
     public Map<String, Object> dispatchorderForSale(@RequestBody(required = false) Map<String, Object> map) {
@@ -120,7 +124,6 @@ public class OMSController {
     }
 
 
-
     @ApiOperation(value = "逻辑删除运单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
@@ -513,6 +516,13 @@ public class OMSController {
         return map;
     }
 
+    @ApiOperation(value="根据运单id修改运力")
+    @PostMapping("/updateCapacityId")
+    public Map<String, Object> updateCapacityId(@RequestBody Map<String,Object> map) {
+       return omsFeign.updateCapacityId(map);
+
+    }
+
     @ApiOperation(value="siji")
     @PostMapping("/getCapacityAndDriverList")
     public Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -575,6 +585,23 @@ public class OMSController {
         return map;
     }
 
+    @ApiOperation(value="采购内转运单")
+    @PostMapping("/getPurInwardOrderList")
+    public Map<String, Object> getPurInwardOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer orderStatus,
+                                                  String carrierId,
+                                                  String con,
+                                                     Integer planEnableStatus) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getPurInwardOrderList(mapValue, apiId, pageNum, pageSize,orderStatus,carrierId, con,planEnableStatus);
+        return map;
+    }
+
     @ApiOperation(value = "司机APP端查询下发给自己运输订单")
     @PostMapping("/sendOrderToApp")
     public List<Map<String,Object>> sendOrderToApp(@RequestParam String capacityNumber) {

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

@@ -904,9 +904,15 @@ public interface AmsFeign {
     @PostMapping ("api/v1/ams/amstruckpurplans/getPurPlanById/{planId}")
     public Map<String, Object> getPurPlanById(@PathVariable("planId")Integer planId);
 
+    @PostMapping ("api/v1/ams/amstruckinwardplan/changePlanStatus/{planId}")
+    public Map<String, Object> changePlanStatus(@PathVariable("planId")BigDecimal planId);
+
+
     @PostMapping("api/v1/ams/amstruckpurplans/addPurPlan")
     public Map<String, Object> addPurPlan(@RequestBody Map<String, Object> map);
 
+
+
     @PostMapping("api/v1/ams/amstruckpurplans/sendPurPlan/{planId}")
     public Map<String, Object> sendPurPlan(@PathVariable("planId")Integer planId);
 
@@ -1449,4 +1455,26 @@ public interface AmsFeign {
 
     @PostMapping(value = "api/v1/ams/amssaleordermaterials/closeSaleOrder")
     Map<String, Object> closeSaleOrder(@RequestParam Integer saleOrderId);
+
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrderList")
+    Map<String, Object> lockDispatchSaleOrderList(@RequestBody Map<String, Object> mapValue);
+
+    //新增采购内转需求
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/addPurInwardRequirement")
+    Map<String, Object> addPurInwardRequirement(@RequestBody  Map<String, Object> mapval);
+
+    @PostMapping(value = "/api/v1/ams/amstruckinwardrequirement/getPurRequirementList")
+    Map<String, Object> getPurRequirementList(@RequestBody Map<String, Object> mapValue,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer requirementStatus,
+                                              @RequestParam String con,
+                                              @RequestParam String userId,
+                                              @RequestParam String carrierSsoId,
+                                              @RequestParam String enableStatus,
+                                              @RequestParam String planStatus);
+
+
+
 }

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.models.auth.In;
 import oracle.jdbc.proxy.annotation.Post;
@@ -284,6 +285,12 @@ public interface OmsFeign {
     @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
     Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId);
 
+
+    @ApiOperation(value="根据运单id修改运力")
+    @PostMapping(value = "api/v1/oms/omstruckorders/updateCapacityId")
+    Map<String, Object> updateCapacityId(@RequestBody Map<String,Object> map);
+
+
     @ApiOperation(value="车牌")
     @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityAndDriverList")
     Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -405,5 +412,22 @@ public interface OmsFeign {
     @ApiOperation(value = "一键删除多个订单")
     @PostMapping("api/v1/oms/omstruckorderseparates/deleteOrders")
     Map<String, Object> deleteOrders(@RequestBody(required = false) Map<String, Object> map);
+
+    @ApiOperation(value = "查询订单是否确认")
+    @PostMapping("api/v1/oms/omstruckorders/addPurInwardOrder")
+    Map<String, Object> addPurInwardOrder(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    //采购内转运输订单
+    @PostMapping("api/v1/oms/omstruckorders/getPurInwardOrderList")
+    Map<String, Object> getPurInwardOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer apiId,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer orderStatus,
+                                           @RequestParam String carrierId,
+                                           @RequestParam String con,
+                                              @RequestParam Integer planEnableStatus);
+
+
 }