Browse Source

'总工程终版'

HUJIANGUO 3 years ago
parent
commit
4b404fd75b

+ 7 - 0
src/main/java/com/steerinfo/dil/controller/OMSController.java

@@ -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) {

+ 174 - 5
src/main/java/com/steerinfo/dil/controller/RMScontroller.java

@@ -180,6 +180,23 @@ public class RMScontroller {
     public Map<String, Object> getCarrierById(@PathVariable("id")BigDecimal id){
         return rmsFeign.getCarrierById(id);
     }
+//    获取中标区域
+    @ApiOperation(value="展示中标区域信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "406", required = false, dataType = "BigDecimal"),
+            @ApiImplicitParam(name = "id", value = "中标id", required = false, dataType = "BigDecimal"),
+    })
+    @PostMapping("/getCarrierBidAreaList")
+    public Map<String, Object> getCarrierBidAreaList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize,
+                                               String con
+    ){
+        return   rmsFeign.getCarrierBidAreaList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,con);
+    }
 
     //获取物资列表
     @ApiOperation(value="获取物资列表")
@@ -242,7 +259,6 @@ public class RMScontroller {
                                                 Integer apiId,
                                                 Integer pageNum,
                                                 Integer pageSize,
-
                                                 String con
     ){
 
@@ -696,8 +712,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,
@@ -718,7 +732,7 @@ public class RMScontroller {
         return rmsFeign.insertNotice(map);
     }
 
-    @ApiOperation(value = "更新油价信息", notes = "根据dilNotice对象创建")
+    @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
     @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
     @PostMapping(value = "/updateNotice", produces  = "application/json;charset=UTF-8")
     public Map<String, Object> updateNotice(@RequestBody(required = false) Map<String, Object> map) {
@@ -733,6 +747,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")
@@ -741,7 +799,57 @@ public class RMScontroller {
         return rmsFeign.getNoticeById(id);
     }
 
+    //油价
+    @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 = "/getOilPriceResultList")
+    public Map<String, Object> getOilPriceResultList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             String con
+    ) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        return rmsFeign.getOilPriceResultList(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize, con);
+    }
+
+    @ApiOperation(value="新增油价信息", notes="根据DilNotice对象创建")
+    @ApiImplicitParam(name = "addOilPrice", value = "详细实体dilNotice", required = true, dataType = "DilNotice")
+    @PostMapping(value = "/insertOilPrice")
+    public Map<String, Object> insertOilPrice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.insertOilPrice(map);
+    }
+
+    @ApiOperation(value = "更新公告信息", notes = "根据dilNotice对象创建")
+    @ApiImplicitParam(name = "dilNotice", value = "详细实体dilNotice", required = true, dataType = "dilNotice")
+    @PostMapping(value = "/updateOilPrice", produces  = "application/json;charset=UTF-8")
+    public Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> map) {
+        return rmsFeign.updateOilPrice(map);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/deleteOilPrice/{id}")//BigDecimal
+    public Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id) {
+        return rmsFeign.deleteOilPrice(id);
+    }
 
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "公告id", value = "ID", required = true, dataType = "BigDecimal")
+    @PostMapping(value = "/getOilPriceById/{id}")
+    public Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id){
+        return rmsFeign.getOilPriceById(id);
+    }
 //*******************************下拉框************************
 
     @GetMapping("getNoticeTypeId")
@@ -750,11 +858,72 @@ public class RMScontroller {
         return rmsFeign.getNoticeTypeId();
     }
 
+
+    //展示收货客户信息
+    @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);
+    }
+
+    @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);
     }
+
+    //港口
+    @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);
+    }
 }

+ 16 - 6
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){
@@ -364,6 +359,20 @@ public class UniversalController extends BaseRESTfulController {
         return success(data);
     }
 
+    @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"),
@@ -394,4 +403,5 @@ public class UniversalController extends BaseRESTfulController {
         PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
         return success(data);
     }
+
 }

+ 4 - 5
src/main/java/com/steerinfo/dil/controller/WMSController.java

@@ -372,12 +372,11 @@ public class WMSController extends BaseRESTfulController {
             @ApiImplicitParam(name = "apiId", value = "", required = false, dataType = "BigDecimal"),
     })
     public RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
-                                             Integer apiId,
-                                                          Integer pageNum,
-                                                          Integer pageSize,
-                                                          Integer inboundId
+                                                          @RequestParam Integer apiId,
+                                                          @RequestParam Integer pageNum,
+                                                          @RequestParam Integer pageSize,
+                                                          @RequestParam Integer inboundId
     ) {
-
         return wmsFeign.selectScanResultByIboundResultId(mapValue==null?new HashMap<>():mapValue, apiId,pageNum, pageSize,inboundId);
     }
     //根据物资信息获取原来垛位信息

+ 3 - 3
src/main/java/com/steerinfo/dil/controller/WMSHController.java

@@ -5,9 +5,7 @@ import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.framework.controller.RESTfulResult;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-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.*;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -18,6 +16,8 @@ import java.util.Map;
  * @GreateTime:2021/10/12 9:54
  * @Version:V2.0
  */
+@RestController
+@RequestMapping("${api.version}/wmsh")
 public class WMSHController extends BaseRESTfulController {
 
     @Autowired

+ 4 - 0
src/main/java/com/steerinfo/dil/feign/OmsFeign.java

@@ -371,5 +371,9 @@ public interface OmsFeign {
     @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);
 }
 

+ 84 - 0
src/main/java/com/steerinfo/dil/feign/RmsFeign.java

@@ -108,6 +108,13 @@ public interface RmsFeign {
     //    根据id获取承运商信息
     @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierById/{id}")
     Map<String, Object> getCarrierById(@PathVariable("id") BigDecimal id);
+//    展示中标区域
+    @PostMapping(value = "api/v1/rms/rmscarrier/getCarrierBidAreaList")
+    Map<String, Object> getCarrierBidAreaList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                          @RequestParam("apiId") Integer apiId,
+                                          @RequestParam("pageNum") Integer pageNum,
+                                          @RequestParam("pageSize") Integer pageSize,
+                                          @RequestParam String con);
 
     //获取物资列表
     @PostMapping(value = "api/v1/rms/rmsmaterial/getMaterialList")
@@ -416,6 +423,29 @@ public interface RmsFeign {
     Map<String, Object> getNoticeById(@PathVariable("id") BigDecimal id);
 
 
+    //油价
+    @PostMapping(value = "/api/v1/rms/rmsoilprice/getOilPriceResultList")
+    Map<String, Object> getOilPriceResultList(@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/rmsoilprice/insertOilPrice")
+    Map<String,Object> insertOilPrice(@RequestBody(required = false) Map<String,Object> map);
+
+    //删除油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/deleteOilPrice/{id}")
+    Map<String, Object> deleteOilPrice(@PathVariable("id") BigDecimal id);
+
+    //更新油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/updateOilPrice")
+    Map<String, Object> updateOilPrice(@RequestBody(required = false) Map<String, Object> map);
+
+    //根据id获取油价
+    @PostMapping(value = "api/v1/rms/rmsoilprice/getOilPriceById/{id}")
+    Map<String, Object> getOilPriceById(@PathVariable("id") BigDecimal id);
+
 //******************************************下拉框*******************************
 
 
@@ -423,5 +453,59 @@ 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/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);
 
 }

+ 2 - 2
src/main/java/com/steerinfo/dil/feign/WMSFeign.java

@@ -350,7 +350,7 @@ public interface WMSFeign {
 
 
     @PostMapping(value = "/api/v1/wms/inboundScanResult/getScanResult")
-    Map<String,Object> getScanResult(@RequestBody Map<String,Object> map);
+    Map<String,Object> getScanResult(@RequestBody(required = false) Map<String,Object> map);
     /**
      * 库管员下发倒垛单
      * @param mapList
@@ -374,7 +374,7 @@ public interface WMSFeign {
                                       @RequestParam String con);
 
 
-    @RequestMapping(value = "/api/v1/wms/inboundResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
+    @RequestMapping(value = "/api/v1/wms/inboundScanResult/selectScanResultByIboundResultId",method = RequestMethod.POST)
     RESTfulResult selectScanResultByIboundResultId(@RequestBody(required = false) Map<String, Object> mapValue,
                                                    @RequestParam Integer apiId,
                                                    @RequestParam Integer pageNum,

+ 2 - 0
src/main/java/com/steerinfo/dil/mapper/UniversalMapper.java

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

+ 5 - 1
src/main/resources/bootstrap.yml

@@ -24,7 +24,8 @@ eureka:
 
 
 openfeign:
-  #正式环境
+#  正式环境
+
     ColumnDataFeign:
       url: ${COLUMNDATAFEIGN_URL:172.16.33.166:8083}
     AmsFeign:
@@ -80,6 +81,7 @@ openfeign:
 #  RmsFeign:
 #    url: ${RMSFEIGN_HRL:172.16.33.162:8014}
 
+
 genxml:
   pth: com/a
 cache:
@@ -109,4 +111,6 @@ mybatis:
     mapUnderscoreToCamelCase: true
     call-setters-on-nulls: true
 server:
+#  port: 8080
+#测试环境
   port: 8080

+ 18 - 6
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 *
@@ -401,23 +400,21 @@
 
     <!-- 边输边查承运商   -->
     <select id="getCarrierMesByLike" parameterType="string" resultType="java.util.Map">
-        select
-        *
-        from(
         select
             RC.CARRIER_ID "carrierId",
-            RC.CARRIER_NAME "value"
+            RC.CARRIER_NAME "value",
+            RC.CARRIER_NAME "carrierName"
         from RMS_CARRIER RC
         <where>
             <if test="index != null">
                 RC.CARRIER_NAME  like #{index}
+                and rownum &lt; 10
             </if>
             <if test="index == null">
                 rownum &lt; 10
             </if>
         </where>
         order by "value"
-        )
     </select>
 
     <select id="getCarrierListByLike" parameterType="java.util.Map" resultType="java.util.Map" >
@@ -477,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>