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

pom.xml

@@ -57,6 +57,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>2.0.7.RELEASE</version>
         </dependency>
 
         <!--mybatisPlus-->
@@ -98,6 +99,7 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
+            <version>3.5.6</version>
         </dependency>
 
 

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

@@ -389,16 +389,16 @@ public class AMScontroller{
      * @param apiId
      * @return
      */
-    @PostMapping("/amscontracttransportprices")
+    @PostMapping("/getAmsContractTransportPrice1")
     @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> amscontracttransportprices(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapValue,
                                        Integer pageNum,
                                        Integer pageSize,
                                        Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.amscontracttransportprices(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getAmsContractTransportPrice1(mapValue, pageNum, pageSize, apiId);
     }
 
     /**
@@ -406,32 +406,39 @@ public class AMScontroller{
      * @param mapVal
      * @return
      */
-    @PostMapping("addAmsContractTransportUnitPrice")
+    @PostMapping("addAmsContractTransportUnitPrice1")
     @ApiOperation(value = "新增汽运单价")
-    Map<String, Object> addAmsContractTransportUnitPrice(@RequestBody Map<String, Object> mapVal) {
-        return amsFeign.addAmsContractTransportUnitPrice(mapVal);
+    Map<String, Object> addAmsContractTransportUnitPrice1(@RequestBody Map<String, Object> mapVal) {
+        return amsFeign.addAmsContractTransportUnitPrice1(mapVal);
     }
-    @PostMapping("deleteAmsContractTransportPrice")
+    @PostMapping("deleteAmsContractTransportPrice1")
     @ApiOperation(value = "通过主键id删除汽运单价")
-    Map<String, Object> deleteAmsContractTransportPrice(BigDecimal priceId) {
-        return amsFeign.deleteAmsContractTransportPrice(priceId);
+    Map<String, Object> deleteAmsContractTransportPrice1(@RequestParam BigDecimal priceId) {
+        return amsFeign.deleteAmsContractTransportPrice1(priceId);
     }
 
     /**
      * 通过主键修改汽运单价
      */
-    @PostMapping("updateAmsContractTransportUnitPrice")
+    @PostMapping("updateAmsContractTransportPrice1")
     @ApiOperation(value = "通过主键id修改汽运单价")
-    Map<String, Object> updateAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.updateAmsContractTransportUnitPrice(mapVal);
+    Map<String, Object> updateAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapVal) {
+        return amsFeign.updateAmsContractTransportPrice1(mapVal);
+    }
+    /**
+     *通过主键渲染信息
+     */
+    @PostMapping(value = "/getAmsContractTransportPriceByPriceId1")
+    Map<String, Object> getAmsContractTransportPriceByPriceId1(@RequestParam BigDecimal priceId){
+        return amsFeign.getAmsContractTransportPriceByPriceId1(priceId);
     }
     /**
      * 通过主键修改汽运单价
      */
-    @PostMapping("batchUpdateTransportPriceByOilPrice")
+    @PostMapping("batchUpdateTransportPriceByOilPrice1")
     @ApiOperation(value = "油价联动导致运价变动，批量修改运价")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.batchUpdateTransportPriceByOilPrice(mapVal);
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1() {
+        return amsFeign.batchUpdateTransportPriceByOilPrice1();
     }
     @GetMapping("getLineNo")
     @ApiOperation(value = "得到线路编号下拉")
@@ -468,6 +475,18 @@ public class AMScontroller{
         }
         return amsFeign.getSaleOrderInfo(mapValue, pageNum, pageSize, apiId);
     }
+
+    @ApiOperation(value="查询已上报销售订单信息")
+    @PostMapping("/getSaleOrderReported")
+    Map<String, Object> getSaleOrderReported(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             @RequestParam Integer pageNum,
+                                             @RequestParam Integer pageSize,
+                                             @RequestParam Integer apiId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderReported(mapValue,pageNum,pageSize,apiId);
+    }
     @PostMapping("getAmsSaleOrderApproved")
     @ApiOperation(value = "查询汽运单价信息")
     public Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
@@ -481,14 +500,14 @@ public class AMScontroller{
     }
     @PostMapping("getSaleOrderDetail")
     @ApiOperation(value = "查询汽运单价信息")
-    public Map<String, Object> getSaleOrderDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+    public Map<String, Object> getSaleOrderDetail(@RequestParam BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
                                                  Integer pageNum,
                                                  Integer pageSize,
                                                  Integer apiId) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getSaleOrderDetail(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getSaleOrderDetail(saleOrderId,mapValue, pageNum, pageSize, apiId);
     }
     @PostMapping("uploadSaleOrder/{saleOrderId}")
     Map<String, Object> uploadSaleOrder(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
@@ -506,8 +525,8 @@ public class AMScontroller{
     Map<String, Object> updateAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.updateAmsSaleOrder(mapVal);
     }
-    @PostMapping("deleteAmsSaleOrderBySaleOrderId/{saleOrderId}")
-    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@PathVariable("saleOrderId") BigDecimal saleOrderId) {
+    @PostMapping("deleteAmsSaleOrderBySaleOrderId")
+    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
         return amsFeign.deleteAmsSaleOrderBySaleOrderId(saleOrderId);
     }
     @PostMapping("getSaleOrderUpdateLog")
@@ -521,6 +540,10 @@ public class AMScontroller{
         }
         return amsFeign.getSaleOrderUpdateLog(mapValue, pageNum, pageSize, apiId);
     }
+
+    @GetMapping(value = "getSalePlanName")
+    @ApiOperation(value="获取销售计划名称")
+    public Map<String, Object> getSalePlanName(){return amsFeign.getSalePlanName();}
     @GetMapping("getShipperName")
     @ApiOperation(value = "得到发货单位下拉")
     public Map<String, Object> getShipperName(){
@@ -535,10 +558,15 @@ public class AMScontroller{
     Map<String, Object> addAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map) {
         return amsFeign.addAmsSaleOrderMaterial(map);
     }
-    @PostMapping("getAmsSaleOrderMaterialBySaleOrderMaterialId/{saleOrderMaterialId}")
-    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderMaterialId) {
+    @PostMapping("getAmsSaleOrderMaterialBySaleOrderMaterialId")
+    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@RequestParam BigDecimal saleOrderMaterialId) {
         return amsFeign.getAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
     }
+    @ApiOperation(value="通过主键修改销售订单物资信息")
+    @PostMapping(value = "/updateAmsSaleOrderMaterial")
+    Map<String, Object> updateAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map){
+        return amsFeign.updateAmsSaleOrderMaterial(map);
+    }
     @PostMapping("deleteAmsSaleOrderMaterialBySaleOrderMaterialId")
     Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
         return amsFeign.deleteAmsSaleOrderMaterialBySaleOrderMaterialId(saleOrderMaterialId);
@@ -566,8 +594,8 @@ public class AMScontroller{
     Map<String, Object> addAmsSalePlan(@RequestBody(required = false)Map<String,Object> map) {
         return amsFeign.addAmsSalePlan(map);
     }
-    @PostMapping("getAmsSalePlanByPlanId/{planId}")
-    Map<String, Object> getAmsSalePlanByPlanId(BigDecimal planId) {
+    @PostMapping("getAmsSalePlanByPlanId")
+    Map<String, Object> getAmsSalePlanByPlanId(@RequestParam BigDecimal planId) {
         return amsFeign.getAmsSalePlanByPlanId(planId);
     }
     @PostMapping("upadteAmsSalePlanByPlanId")
@@ -588,6 +616,79 @@ public class AMScontroller{
     public Map<String, Object> getAreaName(){
         return amsFeign.getAreaName();
     }
+
+
+    @PostMapping("getSalePlanMaterialInfo")
+    @ApiOperation(value="查询销售计划物资信息")
+    public Map<String, Object> getSalePlanMaterialInfo(@RequestParam BigDecimal planId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                                @RequestParam Integer apiId,
+                                                @RequestParam Integer pageNum,
+                                                @RequestParam Integer pageSize){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSalePlanMaterialInfo(planId,mapValue,apiId,pageNum,pageSize);
+    }
+
+    @PostMapping(value = "addAmsSalePlanMaterial")
+    @ApiOperation(value="新增销售计划物资信息")
+    public Map<String, Object> addAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.addAmsSalePlanMaterial(map);
+    }
+
+    @PostMapping(value = "deleteAmsSalePlanMaterial")
+    @ApiOperation(value="通过主键删除销售计划物资信息")
+    Map<String, Object> deleteAmsSalePlanMaterial(@RequestParam BigDecimal planMaterialId){
+        return amsFeign.deleteAmsSalePlanMaterial(planMaterialId);
+    }
+
+    @PostMapping(value = "/getAmsSalePlanMaterialByPlanMaterialId")
+    @ApiOperation(value="通过主键查询销售计划物资信息")
+    Map<String, Object> getAmsSalePlanMaterialByPlanMaterialId(@RequestParam BigDecimal planMaterialId){
+        return amsFeign.getAmsSalePlanMaterialByPlanMaterialId(planMaterialId);
+    }
+
+    @PostMapping(value = "/upadteAmsSalePlanMaterial")
+    @ApiOperation(value="通过主键修改销售计划物资信息")
+    Map<String, Object> upadteAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.upadteAmsSalePlanMaterial(map);
+    }
+
+    @PostMapping("/getTruckNoDetail")
+    @ApiOperation(value="查询销售订单车序号详细信息")
+    Map<String, Object> getTruckNoDetail(@RequestParam BigDecimal saleOrderMaterialId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckNoDetail(saleOrderMaterialId,mapValue,apiId,pageNum,pageSize);
+    }
+
+    @ApiOperation(value="新增车序号物资信息")
+    @PostMapping(value = "/addAmsSaleTrucknoMaterial")
+    Map<String, Object> addAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.addAmsSaleTrucknoMaterial(map);
+    }
+
+    @ApiOperation(value="通过主键删除车序号物资信息")
+    @PostMapping(value = "/deleteAmsSaleTrucknoMaterial")
+    Map<String, Object> deleteAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId){
+        return amsFeign.deleteAmsSaleTrucknoMaterial(trucknoMaterialId);
+    }
+
+    @ApiOperation(value="通过主键渲染车序号物资信息")
+    @PostMapping(value = "/getAmsSaleTrucknoMaterial")
+    Map<String, Object> getAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId){
+        return amsFeign.getAmsSaleTrucknoMaterial(trucknoMaterialId);
+    }
+
+    @ApiOperation(value="通过主键修改车序号物资信息")
+    @PostMapping(value = "/updateAmsSaleTrucknoMaterial")
+    Map<String, Object> updateAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.updateAmsSaleTrucknoMaterial(map);
+    }
     //************************************内转物流***************************************************
     @PostMapping("getAmsContractTransportPriceForConverted")
     @ApiOperation(value = "内转物流查询汽运单价信息")
@@ -837,4 +938,22 @@ public class AMScontroller{
         }
         return amsFeign.getTruckRequirementList(mapValue, pageNum, pageSize, apiId);
     }
+
+    @ApiOperation(value="查询app端公开抢单")
+    @PostMapping("/getDispatchSaleOrderList")
+    public Map<String, Object> getDispatchSaleOrderList() {
+        return amsFeign.getDispatchSaleOrderList();
+    }
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping("/lockDispatchSaleOrder")
+    public Map<String, Object> lockDispatchSaleOrder(Integer dispatchId,Integer carrierId) {
+        return amsFeign.lockDispatchSaleOrder(dispatchId, carrierId);
+    }
+
+    @ApiOperation(value="查询app端公开抢单")
+    @PostMapping("/getLockDispatchSaleOrderList")
+    public Map<String, Object> getLockDispatchSaleOrderList(Integer carrierId) {
+        return amsFeign.getLockDispatchSaleOrderList(carrierId);
+    }
 }

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

@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map;
 
 /**
@@ -83,7 +84,6 @@ public class OMSController {
     public Map<String, Object> addPurOrder(@RequestBody(required = false) Map<String, Object> mapValue) {
         return omsFeign.addPurOrder(mapValue);
     }
-    // == null ? new HashMap<>() : mapValue
 
 
     @ApiOperation(value = "修改分派计划")
@@ -99,6 +99,15 @@ public class OMSController {
         return omsFeign.dispatchOrder(map);
     }
 
+
+    @ApiOperation(value = "销售派单")
+    @PostMapping("/dispatchOrderForSale")
+    public Map<String, Object> dispatchorderForSale(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.dispatchOrderForSale(map);
+    }
+
+
+
     @ApiOperation(value = "逻辑删除运单")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
@@ -215,14 +224,70 @@ public class OMSController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
     })
-    public Map<String, Object> getSaleOrderForCarrierList(@PathVariable("carrierId") Integer carrierId,
+    public Map<String, Object> getSaleOrderForCarrierList(@RequestBody(required = false)Map<String,Object> map,
+                                                          @PathVariable("carrierId") Integer carrierId,
                                                           Integer apiId,
                                                           Integer pageNum,
-                                                          Integer pageSize) {
-        return omsFeign.getSaleOrderForCarrierList(carrierId, apiId, pageNum, pageSize);
+                                                          Integer pageSize,
+                                                          String con
+                                                          ) {
+        return omsFeign.getSaleOrderForCarrierList(map==null ? new HashMap<>():map,carrierId, apiId, pageNum, pageSize,con);
+
+    }
+
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     *
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/selectAllOrderForSale/{carrierId}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> selectAllOrderForSale( @RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @PathVariable Integer carrierId,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer orderType,
+                                                      Integer orderStatus,
+                                                      Integer saleOrderMaterialId,
+                                                      String  con
+                                                    ) {
+        return omsFeign.selectAllOrderForSale(mapValue==null?new HashMap<>():mapValue, carrierId, apiId, pageNum, pageSize, orderType, orderStatus, saleOrderMaterialId, con);
+    }
+    /**
+     * 销售物流：司机接单pc端
+     */
 
+    @ApiOperation(value="pc端展示司机信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(226)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getDriverInfoForSale/{orderReceiveStatus}")
+   public Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            @PathVariable Integer orderReceiveStatus,
+                                            Integer orderType,
+                                            Integer orderStatus,
+                                            String con,
+                                           Integer carrierId
+    )
+    {
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderReceiveStatus, orderType, orderStatus, con,carrierId);
     }
 
+
+
     /**
      * 查询所有已经接收的焦炭发运日计划
      *
@@ -232,16 +297,18 @@ public class OMSController {
      * @param pageSize
      * @return
      */
-    @PostMapping("/getCokeDayPlanAndRecivedList")
+    @PostMapping("/getCokeDayPlanAndRecivedList/{carrierId}")
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "169", required = false, dataType = "BigDecimal"),
     })
-    public Map<String, Object> getCokeDayPlanAndRecivedList(@PathVariable("carrierId") Integer carrierId,
+    public Map<String, Object> getCokeDayPlanAndRecivedList(
+                                                            @RequestBody(required = false)Map<String,Object> map,
+                                                            @PathVariable("carrierId") Integer carrierId,
                                                             @RequestParam Integer apiId,
                                                             @RequestParam Integer pageNum,
                                                             @RequestParam Integer pageSize) {
-        return omsFeign.getCokeDayPlanAndRecivedList(carrierId, apiId, pageNum, pageSize);
+        return omsFeign.getCokeDayPlanAndRecivedList(map==null?new HashMap<>():map,carrierId, apiId, pageNum, pageSize);
     }
 
     /**
@@ -253,20 +320,71 @@ public class OMSController {
      * @param apiId
      * @return
      */
-    @PostMapping("/getWaterSlagDayPlanAndRecivedList")
+    @PostMapping("/getWaterSlagDayPlanAndRecivedList/{carrierId}")
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId", value = "170", required = false, dataType = "BigDecimal"),
     })
-    public Map<String, Object> getWaterSlagDayPlanAndRecivedList(@PathVariable("carrierId") Integer carrierId,
+    public Map<String, Object> getWaterSlagDayPlanAndRecivedList(
+                                                                 @RequestBody(required = false)Map<String,Object> map,
+                                                                 @PathVariable("carrierId") Integer carrierId,
                                                                  @RequestParam Integer apiId,
                                                                  @RequestParam Integer pageNum,
                                                                  @RequestParam Integer pageSize) {
-        return omsFeign.getWaterSlagDayPlanAndRecivedList(carrierId, apiId, pageNum, pageSize);
+        return omsFeign.getWaterSlagDayPlanAndRecivedList(map==null?new HashMap<>():map, carrierId, apiId, pageNum, pageSize);
     }
     @PostMapping("/selectNewOrderId")
     public Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map){
         return omsFeign.selectNewOrderId(map);
     }
+    @ApiOperation(value="查询所有空闲的司机排班信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(186)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getCapacityForLeisure/{carrierId}")
+    public Map<String, Object> getCapacityForLeisure(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     @PathVariable Integer carrierId) {
+        return omsFeign.getCapacityForLeisure(mapValue==null?new HashMap<>(): mapValue, apiId, pageNum, pageSize,carrierId);
+    }
+     //获取已经形成订单的焦炭计划
+    @PostMapping(value = "/getCokeRailDayPlanForGenOrder/{carrierId}")
+    public Map<String,Object>  getCokeRailDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
+                                                           @PathVariable("carrierId") Integer carrierId,
+                                                           Integer pageNum,
+                                                           Integer pageSize,
+                                                           Integer apiId,
+                                                           Integer dayPlanId,
+                                                           Integer orderStatus,
+                                                           Integer orderType,
+                                                           String con
+    ){
+        return  omsFeign.getCokeRailDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
+    }
+
+
+   //获取已经形成订单的水渣计划
+   @PostMapping(value = "/getWaterslagDayPlanForGenOrder/{carrierId}")
+   public Map<String, Object>     getWaterslagDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
+                                                                 @PathVariable("carrierId") Integer carrierId,
+                                                                 Integer pageNum,
+                                                                 Integer pageSize,
+                                                                 Integer apiId,
+                                                                 Integer dayPlanId,
+                                                                 Integer orderStatus,
+                                                                 Integer orderType,
+                                                                 String con
+
+
+   ){
+        return omsFeign.getWaterslagDayPlanForGenOrder(map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
+   }
+
+
 
 }

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

@@ -52,12 +52,13 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/orderReceive")
     public Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
-                                      Integer apiId,
-                                      Integer pageNum,
-                                      Integer pageSize,
-                                      Integer queueType
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize,
+                                            Integer queueType,
+                                            String con
     ){
-        return qmsTruckFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType);
+        return qmsTruckFeign.orderReceive(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, queueType,con);
     }
 
 
@@ -71,11 +72,12 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/getQueueApply")
     public Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
     ){
-        return qmsTruckFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return qmsTruckFeign.getQueueApply(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
 
 
@@ -89,12 +91,13 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/getQueueListByQueueUp")
     public Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer gridId
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer gridId,
+                                                     String con
     ){
-        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, gridId);
+        return qmsTruckFeign.getQueueListByQueueUp(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, gridId,con);
     }
 
 
@@ -107,12 +110,13 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/getAllQueueMes")
     public Map<String, Object> getAllQueueMes(@RequestBody(required=false) Map<String,Object> mapValue,
-                                        Integer apiId,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        Integer gatepostId
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer gatepostId,
+                                              String con
     ){
-        return qmsTruckFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId);
+        return qmsTruckFeign.getAllQueueMes(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, gatepostId,con);
     }
 
     @ApiOperation(value="排队转移-->新增排队链表:实绩Id、门岗名称、转移原因")
@@ -132,11 +136,12 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/getChangeQueue")
     public Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
     ){
-        return qmsTruckFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize);
+        return qmsTruckFeign.getChangeQueue(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
     }
 
 
@@ -159,11 +164,12 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/getQueueCancel")
     public Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
-                                        Integer apiId,
-                                        Integer pageNum,
-                                        Integer pageSize
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String con
     ){
-        return qmsTruckFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize);
+        return qmsTruckFeign.getQueueCancel(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
     }
 
     @ApiOperation(value="通过Id查询排队取消实绩")
@@ -208,9 +214,10 @@ public class QMSController extends BaseRESTfulController {
     public Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
-                                              Integer pageSize
+                                              Integer pageSize,
+                                              String con
     ){
-        return qmsTruckFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+        return qmsTruckFeign.getQueueInsert(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @ApiOperation(value="排队结束-->修改deleted = 1")
@@ -232,11 +239,12 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/getQueueEndResult")
     public Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 String con
     ){
-        return qmsTruckFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+        return qmsTruckFeign.getQueueEndResult(mapValue == null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @ApiOperation(value="汽车监控")
@@ -249,12 +257,13 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/capacityMonitor")
     public Map<String, Object> capacityMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                         Integer apiId,
-                                         Integer pageNum,
-                                         Integer pageSize,
-                                               Integer gridType
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer gridType,
+                                               String con
     ){
-        return qmsTruckFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType);
+        return qmsTruckFeign.capacityMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize, gridType,con);
     }
 
 
@@ -268,10 +277,11 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/listMonitor")
     public Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
-                                     Integer apiId,
-                                     Integer pageNum,
-                                     Integer pageSize
-    ){return qmsTruckFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize);
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ){return qmsTruckFeign.listMonitor(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
     }
 
     @ApiOperation(value="查询各仓库，门岗的排队状态列表")
@@ -302,13 +312,14 @@ public class QMSController extends BaseRESTfulController {
     })
     @PostMapping("/getAllExecutionOrder")
     public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              Integer apiId,
-                                              Integer pageNum,
-                                              Integer pageSize,
-                                              Integer orderType,
-                                              Integer status
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize,
+                                                    Integer orderType,
+                                                    Integer status,
+                                                    String con
     ){
-        return qmsTruckFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status);
+        return qmsTruckFeign.getAllExecutionOrder(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, status,con);
     }
 
     @ApiOperation(value="查询某一个门岗的排队详情")
@@ -319,4 +330,55 @@ public class QMSController extends BaseRESTfulController {
     public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue){
         return qmsTruckFeign.getListQueueMes(mapValue);
     }
+
+
+    @ApiOperation(value="查询仓库排队详情")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(187)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getWarehouseQueueApply")
+    public Map<String, Object> getWarehouseQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer platformId,
+                                                      String con
+    ){return qmsTruckFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    }
+    @ApiOperation(value="查询仓库排队转移")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(193)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getWarehouseQueueChange")
+    public Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+
+                                                       String con
+    ){return qmsTruckFeign.getWarehouseQueueChange(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    }
+
+
+    @ApiOperation(value="查询仓库排队结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(194)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getWarehouseQueueEndMes")
+    public Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       String con
+    ){return qmsTruckFeign.getWarehouseQueueEndMes(mapValue == null ? new HashMap<>(): mapValue, apiId, pageNum, pageSize,con);
+    }
 }

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

@@ -1,4 +1,7 @@
 package com.steerinfo.dil.feign;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
@@ -6,6 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -317,34 +321,34 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(109)", value = "表头", required = false, dataType = "Interger")
     })
-    @PostMapping(value = "/api/v1/saleContract/amscontracttransportprices/getAmsContractTransportPrice")
-    Map<String, Object> amscontracttransportprices(@RequestBody(required = false) Map<String, Object> mapValue,
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAmsContractTransportPrice1")
+    Map<String, Object> getAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapValue,
                                        @RequestParam Integer pageNum,
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
     /**
      *销售合同新增汽运单价
      */
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/addAmsContractTransportUnitPrice")
-    Map<String, Object> addAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal);
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/addAmsContractTransportPrice1")
+    Map<String, Object> addAmsContractTransportUnitPrice1(@RequestBody(required = false) Map<String, Object> mapVal);
 
     /**
      *通过主键id删除汽运单价
      * @param priceId
      * @return
      */
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/deleteAmsContractTransportPrice")
-    Map<String, Object> deleteAmsContractTransportPrice(BigDecimal priceId);
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/deleteAmsContractTransportPrice1")
+    Map<String, Object> deleteAmsContractTransportPrice1(@RequestParam BigDecimal priceId);
     /**
      *通过主键渲染信息
      */
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/getAmsContractTransportPriceByPriceId/{priceId}")
-    Map<String, Object> getAmsContractTransportPriceByPriceId(@PathVariable("priceId") BigDecimal priceId);
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAmsContractTransportPriceByPriceId1")
+    Map<String, Object> getAmsContractTransportPriceByPriceId1(@RequestParam BigDecimal priceId);
     /**
      * 通过主键修改汽运单价
      */
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/updateAmsContractTransportUnitPrice")
-    Map<String, Object> updateAmsContractTransportUnitPrice(@RequestBody(required = false) Map<String, Object> mapVal);
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/updateAmsContractTransportPrice1")
+    Map<String, Object> updateAmsContractTransportPrice1(@RequestBody(required = false) Map<String, Object> mapVal);
     /**
      * 油价联动导致运价变动，批量修改运价
      * @param
@@ -353,8 +357,8 @@ public interface AmsFeign {
     @ApiOperation(value="油价联动导致运价变动，批量修改运价")
     @ApiImplicitParams({
     })
-    @PostMapping(value = "/api/v1/ams/amscontracttransportprice/batchUpdateTransportPriceByOilPrice")
-    Map<String, Object> batchUpdateTransportPriceByOilPrice(@RequestBody(required = false) Map<String, Object> mapVal);
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/batchUpdateTransportPriceByOilPrice1")
+    Map<String, Object> batchUpdateTransportPriceByOilPrice1();
     /**
      * 获取线路编号
      * @param
@@ -363,7 +367,7 @@ public interface AmsFeign {
     @ApiOperation(value="获取线路编号")
     @ApiImplicitParams({
     })
-    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getLineNo")
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getLineNo")
     Map<String, Object> getLineNo();
     /**
      * 获取线路编号
@@ -373,7 +377,7 @@ public interface AmsFeign {
     @ApiOperation(value="获取运力编号")
     @ApiImplicitParams({
     })
-    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getCapacityNumber")
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCapacityNumber")
     Map<String, Object> getCapacityNumber();
     /**
      * 获取收货地址
@@ -383,7 +387,7 @@ public interface AmsFeign {
     @ApiOperation(value="获取收货地址")
     @ApiImplicitParams({
     })
-    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getDeliveryAddress")
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getDeliveryAddress")
     Map<String, Object> getDeliveryAddress();
     /**
      * 新增(固定派单/公开抢单)
@@ -397,14 +401,14 @@ public interface AmsFeign {
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/addAmsDispatchSaleOrder")
     Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal);
     /**
-     * 获取收货地址
+     * 获取承运商名
      * @param
      * @return
      */
-    @ApiOperation(value="获取收货地址")
+    @ApiOperation(value="获取承运商名")
     @ApiImplicitParams({
     })
-    @GetMapping(value = "/api/v1/ams/amsdispatchsaleorders/getCarrierName")
+    @GetMapping(value = "/api/v1/ams/amscontracttruckprices/getCarrierName")
     Map<String, Object> getCarrierName();
 
     /**
@@ -474,7 +478,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
     })
     @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderDetail")
-    Map<String, Object> getSaleOrderDetail(@RequestBody(required = false) Map<String, Object> mapValue,
+    Map<String, Object> getSaleOrderDetail(@RequestParam BigDecimal saleOrderId,@RequestBody(required = false) Map<String, Object> mapValue,
                                           @RequestParam Integer pageNum,
                                           @RequestParam Integer pageSize,
                                           @RequestParam Integer apiId);
@@ -531,7 +535,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/deleteAmsSaleOrderBySaleOrderId")
-    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(BigDecimal saleOrderId);
+    Map<String, Object> deleteAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId);
     @ApiOperation(value="根据销售订单号查询销售订单修改日志")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "apiId(100)", value = "表头", required = false, dataType = "Interger")
@@ -541,6 +545,17 @@ public interface AmsFeign {
                                      @RequestParam Integer pageNum,
                                      @RequestParam Integer pageSize,
                                      @RequestParam Integer apiId);
+    /**
+     * 获取销售计划名称
+     * @param
+     * @return
+     */
+    @ApiOperation(value="获取销售计划名称")
+    @ApiImplicitParams({
+    })
+    @GetMapping(value = "/api/v1/ams/amssaleorders/getSalePlanName")
+    Map<String, Object> getSalePlanName();
+
     /**
      * 获取发货单位
      */
@@ -578,8 +593,21 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
     })
-    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAmsSaleOrderMaterialBySaleOrderMaterialId/{saleOrderMaterialId}")
-    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderMaterialId);
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAmsSaleOrderMaterialBySaleOrderMaterialId")
+    Map<String, Object> getAmsSaleOrderMaterialBySaleOrderMaterialId(@RequestParam BigDecimal saleOrderMaterialId);
+
+    /**
+     * 通过主键修改销售订单物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改销售订单物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleOrderMaterial", value = "销售订单物资信息对象", required = false, dataType = "AmsSaleOrderMaterial")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleordermaterials/updateAmsSaleOrderMaterial")
+    Map<String, Object> updateAmsSaleOrderMaterial(@RequestBody(required = false) Map<String,Object> map);
+
     /**
      * 通过主键删除销售订单物资信息
      * @param saleOrderMaterialId
@@ -590,7 +618,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/deleteAmsSaleOrderMaterialBySaleOrderMaterialId")
-    Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(BigDecimal saleOrderMaterialId);
+    Map<String, Object> deleteAmsSaleOrderMaterialBySaleOrderMaterialId(@RequestParam BigDecimal saleOrderMaterialId);
 
     /**
      * 通过主键获取收货地址
@@ -602,7 +630,7 @@ public interface AmsFeign {
             @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
     })
     @PostMapping(value = "/api/v1/ams/amssaleordermaterials/getAddress/{saleOrderMaterialId}")
-    Map<String, Object> getAddress(BigDecimal saleOrderMaterialId);
+    Map<String, Object> getAddress(@RequestParam BigDecimal saleOrderMaterialId);
 
 
     /**
@@ -656,8 +684,8 @@ public interface AmsFeign {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "planId", value = "销售计划主键", required = false, dataType = "BigDecimal")
     })
-    @PostMapping(value = "/api/v1/ams/amssaleplans/getAmsSalePlanByPlanId/{planId}")
-    Map<String, Object> getAmsSalePlanByPlanId(@PathVariable("planId") BigDecimal planId);
+    @PostMapping(value = "/api/v1/ams/amssaleplans/getAmsSalePlanByPlanId")
+    Map<String, Object> getAmsSalePlanByPlanId(@RequestParam BigDecimal planId);
     /**
      * 通过主键修改销售计划
      * @param map
@@ -682,11 +710,11 @@ public interface AmsFeign {
     Map<String, Object> deleteAmsSalePlanByPlanId(@RequestParam BigDecimal planId);
 
     /**
-     * 获取规格型号
+     * 获取物资编码
      * @param
      * @return
      */
-    @ApiOperation(value="获取规格型号")
+    @ApiOperation(value="获取物资编码")
     @ApiImplicitParams({
     })
     @GetMapping(value = "/api/v1/ams/amssaleplans/getMaterialName")
@@ -703,6 +731,138 @@ public interface AmsFeign {
     @GetMapping(value = "/api/v1/ams/amssaleplans/getAreaName")
     Map<String, Object> getAreaName();
 
+    /**
+     * 查询销售计划物资信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(169)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("api/v1/ams/amssaleplanmaterials/getSalePlanMaterialInfo")
+    Map<String, Object> getSalePlanMaterialInfo(@RequestParam BigDecimal planId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize);
+
+    /**
+     * 新增销售计划物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSalePlanMaterial", value = "销售计划物资信息对象", required = false, dataType = "AmsSalePlanMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/addAmsSalePlanMaterial")
+    Map<String, Object> addAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 通过主键删除销售计划物资信息
+     * @param planMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键删除销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planId", value = "主键ID", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/deleteAmsSalePlanMaterial")
+    Map<String, Object> deleteAmsSalePlanMaterial(@RequestParam BigDecimal planMaterialId);
+
+    /**
+     * 通过主键查询销售计划物资信息
+     * @param planMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键查询销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "planMaterialId", value = "销售计划物资表主键", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/getAmsSalePlanMaterialByPlanMaterialId")
+    Map<String, Object> getAmsSalePlanMaterialByPlanMaterialId(@RequestParam BigDecimal planMaterialId);
+
+    /**
+     * 通过主键修改销售计划物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改销售计划物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSalePlanMaterial", value = "销售计划物资信息", required = false, dataType = "AmsSalePlanMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaleplanmaterials/upadteAmsSalePlanMaterial")
+    Map<String, Object> upadteAmsSalePlanMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 查询销售订单车序号详细信息
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询销售订单车序号详细信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(170)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("api/v1/ams/amssaletrucknomaterials/getTruckNoDetail")
+    Map<String, Object> getTruckNoDetail(@RequestParam BigDecimal saleOrderMaterialId,@RequestBody(required=false) Map<String,Object> mapValue,
+                                         @RequestParam Integer apiId,
+                                         @RequestParam Integer pageNum,
+                                         @RequestParam Integer pageSize);
+
+    /**
+     * 新增车序号物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="新增车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleTrucknoMaterial", value = "新增车序号物资对象", required = false, dataType = "AmsSaleTrucknoMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/addAmsSaleTrucknoMaterial")
+    Map<String, Object> addAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map);
+
+    /**
+     * 通过主键删除车序号物资信息
+     * @param trucknoMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键删除车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "trucknoMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/deleteAmsSaleTrucknoMaterial")
+    Map<String, Object> deleteAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId);
+
+    /**
+     * 通过主键渲染车序号物资信息
+     * @param trucknoMaterialId
+     * @return
+     */
+    @ApiOperation(value="通过主键渲染车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "saleOrderMaterialId", value = "主键Id", required = false, dataType = "java.math.BigDecimal")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/getAmsSaleTrucknoMaterial")
+    Map<String, Object> getAmsSaleTrucknoMaterial(@RequestParam BigDecimal trucknoMaterialId);
+
+    /**
+     * 通过主键修改车序号物资信息
+     * @param map
+     * @return
+     */
+    @ApiOperation(value="通过主键修改车序号物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "amsSaleTrucknoMaterial", value = "车序号物资信息对象", required = false, dataType = "AmsSaleTrucknoMaterial")
+    })
+    @PostMapping(value = "api/v1/ams/amssaletrucknomaterials/updateAmsSaleTrucknoMaterial")
+    Map<String, Object> updateAmsSaleTrucknoMaterial(@RequestBody(required = false) Map<String, Object> map);
+
     /*
        AmstruckPurplanController中所有接口
     */
@@ -908,4 +1068,16 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId);
 
+    @ApiOperation(value="查询app端公开抢单")
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getDispatchSaleOrderList")
+    Map<String,Object> getDispatchSaleOrderList();
+
+    @ApiOperation(value="抢单/接收订单锁定")
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/lockDispatchSaleOrder")
+    Map<String, Object> lockDispatchSaleOrder(@RequestParam Integer dispatchId,
+                                              @RequestParam Integer carrierId);
+
+    @ApiOperation(value="查询app端已抢的销售订单")
+    @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
+    Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -96,8 +97,8 @@ public interface OmsFeign {
                                               @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
                                               @RequestParam("orderType") Integer orderType,
                                               @RequestParam("orderStatus") Integer orderStatus,
-                                                    @RequestParam("fuelOrder") Integer fuelOrder,
-                                                    @RequestParam("con")      String con);
+                                              @RequestParam("fuelOrder") Integer fuelOrder,
+                                              @RequestParam("con")      String con);
     /**
      * 展示承运商接收销售公司已接受的销售订单
      * @param carrierId
@@ -107,10 +108,40 @@ public interface OmsFeign {
      * @return
      */
     @RequestMapping(value = "api/v1/oms/omstruckorders/getSaleOrderForCarrierList/{carrierId}",method = RequestMethod.POST)
-    Map<String,Object> getSaleOrderForCarrierList(@PathVariable("carrierId") Integer carrierId,
+    Map<String,Object> getSaleOrderForCarrierList(@RequestBody(required = false)Map<String,Object> map,
+                                                  @PathVariable("carrierId") Integer carrierId,
                                                   @RequestParam Integer apiId,
                                                   @RequestParam Integer pageNum,
-                                                  @RequestParam Integer pageSize);
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam String con
+                                                  );
+
+
+    /**
+     * 销售物流司机接收新的订单
+     */
+    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale/{orderReceiveStatus}")
+    Map<String,Object> getDriverInfoForSale(@RequestBody(required=false) Map<String,Object> mapValue,
+                                            @RequestParam("apiId")      Integer apiId,
+                                            @RequestParam("pageNum")    Integer pageNum,
+                                            @RequestParam("pageSize")   Integer pageSize,
+                                            @PathVariable               Integer orderReceiveStatus,
+                                            @RequestParam("orderType")  Integer orderType,
+                                            @RequestParam("orderStatus")Integer orderStatus,
+                                            @RequestParam("con")        String con,
+                                            @RequestParam("carrierId")  Integer carrierId
+    );
+
+    /**
+     * 销售司机派单
+     */
+
+    @PostMapping("api/v1/oms/omstruckorders/dispatchOrderForSale")
+    Map<String, Object> dispatchOrderForSale(@RequestBody(required = false) Map<String, Object> map);
+
+
+
+
 
     /**
      * 查询所有已经接收的焦炭发运日计划
@@ -120,8 +151,9 @@ public interface OmsFeign {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value = "api/v1/oms/omstruckorders/getCokeDayPlanAndRecivedList",method = RequestMethod.POST)
-    Map<String,Object> getCokeDayPlanAndRecivedList(@PathVariable("carrierId") Integer carrierId,
+    @RequestMapping(value = "api/v1/oms/omstruckorders/getCokeDayPlanAndRecivedList/{carrierId}",method = RequestMethod.POST)
+    Map<String,Object> getCokeDayPlanAndRecivedList(@RequestBody(required = false)Map<String,Object> map,
+                                                    @PathVariable("carrierId") Integer carrierId,
                                                     @RequestParam Integer apiId,
                                                     @RequestParam Integer pageNum,
                                                     @RequestParam Integer pageSize);
@@ -133,14 +165,64 @@ public interface OmsFeign {
      * @param apiId
      * @return
      */
-    @RequestMapping(value = "api/v1/oms/omstruckorders/getWaterSlagDayPlanAndRecivedList",method = RequestMethod.POST)
-    Map<String,Object> getWaterSlagDayPlanAndRecivedList(@PathVariable("carrierId") Integer carrierId,
+    @PostMapping(value = "api/v1/oms/omstruckorders/getWaterSlagDayPlanAndRecivedList/{carrierId}")
+    Map<String,Object> getWaterSlagDayPlanAndRecivedList(@RequestBody(required = false)Map<String,Object> map,
+                                                         @PathVariable("carrierId") Integer carrierId,
                                                          @RequestParam Integer apiId,
                                                          @RequestParam Integer pageNum,
                                                          @RequestParam Integer pageSize);
+    //查询空闲运力信息
+    @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityForLeisure/{carrierId}")
+    Map<String,Object> getCapacityForLeisure(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @PathVariable("carrierId")Integer carrierId);
 
     //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号
     @PostMapping("api/v1/oms/omstruckorders/selectNewOrderId")
     Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map);
+
+
+    @PostMapping(value = "api/v1/oms/omstruckorders/selectAllOrderForSale/{carrierId}")
+    Map<String, Object> selectAllOrderForSale(
+                                                   @RequestBody(required = false) Map<String,Object> mapValue,
+                                                   @PathVariable Integer carrierId,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("orderType") Integer orderType,
+                                                   @RequestParam("orderStatus") Integer orderStatus,
+                                                   @RequestParam("saleOrderMaterialId") Integer saleOrderMaterialId,
+                                                   @RequestParam("con") String  con
+    );
+
+
+    //展示已经形成虚拟订单的焦炭发运计划
+    @PostMapping(value = "api/v1/oms/omstruckorders/getCokeRailDayPlanForGenOrder/{carrierId}")
+   Map<String,Object>  getCokeRailDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
+                                                     @PathVariable("carrierId")  Integer carrierId,
+                                                     @RequestParam ("pageNum")   Integer pageNum,
+                                                     @RequestParam ("pageSize")  Integer pageSize,
+                                                     @RequestParam("apiId")      Integer apiId,
+                                                     @RequestParam("dayPlanId")  Integer dayPlanId,
+                                                     @RequestParam("orderType") Integer orderType,
+                                                     @RequestParam("orderStatus")Integer orderStatus,
+                                                     @RequestParam("con")  String con
+    );
+    @PostMapping(value = "api/v1/oms/omstruckorders/getWaterslagDayPlanForGenOrder/{carrierId}")
+    Map<String,Object>  getWaterslagDayPlanForGenOrder(@RequestBody(required = false)Map<String,Object> map,
+                                                      @PathVariable("carrierId") Integer carrierId,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("dayPlanId") Integer dayPlanId,
+                                                      @RequestParam("orderType")Integer orderType,
+                                                      @RequestParam("orderStatus") Integer orderStatus,
+                                                      @RequestParam("con") String con
+    );
+    
+    
+
 }
 

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

@@ -32,17 +32,19 @@ public interface QmsTruckFeign {
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/orderReceive")
     public Map<String, Object> orderReceive(@RequestBody(required=false) Map<String,Object> mapValue,
-                                      @RequestParam("apiId") Integer apiId,
-                                      @RequestParam("pageNum") Integer pageNum,
-                                      @RequestParam("pageSize") Integer pageSize,
-                                      @RequestParam("queueType") Integer queueType
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("queueType") Integer queueType,
+                                            @RequestParam("con")String con
     );
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueApply")
     public Map<String, Object> getQueueApply(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       @RequestParam("apiId") Integer apiId,
-                                       @RequestParam("pageNum") Integer pageNum,
-                                       @RequestParam("pageSize") Integer pageSize
+                                             @RequestParam("apiId") Integer apiId,
+                                             @RequestParam("pageNum") Integer pageNum,
+                                             @RequestParam("pageSize") Integer pageSize,
+                                             @RequestParam("con")String con
     );
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllQueueMes")
@@ -50,15 +52,17 @@ public interface QmsTruckFeign {
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("gatepostId") Integer gatepostId
+                                              @RequestParam("gatepostId") Integer gatepostId,
+                                              @RequestParam("con")String con
     );
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueListByQueueUp")
     public Map<String, Object> getQueueListByQueueUp(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("gridId") Integer gridId
+                                                     @RequestParam("apiId") Integer apiId,
+                                                     @RequestParam("pageNum") Integer pageNum,
+                                                     @RequestParam("pageSize") Integer pageSize,
+                                                     @RequestParam("gridId") Integer gridId,
+                                                     @RequestParam("con")String con
     );
 
 
@@ -68,9 +72,10 @@ public interface QmsTruckFeign {
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getChangeQueue")
     public Map<String, Object> getChangeQueue(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               @RequestParam("apiId") Integer apiId,
-                                               @RequestParam("pageNum") Integer pageNum,
-                                               @RequestParam("pageSize") Integer pageSize
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
     );
 
 
@@ -81,9 +86,11 @@ public interface QmsTruckFeign {
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueCancel")
     public Map<String, Object> getQueueCancel(@RequestBody(required=false) Map<String,Object> mapValue,
-                                        @RequestParam("apiId") Integer apiId,
-                                        @RequestParam("pageNum") Integer pageNum,
-                                        @RequestParam("pageSize") Integer pageSize
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
+
     );
 
 
@@ -103,7 +110,8 @@ public interface QmsTruckFeign {
     public Map<String, Object> getQueueInsert(@RequestBody(required=false) Map<String,Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("con")String con
     );
 
 
@@ -113,9 +121,10 @@ public interface QmsTruckFeign {
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getQueueEndResult")
     public Map<String, Object> getQueueEndResult(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           @RequestParam("apiId") Integer apiId,
-                                           @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize
+                                                 @RequestParam("apiId") Integer apiId,
+                                                 @RequestParam("pageNum") Integer pageNum,
+                                                 @RequestParam("pageSize") Integer pageSize,
+                                                 @RequestParam("con")String con
     );
 
 
@@ -124,7 +133,8 @@ public interface QmsTruckFeign {
                                                @RequestParam("apiId") Integer apiId,
                                                @RequestParam("pageNum") Integer pageNum,
                                                @RequestParam("pageSize") Integer pageSize,
-                                               @RequestParam("gridType") Integer gridType
+                                               @RequestParam("gridType") Integer gridType,
+                                               @RequestParam("con")String con
     );
 
 
@@ -132,7 +142,8 @@ public interface QmsTruckFeign {
     public Map<String, Object> listMonitor(@RequestBody(required=false) Map<String,Object> mapValue,
                                            @RequestParam("apiId") Integer apiId,
                                            @RequestParam("pageNum") Integer pageNum,
-                                           @RequestParam("pageSize") Integer pageSize
+                                           @RequestParam("pageSize") Integer pageSize,
+                                           @RequestParam("con")String con
     );
 
 
@@ -150,15 +161,33 @@ public interface QmsTruckFeign {
 
     @PostMapping("api/v1/queueTruck/qmsqueueresults/getAllExecutionOrder")
     public Map<String, Object> getAllExecutionOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                              @RequestParam("apiId") Integer apiId,
-                                              @RequestParam("pageNum") Integer pageNum,
-                                              @RequestParam("pageSize") Integer pageSize,
-                                              @RequestParam("orderType")Integer orderType,
-                                              @RequestParam("status")Integer status
+                                                    @RequestParam("apiId") Integer apiId,
+                                                    @RequestParam("pageNum") Integer pageNum,
+                                                    @RequestParam("pageSize") Integer pageSize,
+                                                    @RequestParam("orderType")Integer orderType,
+                                                    @RequestParam("status")Integer status,
+                                                    @RequestParam("con")String con
     );
 
 
-    @ApiOperation(value="查询某一个门岗的排队详情")
+
     @PostMapping("api/v1/queueTruck/qmsqueuelists/getListQueueMes")
-    public RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue);
+    RESTfulResult getListQueueMes(@RequestBody(required=false) Map<String, Object> mapValue);
+
+
+
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueChange")
+    Map<String, Object> getWarehouseQueueChange(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("con")String con
+    );
+    @PostMapping("api/v1/queueTruck/qmsqueueresults/getWarehouseQueueEndMes")
+    Map<String, Object> getWarehouseQueueEndMes(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                @RequestParam("apiId") Integer apiId,
+                                                @RequestParam("pageNum") Integer pageNum,
+                                                @RequestParam("pageSize") Integer pageSize,
+                                                @RequestParam("con")String con
+    );
 }

src/main/resources/bootstrap.yml

@@ -39,7 +39,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:localhost:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
+    url: ${TMSTRUCKFEIGN_URL:172.16.33.161:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:localhost:8090}
   WMSHFeign: