'合并'

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

@@ -1,6 +1,7 @@
 package com.steerinfo.dil.controller;
 
 import com.steerinfo.dil.feign.AmsFeign;
+import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
@@ -455,6 +456,7 @@ public class AMScontroller{
     public Map<String, Object> getDeliveryAddress(){
         return amsFeign.getDeliveryAddress();
     }
+
     @PostMapping("/addAmsDispatchSaleOrder")
     Map<String, Object> addAmsDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
         return amsFeign.addAmsDispatchSaleOrder(mapVal);
@@ -721,11 +723,12 @@ public class AMScontroller{
     public Map<String,Object> amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
-                                          Integer apiId) {
+                                          Integer apiId,
+                                           Integer status    ) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.amsSaleOrderList(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.amsSaleOrderList(mapValue, pageNum, pageSize, apiId,status);
     }
 
     //固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
@@ -739,19 +742,20 @@ public class AMScontroller{
     @PostMapping("/getAmsSaleOrderMaterial")
     @ApiOperation(value = "展示车序号列表")
     public Map<String,Object> getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
-                                                 Integer pageNum,
-                                                 Integer pageSize,
-                                                 Integer apiId) {
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      Integer status) {
         if (mapValue == null) {
             mapValue = new HashMap<>();
         }
-        return amsFeign.getAmsSaleOrderMaterial(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getAmsSaleOrderMaterial(mapValue, pageNum, pageSize, apiId,status);
     }
 
     //新增公开派单
-    @PostMapping("/addOpenAmsDispatchSaleOrder/{saleOrderMaterialId}")
-    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderId) {
-        return amsFeign.addOpenAmsDispatchSaleOrder(saleOrderId);
+    @PostMapping("/addOpenAmsDispatchSaleOrder/{orderMaterialId}")
+    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("orderMaterialId") BigDecimal orderMaterialId) {
+        return amsFeign.addOpenAmsDispatchSaleOrder(orderMaterialId);
     }
 
     //删除公开派单
@@ -956,4 +960,33 @@ public class AMScontroller{
     public Map<String, Object> getLockDispatchSaleOrderList(Integer carrierId) {
         return amsFeign.getLockDispatchSaleOrderList(carrierId);
     }
+
+    @PostMapping("/selectDispatchSaleOrderList")
+    public Map<String, Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                           Integer apiId,
+                                                           Integer pageNum,
+                                                           Integer pageSize){
+        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize);
+    }
+
+    //获取到站名称
+    @GetMapping("/getArriveName")
+    public Map<String,Object> getArriveName() {
+        return amsFeign.getArriveName();
+    }
+
+    @ApiModelProperty(value = "查询所有的钢材物资")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "232", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getAllSteelMaterialMes")
+    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                Integer pageNum,
+                                                Integer pageSize,
+                                                Integer apiId,
+                                                String con) {
+        return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
 }

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

@@ -273,19 +273,19 @@ public class OMSController {
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
-    @PostMapping("/getDriverInfoForSale/{orderReceiveStatus}")
+    @PostMapping("/getDriverInfoForSale")
    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
+                                            Integer carrierId
     )
     {
-        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderReceiveStatus, orderType, orderStatus, con,carrierId);
+        return omsFeign.getDriverInfoForSale(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, orderType, orderStatus, con,carrierId);
     }
 
 
@@ -366,7 +366,7 @@ public class OMSController {
                                                            Integer orderType,
                                                            String con
     ){
-        return  omsFeign.getCokeRailDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
+        return  omsFeign.getCokeRailDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus, orderType, con);
     }
 
 
@@ -384,7 +384,8 @@ public class OMSController {
 
 
    ){
-        return omsFeign.getWaterslagDayPlanForGenOrder(map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
+        return omsFeign.getWaterslagDayPlanForGenOrder(map==null?new HashMap<>():map, carrierId, pageNum, pageSize, apiId, dayPlanId, orderStatus,orderType, con);
+
    }
 
     @ApiOperation(value="车牌号下拉")
@@ -406,8 +407,89 @@ public class OMSController {
     public Map<String, Object> addAppTruckOrder(Integer dispatchId,
                                                 Integer orderType,
                                                 Integer driverCapacityId) {
-        Map<String,Object> map = omsFeign.addAppTruckOrder(dispatchId,orderType,driverCapacityId);
+        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType, driverCapacityId);
         return map;
     }
+    //展示销售订单信息
+    @ApiOperation(value="展示销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectSteelSaleForCarrier/{carrierId}")
+    public Map<String, Object> selectSteelSaleForCarrier(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         @PathVariable Integer carrierId
+
+    )
+
+    {
+        return omsFeign.selectSteelSaleForCarrier(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierId);
+    }
+
+
+
+    @ApiOperation(value=" 通过销售订单id查找信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(235)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectInfoBySaleOrderId/{saleOrderId}")
+    public Map<String, Object> selectInfoBySaleOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                       Integer apiId,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       @PathVariable Integer saleOrderId
+
+
+    ){
+        return  omsFeign.selectInfoBySaleOrderId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,saleOrderId);
+    }
+
+    //展示发运计划信息
+    @ApiOperation(value="展示发运计划信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectCokeRailPlan/{carrierId}")
+    public Map<String, Object> selectCokeRailPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  @PathVariable Integer carrierId,
+                                                  Integer orderType
+
+    ){
+        return  omsFeign.selectCokeRailPlan(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, carrierId, orderType);
+    }
+
+    @ApiOperation(value=" 通过发运id查找信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/selectInfoByDayPlanId/{dayPlanId}")
+    public Map<String, Object> selectInfoByDayPlanId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     @PathVariable  Integer dayPlanId,
+                                                     Integer orderType
+
+
+    ){
+        return omsFeign.selectInfoByDayPlanId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, dayPlanId, orderType);
+    }
 
 }

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

@@ -572,6 +572,15 @@ public interface AmsFeign {
     })
     @GetMapping(value = "/api/v1/ams/amssaleorders/getConsigneeCompanyName")
     Map<String, Object> getConsigneeCompanyName();
+    //获取到站名称
+    @GetMapping("/api/v1/ams/amstruckraildayplans/getArriveName")
+    Map<String,Object> getArriveName();
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/selectDispatchSaleOrderList")
+    Map<String,Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam("apiId") Integer apiId,
+                                                   @RequestParam("pageNum") Integer pageNum,
+                                                   @RequestParam("pageSize") Integer pageSize);
+
     /**
      * 新增销售订单物资信息
      * @param map
@@ -928,9 +937,10 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderList")
     Map<String,Object> amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
-                                   @RequestParam Integer pageNum,
-                                   @RequestParam Integer pageSize,
-                                   @RequestParam Integer apiId);
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer status);
 
     //固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
     @PostMapping(value = "/api/v1/ams/amssaleorders/addAmsDispatchSaleOrder")
@@ -944,12 +954,13 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderMaterial")
     Map<String,Object> getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
-                                          @RequestParam Integer pageNum,
-                                          @RequestParam Integer pageSize,
-                                          @RequestParam Integer apiId);
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId,
+                                               @RequestParam("status") Integer status);
     //新增公开派单
-    @PostMapping(value = "/api/v1/ams/amssaleorders/addOpenAmsDispatchSaleOrder/{saleOrderMaterialId}")
-    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderId);
+    @PostMapping(value = "/api/v1/ams/amssaleorders/addOpenAmsDispatchSaleOrder/{orderMaterialId}")
+    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("orderMaterialId") BigDecimal orderMaterialId);
     //删除公开派单
     @PostMapping(value = "/api/v1/ams/amssaleorders//deleteAmsDispatchSaleOrder/{dispatchId}")
     Map<String,Object> deleteAmsDispatchSaleOrder(@PathVariable("dispatchId")BigDecimal saleOrderId);
@@ -1080,4 +1091,11 @@ public interface AmsFeign {
     @ApiOperation(value="查询app端已抢的销售订单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
     Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
+
+    @PostMapping("/api/v1/ams/amssaleplans/getAllSteelMaterialMes")
+    public Map<String, Object> getAllSteelMaterialMes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @RequestParam Integer pageNum,
+                                                      @RequestParam Integer pageSize,
+                                                      @RequestParam Integer apiId,
+                                                      @RequestParam String con) ;
 }

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

@@ -121,12 +121,12 @@ public interface OmsFeign {
     /**
      * 销售物流司机接收新的订单
      */
-    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale/{orderReceiveStatus}")
+    @PostMapping(value = "api/v1/oms/omstruckorders/getDriverInfoForSale")
     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,
@@ -207,8 +207,8 @@ public interface OmsFeign {
                                                      @RequestParam ("pageSize")  Integer pageSize,
                                                      @RequestParam("apiId")      Integer apiId,
                                                      @RequestParam("dayPlanId")  Integer dayPlanId,
-                                                     @RequestParam("orderType") Integer orderType,
                                                      @RequestParam("orderStatus")Integer orderStatus,
+                                                     @RequestParam("orderType") Integer orderType,
                                                      @RequestParam("con")  String con
     );
     @PostMapping(value = "api/v1/oms/omstruckorders/getWaterslagDayPlanForGenOrder/{carrierId}")
@@ -223,6 +223,44 @@ public interface OmsFeign {
                                                       @RequestParam("con") String con
     );
 
+    @PostMapping("api/v1/oms/omstruckorders/selectSteelSaleForCarrier/{carrierId}")
+    public Map<String,Object> selectSteelSaleForCarrier(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                   @RequestParam Integer apiId,
+                                                   @RequestParam Integer pageNum,
+                                                   @RequestParam Integer pageSize,
+                                                   @PathVariable Integer carrierId
+    );
+
+    @PostMapping("api/v1/oms/omstruckorders/selectInfoBySaleOrderId/{saleOrderId}")
+    public Map<String,Object> selectInfoBySaleOrderId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @PathVariable Integer saleOrderId
+
+
+    )  ;
+    @PostMapping("api/v1/oms/omstruckorders/selectCokeRailPlan/{carrierId}")
+     Map<String,Object> selectCokeRailPlan(@RequestBody(required=false) Map<String,Object> mapValue,
+                                      @RequestParam Integer apiId,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                       @PathVariable Integer carrierId,
+                                      @RequestParam  Integer orderType
+
+    );
+    @PostMapping("api/v1/oms/omstruckorders/selectInfoByDayPlanId/{dayPlanId}")
+     Map<String,Object> selectInfoByDayPlanId(@RequestBody(required=false) Map<String,Object> mapValue,
+                                              @RequestParam Integer apiId,
+                                              @RequestParam Integer pageNum,
+                                              @RequestParam Integer pageSize,
+                                               @PathVariable  Integer dayPlanId,
+                                               @RequestParam Integer orderType
+
+
+    );
+
+
 
     @ApiOperation(value="车牌号下拉")
     @GetMapping(value = "api/v1/oms/omstruckorders/getDriverCapacity")