合并销售部分oms代码以及合并内转tms-train

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

@@ -199,5 +199,69 @@ public class OMSController {
                 orderReceiveStatus, orderType, orderStatus);
     }
 
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     *
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/getSaleOrderForCarrierList/{carrierId}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "168", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getSaleOrderForCarrierList(@PathVariable("carrierId") Integer carrierId,
+                                                          Integer apiId,
+                                                          Integer pageNum,
+                                                          Integer pageSize) {
+        return omsFeign.getSaleOrderForCarrierList(carrierId, apiId, pageNum, pageSize);
+
+    }
+
+    /**
+     * 查询所有已经接收的焦炭发运日计划
+     *
+     * @param carrierId
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @PostMapping("/getCokeDayPlanAndRecivedList")
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "169", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getCokeDayPlanAndRecivedList(@PathVariable("carrierId") Integer carrierId,
+                                                            @RequestParam Integer apiId,
+                                                            @RequestParam Integer pageNum,
+                                                            @RequestParam Integer pageSize) {
+        return omsFeign.getCokeDayPlanAndRecivedList(carrierId, apiId, pageNum, pageSize);
+    }
+
+    /**
+     * 查询所有已经接收的水渣发运日计划
+     *
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @PostMapping("/getWaterSlagDayPlanAndRecivedList")
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "170", required = false, dataType = "BigDecimal"),
+    })
+    public Map<String, Object> getWaterSlagDayPlanAndRecivedList(@PathVariable("carrierId") Integer carrierId,
+                                                                 @RequestParam Integer apiId,
+                                                                 @RequestParam Integer pageNum,
+                                                                 @RequestParam Integer pageSize) {
+        return omsFeign.getWaterSlagDayPlanAndRecivedList(carrierId, apiId, pageNum, pageSize);
+    }
+
+
 
 }

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

@@ -1271,6 +1271,108 @@ public class TMSController extends BaseRESTfulController {
     public RESTfulResult updateQualityResult(@RequestBody(required=false) Map<String,Object> mapValue){
         return tmsTruckFeign.updateQualityResult(mapValue);
     }
+    //*********************************内转物流tms-train*********************************************************************
+    @PostMapping("/addTrainLoadResultForConverted")
+    @ApiOperation(value = "内转物流新增装车")
+    public Map<String,Object> addTrainLoadResultForConverted(Map<String,Object> tmstrainLoadingResult){
+        Map<String,Object> resTfulResult = tmsTrainFeign.addTrainLoadResultForConverted(tmstrainLoadingResult);
+        return resTfulResult;
+    }
+    @PostMapping("/selectLoadByResultId/{resultId}")
+    @ApiOperation(value = "内转物流通过主键查询车皮装车作业信息")
+    public Map<String,Object> selectLoadByResultId(@PathVariable("resultId") BigDecimal resultId){
+        Map<String,Object> resTfulResult = tmsTrainFeign.selectLoadByResultId(resultId);
+        return resTfulResult;
+    }
+
+    @ApiOperation(value="内转查询装车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(203)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getTmstrainWagonLoadForConverted")
+    public Map<String,Object> getTmstrainWagonLoadForConverted(@RequestBody(required=false)
+                                                                       Integer apiId,
+                                                               Integer pageNum,
+                                                               Integer pageSize
+    ){
+        return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize);
+    }
+    @PostMapping("/addWagonApprove")
+    @ApiOperation(value = "内转物流新增装车")
+    public Map<String,Object> addWagonApprove(Map<String,Object> tmstrainLoadingResult){
+        Map<String,Object> resTfulResult = tmsTrainFeign.addWagonApprove(tmstrainLoadingResult);
+        return resTfulResult;
+    }
+    @ApiOperation(value="内转查询请车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(199)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllWagonPleaseForConverted")
+    public Map<String,Object> getAllWagonPleaseForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                            Integer apiId,
+                                                            Integer pageNum,
+                                                            Integer pageSize,
+                                                            Integer status
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("status", status);
+        return tmsTrainFeign.getTmstrainWagonLoadForConverted(apiId, pageNum, pageSize);
+    }
+    @PostMapping("/getPleasePlanByResultId/{resultId}")
+    @ApiOperation(value = "内转物流通过主键查请车计划")
+    public Map<String,Object> getPleasePlanByResultId(@PathVariable("resultId") BigDecimal resultId){
+        Map<String,Object> resTfulResult = tmsTrainFeign.getPleasePlanByResultId(resultId);
+        return resTfulResult;
+    }
+    @PostMapping("/getApproveByResultId/{resultId}")
+    @ApiOperation(value = "内转物流通过主键查询车皮请车作业信息")
+    public Map<String,Object> getApproveByResultId(@PathVariable("resultId") BigDecimal resultId){
+        Map<String,Object> resTfulResult = tmsTrainFeign.getApproveByResultId(resultId);
+        return resTfulResult;
+    }
+    @ApiOperation(value="内转查询卸车作业信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(201)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+
+    })
+    @PostMapping("/selectWagonUnLoadResultForConverted")
+    public Map<String,Object> selectWagonUnLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                                  Integer apiId,
+                                                                  Integer pageNum,
+                                                                  Integer pageSize
+    ){
+        return tmsTrainFeign.selectWagonUnLoadResultForConverted(apiId, pageNum, pageSize);
+    }
+    @ApiOperation(value="内转查询火车卸货信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(202)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+
+    })
+    @PostMapping("/selectTrainUnLoadResultForConverted")
+    public Map<String,Object> selectTrainUnLoadResultForConverted(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                                  Integer apiId,
+                                                                  Integer pageNum,
+                                                                  Integer pageSize
+    ){
+        return tmsTrainFeign.selectWagonUnLoadResultForConverted(apiId, pageNum, pageSize);
+    }
+
 
 
 

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

@@ -2,10 +2,7 @@ package com.steerinfo.dil.feign;
 
 import com.steerinfo.framework.controller.RESTfulResult;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Map;
 
@@ -95,4 +92,45 @@ public interface OmsFeign {
                                               @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
                                               @RequestParam("orderType") Integer orderType,
                                               @RequestParam("orderStatus") Integer orderStatus);
+    /**
+     * 展示承运商接收销售公司已接受的销售订单
+     * @param carrierId
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "api/v1/oms/omstruckorders/getSaleOrderForCarrierList/{carrierId}",method = RequestMethod.POST)
+    Map<String,Object> getSaleOrderForCarrierList(@PathVariable("carrierId") Integer carrierId,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize);
+
+    /**
+     * 查询所有已经接收的焦炭发运日计划
+     * @param carrierId
+     * @param apiId
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value = "api/v1/oms/omstruckorders/getCokeDayPlanAndRecivedList",method = RequestMethod.POST)
+    Map<String,Object> getCokeDayPlanAndRecivedList(@PathVariable("carrierId") Integer carrierId,
+                                                    @RequestParam Integer apiId,
+                                                    @RequestParam Integer pageNum,
+                                                    @RequestParam Integer pageSize);
+    /**
+     *查询所有已经接收的水渣发运日计划
+     * @param
+     * @param pageNum
+     * @param pageSize
+     * @param apiId
+     * @return
+     */
+    @RequestMapping(value = "api/v1/oms/omstruckorders/getWaterSlagDayPlanAndRecivedList",method = RequestMethod.POST)
+    Map<String,Object> getWaterSlagDayPlanAndRecivedList(@PathVariable("carrierId") Integer carrierId,
+                                                         @RequestParam Integer apiId,
+                                                         @RequestParam Integer pageNum,
+                                                         @RequestParam Integer pageSize);
 }
+

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

@@ -162,4 +162,26 @@ public interface TmsTrainFeign {
 
     @PostMapping("api/v1/trainTms/tmstrainpleaseapproveresults/deleteApproveWagonPlease/{resultId}")
     public RESTfulResult deleteApproveWagonPlease(@PathVariable("resultId") Integer resultId);
+    //*****************************************内转物流***************************************************
+    @PostMapping("api/v1/trainTms/tmstrainloadingresults/addTrainLoadResultForConverted")
+    Map<String,Object>  addTrainLoadResultForConverted(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
+    @PostMapping ("api/v1/trainTms/tmstrainloadingresults/selectLoadByResultId/{resultId}")
+    Map<String,Object> selectLoadByResultId(@PathVariable("resultId")BigDecimal resultId);
+    @PostMapping("api/v1/trainTms/tmstrainloadingresults/getTmstrainWagonLoadForConverted")
+    Map<String,Object> getTmstrainWagonLoadForConverted(@RequestBody(required=false)
+                                                        @RequestParam("apiId") Integer apiId,
+                                                        @RequestParam("pageNum") Integer pageNum,
+                                                        @RequestParam("pageSize") Integer pageSize);
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getPleasePlanByResultId/{resultId}")
+    Map<String,Object> getPleasePlanByResultId(@PathVariable("resultId")BigDecimal resultId);
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/getApproveByResultId/{resultId}")
+    Map<String,Object> getApproveByResultId(@PathVariable("resultId")BigDecimal resultId);
+
+    @PostMapping("api/v1/trainTms/tmstrainwagonunloadresults/selectWagonUnLoadResultForConverted")
+    Map<String,Object>  selectWagonUnLoadResultForConverted(@RequestBody(required=false)
+                                                            @RequestParam("apiId") Integer apiId,
+                                                            @RequestParam("pageNum") Integer pageNum,
+                                                            @RequestParam("pageSize") Integer pageSize);
+    @PostMapping ("api/v1/trainTms/tmstrainpleaseapproveresults/addWagonApprove")
+    Map<String,Object> addWagonApprove(@RequestBody(required = false) Map<String, Object> tmstrainPleaseApproveResult);
 }

src/main/resources/bootstrap.yml

@@ -74,4 +74,4 @@ mybatis:
     call-setters-on-nulls: true
 
 server:
-  port: 8099
+  port: 8097