合并ams

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

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -616,4 +617,141 @@ public class AMScontroller extends BaseRESTfulController {
     public Map<String,Object> getLineRoute(){
         return amsFeign.getLineRoute();
     }
+
+    //销售订单-固定派单-公开派单-日计划
+
+
+    //展示销售公司已审核销售订单的车序号列表
+    @PostMapping("/getSaleOrderList")
+    @ApiOperation(value = "查询汽运单价信息")
+    public RESTfulResult amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          Integer pageNum,
+                                          Integer pageSize,
+                                          Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.amsSaleOrderList(mapValue, pageNum, pageSize, apiId);
+    }
+
+    //固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
+    @PostMapping("/addFixedAmsDispatchSaleOrder")
+    Map<String,Object> addFixedAmsDispatchSaleOrder(@RequestBody(required = false) List<Map<String,Object>> mapValue) {
+        return amsFeign.addFixedAmsDispatchSaleOrder(mapValue);
+    }
+
+    //公开派单
+    //查询未分派车辆的销售订单的车序号
+    @PostMapping("/getAmsSaleOrderMaterial")
+    @ApiOperation(value = "展示车序号列表")
+    public RESTfulResult getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                 Integer pageNum,
+                                                 Integer pageSize,
+                                                 Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsSaleOrderMaterial(mapValue, pageNum, pageSize, apiId);
+    }
+
+    //新增公开派单
+    @PostMapping("/addOpenAmsDispatchSaleOrder/{saleOrderMaterialId}")
+    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderId) {
+        return amsFeign.addOpenAmsDispatchSaleOrder(saleOrderId);
+    }
+
+    //删除公开派单
+    @PostMapping("/deleteAmsDispatchSaleOrder/{dispatchId}")
+    Map<String,Object> deleteAmsDispatchSaleOrder(@PathVariable("dispatchId") BigDecimal saleOrderId) {
+        return amsFeign.deleteAmsDispatchSaleOrder(saleOrderId);
+    }
+
+    //展示公开派单
+    @PostMapping("/getOpenDispatchSaleOrder")
+    @ApiOperation(value = "公开派单")
+    public RESTfulResult getOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getOpenDispatchSaleOrder(mapValue, pageNum, pageSize, apiId);
+    }
+
+    //修改公开派单
+    @PostMapping("/updateOpenDispatchSaleOrder")
+    Map<String,Object> updateOpenDispatchSaleOrder(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.updateOpenDispatchSaleOrder(mapVal);
+    }
+
+    //焦炭、水渣日计划
+    //新增
+    @PostMapping("/addTruckRailDayPlan")
+    public Map<String,Object> addTruckRailDayPlan(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.addTruckRailDayPlan(mapVal);
+    }
+    //删除
+    @PostMapping("/deleteTruckRailDayPlan/{dayPlanId}")
+    public Map<String,Object> deleteTruckRailDayPlan(@PathVariable("dayPlanId") BigDecimal dayPlanId) {
+        return amsFeign.deleteTruckRailDayPlan(dayPlanId);
+    }
+    //修改
+    @PostMapping("/updateTruckRailDayPlan")
+    public Map<String,Object> updateTruckRailDayPlan(@RequestBody  Map<String, Object> mapVal) {
+        return amsFeign.updateTruckRailDayPlan(mapVal);
+    }
+    //展示日计划
+    @PostMapping("/getTruckRailDayPlanList")
+    @ApiOperation(value = "焦炭日计划")
+    public RESTfulResult getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckRailDayPlan(mapValue, pageNum, pageSize, apiId);
+    }
+    //展示日计划
+    @PostMapping("/getSzTruckRailDayPlanList")
+    @ApiOperation(value = "水渣日计划")
+    public RESTfulResult getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSzTruckRailDayPlan(mapValue, pageNum, pageSize, apiId);
+    }
+
+    //新增钢材发往异地库计划
+    @PostMapping("/addRailOffsetDayplan")
+    public Map<String,Object> addRailOffsetDayplan(@RequestBody  Map<String, Object> mapVal){
+        return amsFeign.addRailOffsetDayplan(mapVal);
+    }
+    //删除钢材发往异地库计划
+    @PostMapping("/deleteRailOffsetDayplan/{dayPlanId}")
+    public Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayPlanId") BigDecimal dayPlanId) {
+        return amsFeign.deleteRailOffsetDayplan(dayPlanId);
+    }
+    //修改钢材发往异地库计划
+    @PostMapping("/updateRailOffsetDayplan")
+    public Map<String,Object> updateRailOffsetDayplan(@RequestBody  Map<String, Object> mapVal){
+        return amsFeign.updateRailOffsetDayplan(mapVal);
+    }
+
+    //展示钢材发往异地库计划
+    @PostMapping("/getRailOffsetDayplan")
+    @ApiOperation(value = "展示钢材发往异地库计划")
+    public RESTfulResult getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getRailOffsetDayplan(mapValue, pageNum, pageSize, apiId);
+    }
 }

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

@@ -8,6 +8,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -749,13 +750,8 @@ public interface AmsFeign {
     //*****************************************内转物流**************************************
     //查询汽运单价
     @PostMapping(value = "/api/v1/ams/amscontracttransportprices/getAmsContractTransportPriceForConverted")
-<<<<<<< HEAD
-    Map<String,Object> getAmsContractTransportPriceForConverted(@RequestParam("lineId") BigDecimal lineId,
-                                                                @RequestParam("apiId")  Integer apiId,
-=======
     Map<String,Object> getAmsContractTransportPriceForConverted(@RequestParam("lineId")BigDecimal lineId,
                                                                 @RequestParam("apiId")Integer apiId,
->>>>>>> ab3706e4019b68de223c05db280a865bdd315882
                                                                 @RequestParam("pageNum")Integer pageNum,
                                                                 @RequestParam("pageSize")Integer pageSize);
     //获得运输线路
@@ -763,6 +759,112 @@ public interface AmsFeign {
     Map<String,Object> getLineRoute();
 
 
+    /**
+     *展示销售公司已审核销售订单的车序号列表
+     * @param mapValue
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @ApiOperation(value="查询销售公司已审核销售订单的车序号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(181)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getSaleOrderList")
+    RESTfulResult amsSaleOrderList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                   @RequestParam Integer pageNum,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam Integer apiId);
+
+    //固定派单：通过车序号查询收货地址，截取收货地址的区域，去资源管理中查询对应的承运商,将车序号与承运商绑定
+    @PostMapping(value = "/api/v1/ams/amssaleorders/addAmsDispatchSaleOrder")
+    Map<String,Object> addFixedAmsDispatchSaleOrder(@RequestBody(required = false) List<Map<String,Object>> mapValue);
+
+    //公开派单
+    //查询未分派车辆的销售订单的车序号
+    @ApiOperation(value="展示车序号列表")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(182)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getAmsSaleOrderMaterial")
+    RESTfulResult getAmsSaleOrderMaterial(@RequestBody(required = false) Map<String, Object> mapValue,
+                                          @RequestParam Integer pageNum,
+                                          @RequestParam Integer pageSize,
+                                          @RequestParam Integer apiId);
+    //新增公开派单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/addOpenAmsDispatchSaleOrder/{saleOrderMaterialId}")
+    Map<String,Object> addOpenAmsDispatchSaleOrder(@PathVariable("saleOrderMaterialId") BigDecimal saleOrderId);
+    //删除公开派单
+    @PostMapping(value = "/api/v1/ams/amssaleorders//deleteAmsDispatchSaleOrder/{dispatchId}")
+    Map<String,Object> deleteAmsDispatchSaleOrder(@PathVariable("dispatchId")BigDecimal saleOrderId);
+
+    //展示公开派单
+    @ApiOperation(value="展示公开派单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(181)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amssaleorders/getOpenDispatchSaleOrder")
+    RESTfulResult getOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId);
+    //修改公开派单
+    @PostMapping(value = "/api/v1/ams/amssaleorders/updateOpenDispatchSaleOrder")
+    Map<String,Object> updateOpenDispatchSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    //新增日计划
+    @PostMapping(value = "/api/v1/ams/amstruckraildayplans/addTruckRailDayPlan")
+    Map<String,Object> addTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    //删除日计划
+    @PostMapping(value = "/api/v1/ams/amstruckraildayplans/deleteTruckRailDayPlan/{dayPlanId}")
+    Map<String,Object> deleteTruckRailDayPlan(@PathVariable("dayPlanId") BigDecimal dayPlanId);
+    //修改日计划
+    @PostMapping(value = "/api/v1/ams/amstruckraildayplans/updateTruckRailDayPlan")
+    Map<String,Object> updateTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapVal);
+    //查询日计划
+    @ApiOperation(value="展示焦炭日计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(183)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getTruckRailDayPlanList")
+    RESTfulResult getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                      @RequestParam Integer pageNum,
+                                      @RequestParam Integer pageSize,
+                                      @RequestParam Integer apiId);
+    //查询日计划
+    @ApiOperation(value="展示水渣日计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(183)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getSzTruckRailDayPlanList")
+    RESTfulResult getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam Integer apiId);
+
+    //新增钢材发往异地库日计划
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/addRailOffsetDayplan")
+    Map<String,Object> addRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    //删除钢材发往异地库计划
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/deleteRailOffsetDayplan/{dayPlanId}")
+    Map<String,Object> deleteRailOffsetDayplan(@PathVariable("dayPlanId") BigDecimal dayPlanId);
+
+    //修改钢材发往异地库计划
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/addRailOffsetDayplan")
+    Map<String,Object> updateRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapVal);
+
+    //展示钢材发往异地库计划
+    @ApiOperation(value="展示钢材发往异地库计划")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(183)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/getRailOffsetDayplan")
+    RESTfulResult getRailOffsetDayplan(@RequestBody(required = false) Map<String, Object> mapValue,
+                                       @RequestParam Integer pageNum,
+                                       @RequestParam Integer pageSize,
+                                       @RequestParam Integer apiId);
 
 
 }