新增加密

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

@@ -1273,4 +1273,113 @@ public class AMScontroller{
     }
 
 
+    @ApiModelProperty(value = "查询车序号信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "411", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getTruckNoList")
+    public RESTfulResult getTruckNoList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                         Integer apiId,
+                                         Integer pageNum,
+                                         Integer pageSize,
+                                         Integer issueStatus,
+                                         String con){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getTruckNoList(mapValue,apiId,pageNum,pageSize,issueStatus,con);
+    }
+
+    @PostMapping("getSaleOrderInfoes")
+    @ApiOperation(value = "查询汽运单价信息")
+    public Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderInfoes(mapValue, pageNum, pageSize, apiId);
+    }
+
+    @ApiOperation(value="查询已上报销售订单信息")
+    @PostMapping("/getSaleOrderReportedes")
+    Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderReportedes(mapValue,pageNum,pageSize,apiId);
+    }
+
+    @ApiModelProperty(value = "展示销售公司已审核的订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "409", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListBySaleCompanyes")
+    public Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                              Integer pageNum,
+                                                              Integer pageSize,
+                                                              Integer apiId,
+                                                              String con){
+        return   amsFeign.getSaleOrderListBySaleCompanyes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @PostMapping("getAmsSaleOrderApprovedes")
+    @ApiOperation(value = "查询财务已审批销售订单信息")
+    public Map<String, Object> getAmsSaleOrderApprovedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         Integer apiId) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getAmsSaleOrderApprovedes(mapValue, pageNum, pageSize, apiId);
+    }
+
+    /*
+     *  根据销售订单主键展示销售基本信息、物资信息
+     * apiId=410
+     * */
+    @PostMapping(value="/getSaleOrderAndMaterialById")
+    public RESTfulResult  getSaleOrderAndMaterialById(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer saleOrderId){
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return amsFeign.getSaleOrderAndMaterialById(mapValue,apiId,pageNum,pageSize,new BigDecimal(saleOrderId));
+    }
+
+    @ApiOperation(value = "新增车序号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "车序号信息", required = false, dataType = ""),
+    })
+    @PostMapping("/addTruckNo")
+    public Map<String, Object> addTruckNo(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.addTruckNo(mapList);
+    }
+
+    @ApiOperation(value = "下发车序号")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapList", value = "车序号信息", required = false, dataType = ""),
+    })
+    @PostMapping("/issueTruckNo")
+    public Map<String, Object> issueTruckNo(@RequestBody List<Map<String,Object>> mapList) {
+        return amsFeign.issueTruckNo(mapList);
+    }
+
+    @ApiOperation(value="销售新增定向派单且直接下发")
+    @PostMapping("/addDispatchSaleOrder")
+    public Map<String,Object> addDispatchSaleOrder(@RequestBody Map<String,Object> mapValue) {
+        return amsFeign.addDispatchSaleOrder(mapValue);
+    }
 }

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

@@ -414,10 +414,10 @@ public class OMSController {
 
     @ApiOperation(value="承运商分派运输订单给司机")
     @PostMapping("/addAppTruckOrder")
-    public Map<String, Object> addAppTruckOrder(Integer dispatchId,
-                                                Integer orderType,
-                                                String capacityNumber,
-                                                Integer carrierId) {
+    public Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
+                                                @RequestParam Integer orderType,
+                                                @RequestParam String capacityNumber,
+                                                @RequestParam Integer carrierId) {
         Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType,capacityNumber, carrierId);
         return map;
     }
@@ -577,6 +577,13 @@ public class OMSController {
         return omsFeign.sendOrderToApp(capacityNumber);
     }
 
+    @ApiOperation(value = "根据运输订单号查询订单物资")
+    @PostMapping("/getUnloadOrderMaterial")
+    public Map<String,Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String,Object>map){
+        return omsFeign.getUnloadOrderMaterial(map);
+    }
+
+
     @ApiOperation(value = "分解异地库计划")
     @PostMapping("/apportionInwardOffsetOrder")
     public Map<String,Object> apportionInwardOffsetOrder(@RequestBody Map<String,Object> mapvalue) {
@@ -648,4 +655,11 @@ public class OMSController {
     public Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map){
         return omsFeign.updateOmstruckOrder(map);
     }
+
+    @ApiOperation(value="承运商销售分派运输订单给司机")
+    @PostMapping("/addSaleTruckOrder")
+    public Map<String, Object> addSaleTruckOrder(@RequestBody Map<String,Object> mapValue) {
+        Map<String, Object> map = omsFeign.addSaleTruckOrder(mapValue);
+        return map;
+    }
 }

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

@@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.*;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 @RestController
 @RequestMapping("${api.version}/rms")
@@ -712,8 +713,6 @@ public class RMScontroller {
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
     })
-
-
     @PostMapping(value = "/getNoticeList")
     public Map<String, Object> getNoticeList(@RequestBody(required = false) Map<String, Object> mapValue,
                                              Integer apiId,
@@ -749,6 +748,50 @@ public class RMScontroller {
     }
 
 
+    //港口
+    @ApiOperation(value = "获取港口", notes = "分页查询")
+    @PostMapping(value = "/getPort")
+    public Map<String, Object> getPortList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPortList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+    //码头
+    @ApiOperation(value = "获取码头", notes = "分页查询")
+    @PostMapping(value = "/getPier")
+    public Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPierList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value = "获取港存堆场", notes = "分页查询")
+    @PostMapping(value = "/getYardList")
+    public Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           String con
+    ) {
+        if (mapVal == null) {
+            mapVal = new HashMap<>();
+        }
+        return rmsFeign.getPortYardList(mapVal == null ? new HashMap<>() : mapVal, apiId, pageNum, pageSize, con);
+    }
+
 
     @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
     @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
@@ -758,7 +801,7 @@ public class RMScontroller {
     }
 
     //油价
-    @ApiOperation(value = "获取公告信息", notes = "分页查询")
+    @ApiOperation(value = "获取油价信息", notes = "分页查询")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "apiId()", value = "动态表头", required = false, dataType = "Integer"),
@@ -810,6 +853,9 @@ public class RMScontroller {
     }
 
 
+
+
+
 //*******************************下拉框************************
 
     @GetMapping("getNoticeTypeId")
@@ -818,11 +864,89 @@ public class RMScontroller {
         return rmsFeign.getNoticeTypeId();
     }
 
+
+
+    @GetMapping("getPortType")
+    @ApiOperation(value = "得到港口类型Id")
+    public Map<String,Object> getPortType(){
+        return rmsFeign.getPortType();
+    }
+
     @ApiOperation(value="新增原料仓库信息", notes="根据rmsWarehouse对象创建")
     @ApiImplicitParam(name = "rmsWarehouse", value = "详细实体rmsWarehouse", required = true, dataType = "rmsWarehouse")
-
     @PostMapping(value = "/insertWarehouse")
     public Map<String, Object> insertWarehouse(@RequestBody(required = false) Map<String, Object> map) {
         return rmsFeign.insertWarehouse(map);
     }
+
+
+
+    //展示收货客户信息
+    @ApiOperation(value = "获取收货客户信息", notes = "分页查询")
+    @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"),
+            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getConsigneeList")
+    public Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                     Integer apiId,
+                                                     Integer pageNum,
+                                                     Integer pageSize,
+                                                     String con
+    ) {
+
+        return rmsFeign.getConsigneeList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    /*
+     *边写边搜索承运商
+     * */
+    @ApiOperation(value="根据用户输入输出承运商", notes="模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "con",value = "用户输入的承运商名", required = false, dataType = "String")
+    })
+    @PostMapping("/getCarrierName")
+    public Map<String,Object> getCarrierName(@RequestParam(value ="state") String state){
+        return  rmsFeign.getCarrierName(state);
+
+    }
+
+
+
+    //港口
+    @PostMapping("/insertPort")
+    public Map<String, Object> insertPort(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPort(map);
+    }
+
+    //
+    @PostMapping("/insertPier")
+    public Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPier(map);
+    }
+
+    //港口
+    @PostMapping("/insertPortYard")
+    public Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertPortYard(map);
+    }
+
+    @PostMapping(value = "/deletePort/{portId}")//BigDecimal
+    public Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId) {
+        return rmsFeign.deletePort(portId);
+    }
+
+    @PostMapping(value = "/deletePier/{pierId}")//BigDecimal
+    public Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId) {
+        return rmsFeign.deletePier(pierId);
+    }
+
+    @PostMapping(value = "/deletePortYard/{warehouseId}")//BigDecimal
+    public Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId) {
+        return rmsFeign.deletePortYard(warehouseId);
+    }
+
 }

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

@@ -293,12 +293,7 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
-    @ApiModelProperty(value = "模糊查询承运商")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "apiId", value = "244", required = false, dataType = "BigDecimal")
-    })
+    @ApiModelProperty(value = "边输边查承运商")
     @PostMapping("/getCarrierMesByLike")
     public RESTfulResult getCarrierMesByLike(@RequestParam("index") String index) {
         if(index != null){
@@ -370,4 +365,50 @@ public class UniversalController extends BaseRESTfulController {
         return universalService.sha1DigestUtils(text);
         //获取当前订单还没有净重的计量实绩
     }
+
+    @ApiModelProperty(value = "边输边查装货卸货点")
+    @PostMapping("/selectUnloadingPoint")
+    public RESTfulResult selectUnloadingPoint(@RequestParam("index") String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index += "%";
+            }
+        }
+        List<Map<String, Object>> list = universalMapper.selectUnloadingPoint(index);
+        return success(list);
+    }
+
+    @ApiModelProperty(value = "模糊查询承运商")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "412", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getCarrierListByLike")
+    public RESTfulResult getCarrierListByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize,
+                                              String index) {
+        if(index != null){
+            if(index.length() == 0){
+                index = null;
+            }else {
+                index = "%" + index + "%";
+            }
+        }
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        mapValue.put("index",index);
+        List<Map<String, Object>> list = universalMapper.getCarrierListByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.getCarrierListByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
 }

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

@@ -1268,4 +1268,73 @@ public interface AmsFeign {
 
     @PostMapping("/api/v1/ams/amstrucksporadicorders/updateSporadicOrder")
     Map<String, Object> updateSporadicOrder(@RequestBody Map<String, Object> mapValue);
+
+    @PostMapping("/api/v1/ams/amssaleordermaterials/getTruckNoList")
+    RESTfulResult getTruckNoList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                 @RequestParam Integer apiId,
+                                 @RequestParam Integer pageNum,
+                                 @RequestParam Integer pageSize,
+                                 @RequestParam Integer issueStatus,
+                                 @RequestParam String con);
+
+
+    @ApiOperation(value="查询未上报的销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(408)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderInfoes")
+    Map<String, Object> getSaleOrderInfoes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                           @RequestParam Integer pageNum,
+                                           @RequestParam Integer pageSize,
+                                           @RequestParam Integer apiId);
+
+    @ApiOperation(value="查询已上报销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(408)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderReportedes")
+    Map<String, Object> getSaleOrderReportedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                               @RequestParam Integer pageNum,
+                                               @RequestParam Integer pageSize,
+                                               @RequestParam Integer apiId);
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompanyes")
+    Map<String,Object> getSaleOrderListBySaleCompanyes(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       @RequestParam("pageNum") Integer pageNum,
+                                                       @RequestParam("pageSize") Integer pageSize,
+                                                       @RequestParam("apiId") Integer apiId,
+                                                       @RequestParam("con") String con);
+
+    @ApiOperation(value="查询财务已审批销售订单信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(409)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getAmsSaleOrderApprovedes")
+    Map<String, Object> getAmsSaleOrderApprovedes(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  @RequestParam("pageNum") Integer pageNum,
+                                                  @RequestParam("pageSize") Integer pageSize,
+                                                  @RequestParam("apiId") Integer apiId);
+
+    @ApiOperation(value="查询销售订单物资信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId(410)", value = "表头", required = false, dataType = "Interger")
+    })
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderAndMaterialById")
+    RESTfulResult getSaleOrderAndMaterialById(@RequestBody(required = false) Map<String, Object> mapValue,
+                                              @RequestParam("apiId") Integer apiId,
+                                              @RequestParam("pageNum") Integer pageNum,
+                                              @RequestParam("pageSize") Integer pageSize,
+                                              @RequestParam("saleOrderId") BigDecimal saleOrderId);
+
+    @ApiOperation(value="新增车序号")
+    @PostMapping("/api/v1/ams/amssaleordermaterials/addTruckNo")
+    Map<String, Object> addTruckNo(@RequestBody List<Map<String, Object>> mapList);
+
+    @ApiOperation(value="下发车序号")
+    @PostMapping("/api/v1/ams/amssaleordermaterials/issueTruckNo")
+    Map<String, Object> issueTruckNo(@RequestBody List<Map<String, Object>> mapList);
+
+    @ApiOperation(value="定向派单选择承运商并下发")
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/addDispatchSaleOrder")
+    Map<String, Object> addDispatchSaleOrder(@RequestBody Map<String, Object> mapValue);
 }

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

@@ -367,5 +367,13 @@ public interface OmsFeign {
     @ApiOperation(value = "根据运输订单id修改运力id")
     @PostMapping("api/v1/oms/omstruckorderseparates/updateOmstruckOrder")
     Map<String, Object> updateOmstruckOrder(@RequestBody(required = false) Map<String,Object> map);
+
+    @ApiOperation(value = "承运商销售分派运输订单给司机")
+    @PostMapping("api/v1/oms/omstruckorderseparates/addSaleTruckOrder")
+    Map<String, Object> addSaleTruckOrder(@RequestBody Map<String, Object> mapValue);
+
+    @ApiOperation(value = "根据运输订单号查询物资")
+    @PostMapping("api/v1/oms/omstruckorderseparates/getUnloadOrderMaterial")
+    Map<String, Object> getUnloadOrderMaterial(@RequestBody(required = false)Map<String, Object> map);
 }
 

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

@@ -453,6 +453,66 @@ public interface RmsFeign {
     @GetMapping(value = "api/v1/rms/dilnotices/getNoticeTypeId")
     Map<String,Object> getNoticeTypeId();
 
+  //展示收货客户信息
+  @PostMapping(value = "/api/v1/rms/rmsconsignee/getConsigneeList")
+  Map<String, Object> getConsigneeList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                            @RequestParam("apiId") Integer apiId,
+                                            @RequestParam("pageNum") Integer pageNum,
+                                            @RequestParam("pageSize") Integer pageSize,
+                                            @RequestParam("con") String con);
 
 
+
+  //边输入边搜索承运商
+    @PostMapping(value = "/api/v1/rms/rmscardriver/getCarrierName")
+    Map<String, Object> getCarrierName(@RequestParam(value = "state")String state);
+
+
+    //港口
+    @PostMapping(value = "api/v1/rms/rmsPort/insertPort")
+    Map<String,Object> insertPort(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除港口
+    @PostMapping(value = "api/v1/rms/rmsPort//deletePort/{portId}")
+    Map<String, Object> deletePort(@PathVariable("portId") BigDecimal portId);
+
+    //删除码头
+    @PostMapping(value = "api/v1/rms/rmsPier//deletePier/{pierId}")
+    Map<String, Object> deletePier(@PathVariable("pierId") BigDecimal pierId);
+
+    @PostMapping(value = "/api/v1/rms/rmsPort/getPort")
+    Map<String, Object> getPortList(@RequestBody(required = false) Map<String , Object> mapVal,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/rms/rmsPier/getPier")
+    Map<String, Object> getPierList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                    @RequestParam Integer apiId,
+                                    @RequestParam Integer pageNum,
+                                    @RequestParam Integer pageSize,
+                                    @RequestParam String con);
+
+    @PostMapping(value = "/api/v1/rms/rmsPortYard/getPortYard")
+    Map<String, Object> getPortYardList(@RequestBody(required = false) Map<String, Object> mapVal,
+                                        @RequestParam Integer apiId,
+                                        @RequestParam Integer pageNum,
+                                        @RequestParam Integer pageSize,
+                                        @RequestParam String con);
+
+    @GetMapping(value = "api/v1/rms/rmsPort/getPortType")
+    Map<String, Object> getPortType();
+
+
+    @PostMapping(value = "api/v1/rms/rmsPier/insertPier")
+    Map<String, Object> insertPier(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping(value = "api/v1/rms/rmsPortYard/insertPortYard")
+    Map<String, Object> insertPortYard(@RequestBody(required = false) Map<String, Object> map);
+
+    //删除港存堆场
+    @PostMapping(value = "api/v1/rms/rmsPortYard/deletePortYard/{warehouseId}")
+    Map<String, Object> deletePortYard(@PathVariable("warehouseId") BigDecimal warehouseId);
+
 }

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

@@ -766,6 +766,4 @@ public interface TmsshipFeign {
     @PostMapping(value = "/api/v1/shipTms/dilbatchs/getShipNameList")
     Map<String, Object> getShipNameList(@RequestParam(value = "state")String state);
 
-
-
 }

src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

@@ -55,4 +55,10 @@ public interface UniversalMapper {
 
     // 所有物资
     List<Map<String, Object>> selectAllMaterialName(Map<String, Object> mapValue);
+
+    // 所有承运商
+    List<Map<String, Object>> getCarrierListByLike(Map<String, Object> mapValue);
+
+    //边输边查卸货点
+    List<Map<String, Object>> selectUnloadingPoint(String index);
 }

src/main/resources/bootstrap.yml

@@ -25,6 +25,8 @@ eureka:
 
 openfeign:
 #  正式环境
+
+<<<<<<< HEAD
 #    ColumnDataFeign:
 #      url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
 #    AmsFeign:
@@ -52,7 +54,7 @@ openfeign:
 #    RmsFeign:
 #      url: ${RMSFEIGN_HRL:172.16.33.166:8060}
 
- #测试环境
+  #测试环境
   ColumnDataFeign:
     url: ${COLUMNDATAFEIGN_URL:172.16.33.162:8001}
   AmsFeign:
@@ -80,6 +82,7 @@ openfeign:
   RmsFeign:
     url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
+
 genxml:
   pth: com/a
 cache:
@@ -111,4 +114,4 @@ mybatis:
 server:
 #  port: 8080
 #测试环境
-  port: 8019
+  port: 8080

src/main/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -352,7 +352,6 @@
             order by "materialId" desc
         </if>
     </select>
-
 <!--  查询所有的批次及其关联的采购订单号  -->
     <select id="getBatchAndOrderMes" parameterType="map" resultType="java.util.Map">
         select *
@@ -418,6 +417,23 @@
         order by "value"
     </select>
 
+    <select id="getCarrierListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
+        select
+        *
+        from(
+        select
+        RC.CARRIER_ID "carrierId",
+        RC.CARRIER_NAME "carrierName"
+        from RMS_CARRIER RC
+        <where>
+            <if test="index != null">
+                RC.CARRIER_NAME  like #{index}
+            </if>
+        </where>
+        order by RC.CARRIER_NAME
+        )
+    </select>
+
     <select id="queryConsigneeByLike" resultType="java.util.Map" parameterType="java.util.Map" >
         SELECT * FROM (
         SELECT
@@ -458,4 +474,19 @@
             on RM.MATERIAL_ID = OOM.MATERIAL_ID
         where OOM.ORDER_ID = #{orderId}
     </select>
+
+<!--  边输边查卸货点  -->
+    <select id="selectUnloadingPoint" parameterType="string" resultType="java.util.Map">
+        select Rw.WAREHOUSE_NAME "warehouseName",
+               RW.WAREHOUSE_ID "warehouseId"
+        from RMS_WAREHOUSE RW
+        where
+              <if test="index != null">
+                  RW.WAREHOUSE_NAME like #{index}
+              </if>
+              <if test="index == null">
+                  rownum &lt; 10
+              </if>
+        order by "warehouseName"
+    </select>
 </mapper>