ka

pom.xml

@@ -118,7 +118,11 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
+<<<<<<< HEAD
                                                 <param>ams_requirement</param><!--运力-->
+=======
+<!--                        <param>AMSTRUCK_RAIL_DAYPLAN</param>&lt;!&ndash;运力&ndash;&gt;-->
+>>>>>>> bcea3dc53173008a1186762ddc0d8673345eefa7
                     </tables>
                 </configuration>
                 <executions>

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -336,13 +337,18 @@ public class AMScontroller{
     }
 
     /**
-     * 下拉框
+     * 获取收货地址
      * @return
      */
-    @GetMapping("getAddressDeliveryAddress")
+    @PostMapping("getAddressDeliveryAddress")
     @ApiOperation(value = "得到地址下拉")
-    public Map<String, Object> getAddressDeliveryAddress(){
-        return amsFeign.getAddressDeliveryAddress();
+    @ApiImplicitParam(name = "apiId",value = "255")
+    public Map<String, Object> getAddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                         Integer apiId,
+                                                         Integer pageNum,
+                                                         Integer pageSize,
+                                                         String con){
+        return amsFeign.getAddressDeliveryAddress(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize,con);
     }
 
     @GetMapping("getShipperId")
@@ -490,7 +496,7 @@ public class AMScontroller{
         return amsFeign.getSaleOrderReported(mapValue,pageNum,pageSize,apiId);
     }
     @PostMapping("getAmsSaleOrderApproved")
-    @ApiOperation(value = "查询汽运单价信息")
+    @ApiOperation(value = "查询财务已审批销售订单信息")
     public Map<String, Object> getAmsSaleOrderApproved(@RequestBody(required = false) Map<String, Object> mapValue,
                                           Integer pageNum,
                                           Integer pageSize,
@@ -517,7 +523,7 @@ public class AMScontroller{
     }
     @PostMapping("/addAmsSaleOrder")
     Map<String, Object> addAmsSaleOrder(@RequestBody(required = false) Map<String, Object> mapVal) {
-        return amsFeign.addAmsSaleOrder(mapVal);
+        return amsFeign.addAmsSaleOrder(mapVal==null?new HashMap<>():mapVal);
     }
     @PostMapping("getAmsSaleOrderBySaleOrderId")
     Map<String, Object> getAmsSaleOrderBySaleOrderId(@RequestParam BigDecimal saleOrderId) {
@@ -542,7 +548,6 @@ public class AMScontroller{
         }
         return amsFeign.getSaleOrderUpdateLog(saleOrderId,mapValue, pageNum, pageSize, apiId);
     }
-
     @GetMapping(value = "getSalePlanName")
     @ApiOperation(value="获取销售计划名称")
     public Map<String, Object> getSalePlanName(){return amsFeign.getSalePlanName();}
@@ -716,6 +721,23 @@ 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 = "105", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/getSaleOrderListBySaleCompany")
+    public Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                       Integer pageNum,
+                                                       Integer pageSize,
+                                                       Integer apiId,
+                                                       String con){
+      return   amsFeign.getSaleOrderListBySaleCompany(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+
+
 
     //展示销售公司已审核销售订单的车序号列表
     @PostMapping("/getSaleOrderList")
@@ -799,17 +821,42 @@ public class AMScontroller{
     public Map<String,Object> updateTruckRailDayPlan(@RequestBody  Map<String, Object> mapVal) {
         return amsFeign.updateTruckRailDayPlan(mapVal);
     }
+    @PostMapping("getDayPlanByDayPlanId/{dayplanId}")
+    Map<String,Object> getDayPlanByDayPlanId(@PathVariable("dayplanId") Integer dayplanId){
+        return amsFeign.getDayPlanByDayPlanId(dayplanId);
+    }
+
+    /**
+     * 修改日期计划 2021年11月20日03:18:05
+     * @param map
+     * @return
+     */
+    @PostMapping("/updateDayPlan")
+    public Map<String,Object> updateDayPlan(@RequestBody(required = false) Map<String, Object> map){
+        return amsFeign.updateDayPlan(map);
+    }
+
+    /**
+     * 查询所有的承运商
+     * @return
+     */
+    @GetMapping("/getCarrierMes")
+    public  Map<String,Object> getCarrierMes() {
+        return amsFeign.getCarrierMes();
+    }
+
     //展示日计划
     @PostMapping("/getTruckRailDayPlanList")
     @ApiOperation(value = "焦炭日计划")
     public Map<String, Object> getTruckRailDayPlan(@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.getTruckRailDayPlan(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getTruckRailDayPlan(mapValue, pageNum, pageSize, apiId, status);
     }
     //展示日计划
     @PostMapping("/getSzTruckRailDayPlanList")
@@ -817,11 +864,12 @@ public class AMScontroller{
     public Map<String, Object> getSzTruckRailDayPlan(@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.getSzTruckRailDayPlan(mapValue, pageNum, pageSize, apiId);
+        return amsFeign.getSzTruckRailDayPlan(mapValue, pageNum, pageSize, apiId, status);
     }
 
     //新增钢材发往异地库计划
@@ -955,18 +1003,20 @@ public class AMScontroller{
         return amsFeign.lockDispatchSaleOrder(dispatchId, carrierId);
     }
 
-    @ApiOperation(value="查询app端公开抢单")
+    @ApiOperation(value="查询app端承运商已抢到的单")
     @PostMapping("/getLockDispatchSaleOrderList")
     public Map<String, Object> getLockDispatchSaleOrderList(Integer carrierId) {
         return amsFeign.getLockDispatchSaleOrderList(carrierId);
     }
 
+    @ApiOperation(value="查询PC端承运商已抢到的单")
     @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);
+                                                           Integer pageSize,
+                                                           Integer carrierId){
+        return  amsFeign.selectDispatchSaleOrderList(mapValue==null ?new HashMap<>():mapValue, apiId, pageNum, pageSize,carrierId);
     }
 
     //获取到站名称
@@ -989,4 +1039,20 @@ public class AMScontroller{
                                                 String con) {
         return amsFeign.getAllSteelMaterialMes(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
     }
+
+    @ApiModelProperty(value = "查询PC端公开抢单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "apiId", value = "242", required = false, dataType = "Integer")
+    })
+    @PostMapping("/getPCDispatchSaleOrderList")
+    public Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      Integer pageNum,
+                                                      Integer pageSize,
+                                                      Integer apiId,
+                                                      Integer dispatchType,
+                                                      String con) {
+        return amsFeign.getPCDispatchSaleOrderList(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId,dispatchType, con);
+    }
 }

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

@@ -124,9 +124,9 @@ public class OMSController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
     })
-    @PostMapping("/driverReceiveOrRefuse/{orderId}")
-    public Map<String, Object> driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId, Integer orderReceiveStatus) {
-        return omsFeign.driverReceiveOrRefuse(orderId, orderReceiveStatus);
+    @PostMapping("/driverReceiveOrRefuse")
+    public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map) {
+        return omsFeign.driverReceiveOrRefuse(map);
     }
 
 
@@ -201,16 +201,15 @@ public class OMSController {
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
-    @PostMapping("/getTransportDispatch/{orderReceiveStatus}")
+    @PostMapping("/getTransportDispatch")
     public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageSize,
-                                              @PathVariable Integer orderReceiveStatus,
                                               Integer orderType,
                                               Integer orderStatus, Integer fuelOrder,String con){
         return omsFeign.getTransportDispatch(mapValue == null ? new HashMap<>() : mapValue, apiId, pageNum, pageSize,
-                orderReceiveStatus, orderType, orderStatus, fuelOrder, con);
+                 orderType, orderStatus, fuelOrder, con);
     }
 
     /**
@@ -335,6 +334,7 @@ public class OMSController {
                                                                  @RequestParam Integer pageSize) {
         return omsFeign.getWaterSlagDayPlanAndRecivedList(map==null?new HashMap<>():map, carrierId, apiId, pageNum, pageSize);
     }
+    @ApiOperation(value="通过物资ID和发货单位ID查找采购订单号")
     @PostMapping("/selectNewOrderId")
     public Map<String, Object> selectNewOrderId(@RequestBody(required=false) Map<String,Object> map){
         return omsFeign.selectNewOrderId(map);
@@ -406,8 +406,9 @@ public class OMSController {
     @PostMapping("/addAppTruckOrder")
     public Map<String, Object> addAppTruckOrder(Integer dispatchId,
                                                 Integer orderType,
-                                                Integer driverCapacityId) {
-        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType, driverCapacityId);
+                                                String capacityNumber,
+                                                Integer carrierId) {
+        Map<String, Object> map = omsFeign.addAppTruckOrder(dispatchId, orderType,capacityNumber, carrierId);
         return map;
     }
     //展示销售订单信息
@@ -492,4 +493,43 @@ public class OMSController {
         return omsFeign.selectInfoByDayPlanId(mapValue==null?new HashMap<>():mapValue, apiId, pageNum, pageSize, dayPlanId, orderType);
     }
 
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping("/closeOmstruckOrder")
+    public Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId) {
+        Map<String, Object> map = omsFeign.closeOmstruckOrder(orderId);
+        return map;
+    }
+
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping("/getCapacityAndDriverList")
+    public Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                        Integer apiId,
+                                                        Integer pageNum,
+                                                        Integer pageSize,
+                                                        String con) {
+        if (mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        Map<String, Object> map = omsFeign.getCapacityAndDriverList(mapValue, apiId, pageNum, pageSize, con);
+        return map;
+    }
+
+    //查询所有的收货单位
+    @GetMapping("/getReceivingUnit")
+    public Map<String, Object> getReceivingUnit(){
+        return omsFeign.getReceivingUnit();
+    }
+
+
+    //查询所有的发货单位（供应商）
+    @GetMapping("/getSupplier")
+    public Map<String, Object> getSupplier(){
+        return omsFeign.getSupplier();
+    }
+
+    @ApiOperation(value = "关闭订单")
+    @PostMapping("/CloseOrder")
+    public  Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map){
+        return  omsFeign.CloseOrder(map);
+    }
 }

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

@@ -294,5 +294,66 @@ public class RMScontroller {
         return rmsFeign.getCapacityId();
     }
 
+    /**
+     * @author huk
+     * @return
+     */
+    //查询所有作业环节
+    @ApiOperation(value="查询所有作业环节")
+    @PostMapping("/getLink")
+    public Map<String, Object> getlink(){
+        return  rmsFeign.getlink();
+    }
+
+    /**
+     * @author huk
+     * @return
+     */
+    //新增运输路线
+    @ApiOperation(value="新增运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/insertSelective")
+    public Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal){
+        return rmsFeign.insertSelective(mapVal);
+    }
 
+
+    @ApiOperation(value="查询运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "apiId", value = "249", required = false, dataType = "Integer"),
+    })
+    @PostMapping(value = "/getAllLineDesk")
+    public Map<String, Object> getAllLineDesk(@RequestBody(required = false) Map<String,Object> mapValue,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        Integer apiId,
+                                        String con){
+        return rmsFeign.getAllLineDesk(mapValue==null?new HashMap<>():mapValue, pageNum, pageSize, apiId, con);
+    }
+
+    @ApiOperation(value = "根据主键查询出数据以供修改")
+    @PostMapping("/getLinkToUpdate")
+    public Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId) {
+        return rmsFeign.getLinkToUpdate(lineId);
+    }
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据")
+    @PostMapping("/updateByPrimaryKeySelective")
+    public Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal) {
+        return rmsFeign.updateByPrimaryKeySelective(mapVal);
+    }
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
+    @PostMapping("/updateRmsLine")
+    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal){
+        return  rmsFeign.updateRmsLine(mapVal);
+    }
+
+    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
+    @PostMapping("/getCountNumber")
+    public Map<String, Object> getCountNumber(@RequestParam Integer lineId) {
+        return rmsFeign.getCountNumber(lineId);
+    }
 }

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

@@ -1,38 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.service.impl.SelfServiceMachineServiceImpl;
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.framework.controller.RESTfulResult;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.Map;
-
-/**
- * @ author    :TXF
- * @ time      :2021/10/19 18:06
- */
-@RequestMapping("${api.version}/thd")
-@RestController
-public class SelfServiceMachineController extends BaseRESTfulController {
-
-    @Autowired
-    SelfServiceMachineServiceImpl selfServiceMachineService;
-
-    @ApiOperation(value="查询数据打印提货单接口")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
-    })
-    @PostMapping("/printTHD")
-    public RESTfulResult printTiHuoDan(@RequestBody(required=false) Map<String, Object> mapValue){
-        Map<String, Object> tiHuoDan = selfServiceMachineService.printTiHuoDan((String) mapValue.get("orderNumber"));
-        return success(tiHuoDan);
-    }
-
-}

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

@@ -0,0 +1,140 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.mapper.UniversalMapper;
+import com.steerinfo.dil.service.impl.UniversalServiceImpl;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/19 18:06
+ * 通用接口
+ */
+@RequestMapping("${api.version}/uc")
+@RestController
+public class UniversalController extends BaseRESTfulController {
+
+    @Autowired
+    UniversalServiceImpl selfServiceMachineService;
+
+    @Autowired
+    UniversalMapper universalMapper;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+
+    @ApiOperation(value="查询数据打印提货单接口")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/printTHD")
+    public RESTfulResult printTiHuoDan(@RequestBody(required=false) Map<String, Object> mapValue){
+        Map<String, Object> tiHuoDan = selfServiceMachineService.printTiHuoDan((String) mapValue.get("orderNumber"));
+        return success(tiHuoDan);
+    }
+
+    @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")
+    })
+    @PostMapping("/queryMaterialByLike")
+    public RESTfulResult queryMaterialByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                           Integer pageNum,
+                                           Integer pageSize,
+                                           Integer apiId,
+                                           String index) {
+
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index + "%");
+        }else {
+            mapValue.put("index", "aaaaa%");
+        }
+        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.queryMaterialByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        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 = "247", required = false, dataType = "BigDecimal")
+    })
+    @PostMapping("/querySupplierByLike")
+    public RESTfulResult querySupplierByLike(@RequestBody(required = false) Map<String,Object> mapValue,
+                                             Integer pageNum,
+                                             Integer pageSize,
+                                             Integer apiId,
+                                             String index) {
+        if(mapValue == null) {
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index + "%");
+        }else {
+            mapValue.put("index", "aaaaa%");
+        }
+        List<Map<String, Object>> list = universalMapper.querySupplierByLike(mapValue);
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> columnList = universalMapper.querySupplierByLike(mapValue);
+        PageListAdd data = columnDataUtil.tableColumnData(apiId, list, columnList);
+        return success(data);
+    }
+
+    @ApiOperation(value="查询所有空闲的运力信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(248)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getAllCapacityByCarrierLike")
+    public RESTfulResult getAllCapacityByCarrierLike(@RequestBody(required=false) Map<String,Object> mapValue,
+                                        Integer apiId,
+                                        Integer pageNum,
+                                        Integer pageSize,
+                                        String index
+    ){
+        if(mapValue == null){
+            mapValue = new HashMap<>();
+        }
+        if(index != null){
+            mapValue.put("index", index + "%");
+        }else {
+            mapValue.put("index", "aaaaaa%");
+        }
+        //不分页筛选数据
+        List<Map<String, Object>> allCapacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
+        PageHelper.startPage(pageNum,pageSize);
+        //分页数据
+        List<Map<String, Object>> capacity = universalMapper.getAllCapacityByCarrierLike(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
+        return success(pageList);
+    }
+}

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

@@ -284,12 +284,18 @@ public interface AmsFeign {
                                        @RequestParam Integer pageSize,
                                        @RequestParam Integer apiId);
 
+
+
     /**
      * 下拉框
      * @return
      */
-    @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getAddressDeliveryAddress")
-    Map<String, Object> getAddressDeliveryAddress();
+    @PostMapping(value = "/api/v1/ams/amscontracttruckprices/getAddressDeliveryAddress")
+    Map<String, Object> getAddressDeliveryAddress(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                  @RequestParam Integer apiId,
+                                                  @RequestParam Integer pageNum,
+                                                  @RequestParam Integer pageSize,
+                                                  @RequestParam String con);
 
     @GetMapping(value = "/api/v1/ams/amscontracttransportprice/getShipperId")
     Map<String, Object> getShipperId();
@@ -446,6 +452,15 @@ public interface AmsFeign {
                                    @RequestParam Integer pageSize,
                                    @RequestParam Integer apiId);
 
+
+
+    @PostMapping("/api/v1/ams/amssaleorders/getSaleOrderListBySaleCompany")
+     Map<String,Object> getSaleOrderListBySaleCompany(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @RequestParam("pageNum") Integer pageNum,
+                                                      @RequestParam("pageSize") Integer pageSize,
+                                                      @RequestParam("apiId") Integer apiId,
+                                                      @RequestParam("con") String con);
+
     /**
      * 查询财务已审批销售订单信息
      * @param mapValue
@@ -579,7 +594,8 @@ public interface AmsFeign {
     Map<String,Object> selectDispatchSaleOrderList(@RequestBody(required=false) Map<String,Object> mapValue,
                                                    @RequestParam("apiId") Integer apiId,
                                                    @RequestParam("pageNum") Integer pageNum,
-                                                   @RequestParam("pageSize") Integer pageSize);
+                                                   @RequestParam("pageSize") Integer pageSize,
+                                                   @RequestParam("carrierId") Integer carrierId);
 
     /**
      * 新增销售订单物资信息
@@ -985,6 +1001,18 @@ public interface AmsFeign {
     //删除日计划
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/deleteTruckRailDayPlan/{dayPlanId}")
     Map<String,Object> deleteTruckRailDayPlan(@PathVariable("dayPlanId") BigDecimal dayPlanId);
+    //通过计划Id查询修改数据
+    @PostMapping("/api/v1/ams/amstruckraildayplans/getDayPlanByDayPlanId/{dayplanId}")
+    Map<String,Object> getDayPlanByDayPlanId(@PathVariable("dayplanId") Integer dayplanId);
+
+    //修改日计划  2021年11月20日03:17:37
+    @PostMapping("/api/v1/ams/amstruckraildayplans/updateDayPlan")
+    public Map<String,Object> updateDayPlan(@RequestBody(required = false) Map<String, Object> map);
+
+    //查询所有承运商
+    @GetMapping("/api/v1/ams/amstruckraildayplans/getCarrierMes")
+    public  Map<String,Object> getCarrierMes();
+
     //修改日计划
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/updateTruckRailDayPlan")
     Map<String,Object> updateTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapVal);
@@ -995,9 +1023,11 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getTruckRailDayPlanList")
     Map<String, Object> getTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                      @RequestParam Integer pageNum,
-                                      @RequestParam Integer pageSize,
-                                      @RequestParam Integer apiId);
+                                      @RequestParam("pageNum") Integer pageNum,
+                                      @RequestParam("pageSize") Integer pageSize,
+                                      @RequestParam("apiId") Integer apiId,
+                                      @RequestParam("status") Integer status
+    );
     //查询日计划
     @ApiOperation(value="展示水渣日计划")
     @ApiImplicitParams({
@@ -1005,9 +1035,10 @@ public interface AmsFeign {
     })
     @PostMapping(value = "/api/v1/ams/amstruckraildayplans/getSzTruckRailDayPlanList")
     Map<String, Object> getSzTruckRailDayPlan(@RequestBody(required = false) Map<String, Object> mapValue,
-                                        @RequestParam Integer pageNum,
-                                        @RequestParam Integer pageSize,
-                                        @RequestParam Integer apiId);
+                                        @RequestParam("pageNum") Integer pageNum,
+                                        @RequestParam("pageSize") Integer pageSize,
+                                        @RequestParam("apiId") Integer apiId,
+                                        @RequestParam("status") Integer status);
 
     //新增钢材发往异地库日计划
     @PostMapping(value = "/api/v1/ams/amsrailoffsetdayplan/addRailOffsetDayplan")
@@ -1088,7 +1119,7 @@ public interface AmsFeign {
     Map<String, Object> lockDispatchSaleOrder(@RequestParam Integer dispatchId,
                                               @RequestParam Integer carrierId);
 
-    @ApiOperation(value="查询app端已抢的销售订单")
+    @ApiOperation(value="查询app端承运商已抢到的单")
     @PostMapping(value = "/api/v1/ams/amsdispatchsaleorders/getLockDispatchSaleOrderList")
     Map<String, Object> getLockDispatchSaleOrderList(@RequestParam Integer carrierId);
 
@@ -1098,4 +1129,12 @@ public interface AmsFeign {
                                                       @RequestParam Integer pageSize,
                                                       @RequestParam Integer apiId,
                                                       @RequestParam String con) ;
+
+    @PostMapping("/api/v1/ams/amsdispatchsaleorders/getPCDispatchSaleOrderList")
+    Map<String, Object> getPCDispatchSaleOrderList(@RequestBody(required = false) Map<String,Object> mapValue,
+                                                      @RequestParam Integer pageNum,
+                                                      @RequestParam Integer pageSize,
+                                                      @RequestParam Integer apiId,
+                                                      @RequestParam Integer dispatchType,
+                                                      @RequestParam String con) ;
 }

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

@@ -58,9 +58,8 @@ public interface OmsFeign {
     public Map<String, Object> deleteOrder(@RequestBody(required = false) Map<String, Object> map,
                                      @RequestParam("planId") Integer planId);
 
-    @PostMapping("api/v1/oms/omstruckorders/driverReceiveOrRefuse/{orderId}")
-    public Map<String, Object> driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId,
-                                               @RequestParam("orderReceiveStatus") Integer orderReceiveStatus);
+    @PostMapping("api/v1/oms/omstruckorders/driverReceiveOrRefuse")
+    public Map<String, Object> driverReceiveOrRefuse(@RequestBody(required = false) Map<String, Object> map);
 
     @PostMapping("api/v1/oms/omstruckorders/getReceiveRefuseOrder/{orderReceiveStatus}")
     public Map<String, Object> getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
@@ -90,12 +89,11 @@ public interface OmsFeign {
     @PostMapping("api/v1/oms/omstruckorders/selectOrderByOrderId/{orderId}")
     public Map<String, Object> selectOrderByOrderId(@PathVariable("orderId") Integer orderId);
 
-    @PostMapping("api/v1/oms/omstruckorders/getTransportDispatch/{orderReceiveStatus}")
+    @PostMapping("api/v1/oms/omstruckorders/getTransportDispatch")
     public Map<String, Object> getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
                                               @RequestParam("apiId") Integer apiId,
                                               @RequestParam("pageNum") Integer pageNum,
                                               @RequestParam("pageSize") Integer pageSize,
-                                              @PathVariable("orderReceiveStatus") Integer orderReceiveStatus,
                                               @RequestParam("orderType") Integer orderType,
                                               @RequestParam("orderStatus") Integer orderStatus,
                                               @RequestParam("fuelOrder") Integer fuelOrder,
@@ -260,8 +258,6 @@ public interface OmsFeign {
 
     );
 
-
-
     @ApiOperation(value="车牌号下拉")
     @GetMapping(value = "api/v1/oms/omstruckorders/getDriverCapacity")
     Map<String, Object> getDriverCapacity();
@@ -274,6 +270,29 @@ public interface OmsFeign {
     @PostMapping(value = "api/v1/oms/omstruckorders/addAppTruckOrder")
     Map<String, Object> addAppTruckOrder(@RequestParam Integer dispatchId,
                                          @RequestParam Integer orderType,
-                                         @RequestParam Integer driverCapacityId);
+                                         @RequestParam String capacityNumber,
+                                         @RequestParam Integer carrierId);
+
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping(value = "api/v1/oms/omstruckorders/closeOmstruckOrder")
+    Map<String, Object> closeOmstruckOrder(@RequestParam Integer orderId);
+
+    @ApiOperation(value="根据运单id关闭订单")
+    @PostMapping(value = "api/v1/oms/omstruckorders/getCapacityAndDriverList")
+    Map<String, Object> getCapacityAndDriverList(@RequestBody(required=false) Map<String,Object> mapValue,
+                                                 @RequestParam Integer apiId,
+                                                 @RequestParam Integer pageNum,
+                                                 @RequestParam Integer pageSize,
+                                                 @RequestParam String con);
+
+    @GetMapping("api/v1/oms/omstruckorders/getReceivingUnit")
+    public Map<String, Object> getReceivingUnit();
+
+    //查询所有的发货单位
+    @GetMapping("api/v1/oms/omstruckorders/getSupplier")
+    public Map<String, Object> getSupplier();
+
+    @PostMapping("api/v1/oms/omstruckorders/CloseOrder")
+    Map<String,Object> CloseOrder(@RequestBody(required = false)Map<String,Object> map);
 }
 

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

@@ -1,4 +1,8 @@
 package com.steerinfo.dil.feign;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -133,4 +137,45 @@ public interface RmsFeign {
     @GetMapping(value = "/api/v1/rms/rmscapacity/getCapacityId")
     Map<String, Object> getCapacityId();
 
+    /**
+     * @author huk
+     * @return
+     */
+    @PostMapping("/api/v1/rms/rmslinks/getLink")
+    Map<String, Object> getlink();
+
+    /**
+     * @author huk
+     * @return
+     */
+    //新增运输路线
+    @ApiOperation(value="新增运输路线")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输路线", required = false, dataType = "Map"),
+    })
+    @PostMapping("/api/v1/rms/rmslines/insertSelective")
+    Map<String, Object> insertSelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @PostMapping(value = "/api/v1/rms/rmslines/getAllLineDesk")
+    Map<String, Object> getAllLineDesk(@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 = "根据主键查询出数据以供修改")
+    @PostMapping("/api/v1/rms/rmslines/getLinkToUpdate")
+    Map<String, Object> getLinkToUpdate(@RequestParam Integer lineId);
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据")
+    @PostMapping("/api/v1/rms/rmslines/updateByPrimaryKeySelective")
+    Map<String, Object> updateByPrimaryKeySelective(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @ApiOperation(value = "根据运输线路主表ID修改数据,为逻辑删除")
+    @PostMapping("/api/v1/rms/rmslines/updateRmsLine")
+    Map<String, Object> updateRmsLine(@RequestBody(required = false) Map<String,Object> mapVal);
+
+    @ApiOperation(value = "根据运输路线的主表id查询运输订单是否相关联")
+    @PostMapping("/api/v1/rms/rmslines/getCountNumber")
+    Map<String, Object> getCountNumber(@RequestParam Integer lineId);
 }

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

@@ -6,16 +6,25 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 自助一体机
+ * 通用接口
  * @ author    :TXF
  * @ time      :2021/10/19 18:03
  */
 
 @Mapper
-public interface SelfServiceMachineMapper {
+public interface UniversalMapper {
     //通过运输订单号查询订单信息
     Map<String, Object> getTiHuoDan(String orderNumber);
 
     //通过运输订单号查找订单子表物资信息
     List<Map<String, Object>> getOOMMes(String orderNumber);
+
+    //模糊查询所有物资
+    List<Map<String, Object>> queryMaterialByLike(Map<String, Object> map);
+
+    //模糊查询发货单位
+    List<Map<String, Object>> querySupplierByLike(Map<String, Object> map);
+
+    //模糊查询承运商的运力信息
+    List<Map<String, Object>> getAllCapacityByCarrierLike(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/SelfServiceMachineService.java → src/main/java/com/steerinfo/dil/service/UniversalService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -7,7 +8,7 @@ import java.util.Map;
  * @ time      :2021/10/19 18:04
  */
 
-public interface SelfServiceMachineService {
+public interface UniversalService {
 
     //打印提货单
     Map<String, Object> printTiHuoDan(String orderNumber);

src/main/java/com/steerinfo/dil/service/impl/SelfServiceMachineServiceImpl.java → src/main/java/com/steerinfo/dil/service/impl/UniversalServiceImpl.java

@@ -1,6 +1,6 @@
 package com.steerinfo.dil.service.impl;
-import com.steerinfo.dil.mapper.SelfServiceMachineMapper;
-import com.steerinfo.dil.service.SelfServiceMachineService;
+import com.steerinfo.dil.mapper.UniversalMapper;
+import com.steerinfo.dil.service.UniversalService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -13,10 +13,10 @@ import java.util.Map;
  */
 
 @Service
-public class SelfServiceMachineServiceImpl implements SelfServiceMachineService {
+public class UniversalServiceImpl implements UniversalService {
 
     @Resource
-    private SelfServiceMachineMapper selfServiceMachineMapper;
+    private UniversalMapper universalMapper;
     /**
      * 打印提货单
      * @param orderNumber 运输订单号
@@ -26,9 +26,9 @@ public class SelfServiceMachineServiceImpl implements SelfServiceMachineService
     public Map<String, Object> printTiHuoDan(String orderNumber) {
 
         //查询订单信息
-        Map<String, Object> tiHuoDanMap = selfServiceMachineMapper.getTiHuoDan(orderNumber);
+        Map<String, Object> tiHuoDanMap = universalMapper.getTiHuoDan(orderNumber);
         //查询该订单下的所有装车信息
-        List<Map<String, Object>> oomMes = selfServiceMachineMapper.getOOMMes(orderNumber);
+        List<Map<String, Object>> oomMes = universalMapper.getOOMMes(orderNumber);
         tiHuoDanMap.put("loadMes", oomMes);
         return tiHuoDanMap;
     }

src/main/java/com/steerinfo/dil/util/ColumnDataUtil.java

@@ -0,0 +1,38 @@
+package com.steerinfo.dil.util;
+
+import com.steerinfo.dil.feign.ColumnDataFeign;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.*;
+
+@Component
+public class ColumnDataUtil {
+    @Autowired
+    ColumnDataFeign columnDataFeign;
+
+    private Set<Map<String, Object>> setListMap(List<Map<String, Object>> list, String name) {
+        Set<Map<String, Object>> setString = new HashSet<>();
+        for (Map<String, Object> map : list) {//遍历每条数据
+            Map<String, Object> map1 = new HashMap<>();
+            //map.get(name)获取每条数据中对应表头字段的数据
+            map1.put("text", map.get(name));
+            if (map.get(name) != null) {
+                map1.put("value", map.get(name));
+                setString.add(map1);
+            }
+        }
+        return setString;
+    }
+
+    public PageListAdd tableColumnData(Integer apiId, List<Map<String, Object>> list, List<Map<String,Object>> data) {
+        List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
+        for (Map<String, Object> columnData : columnDataList) {
+            //每个表头字段的过滤条件
+            columnData.put("filters", setListMap(list, columnData.get("prop").toString()));
+        }
+        PageListAdd pageList = new PageListAdd(data);
+        pageList.setColumnData(columnDataList);
+        return pageList;
+    }
+}

src/main/resources/bootstrap.yml

@@ -39,7 +39,7 @@ openfeign:
   TmsTrainFeign:
     url: ${TMSTRAINFEIGN_URL:localhost:8086}
   TmsTruckFeign:
-    url: ${TMSTRUCKFEIGN_URL:172.16.33.161:8088}
+    url: ${TMSTRUCKFEIGN_URL:localhost:8088}
   TmsshipFeign:
     url: ${TMSSHIPFEIGN_URL:localhost:8090}
   WMSHFeign:

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

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.steerinfo.dil.mapper.SelfServiceMachineMapper">
-    <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
-        select OO.ORDER_NUMBER "orderNumber",
-               RC.CAPACITY_NUMBER "capacityNumber",
-               RCA.CARRIER_NAME "carrierName",
-               RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
-
-        from OMSTRUCK_ORDER OO
-                 left join RMS_CAPACITY RC
-                           on RC.CAPACITY_ID = OO.CAPACITY_ID
-                 left join RMS_CARRIER RCA
-                           on RCA.CARRIER_ID = RC.CARRIER_ID
-                 left join AMS_SALE_ORDER ASO
-                           on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
-                 left join RMS_CONSIGNEE RCON
-                           on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
-        where OO.ORDER_NUMBER = #{orderNumber}
-    </select>
-
-<!--  查询订单子表关联的  -->
-    <select id="getOOMMes" parameterType="string" resultType="java.util.Map">
-        select
-               RM.MATERIAL_NAME                          "materialName",
-               RPP.PLATFORM_NAME                         "platformName",
-               RP.PERSONNEL_NAME                         "personnelName",
-               (
-                 select ORDER_MATERIAL_NUMBER
-                 from OMSTRUCK_ORDER_MATERIAL OOM
-                 where OOM.ORDER_ID = OO.ORDER_ID
-                  and TLR.MATERIAL_ID = OOM.MATERIAL_ID
-                   ) "orderMaterialNumber"
-        from OMSTRUCK_ORDER OO
-                 left join TMSTRUCK_TOTAL_RESULT TTR
-                           on TTR.ORDER_ID = OO.ORDER_ID
-                 left join TMSTRUCK_LOAD_RESULT TLR
-                           on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
-                 left join RMS_PWAREHOUSE_PLATFORM RPP
-                           on RPP.PLATFORM_ID = TLR.LOADING_ID
-                 left join RMS_MATERIAL RM
-                           on RM.MATERIAL_ID = TLR.MATERIAL_ID
-                 left join RMS_PERSONNEL RP
-                           on RP.PERSONNEL_ID = TLR.LOADER_ID
-        where ORDER_NUMBER = #{orderNumber}
-    </select>
-</mapper>

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

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.steerinfo.dil.mapper.UniversalMapper">
+    <select id="getTiHuoDan" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_NUMBER             "orderNumber",
+               RC.CAPACITY_NUMBER          "capacityNumber",
+               RCA.CARRIER_NAME            "carrierName",
+               RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+                 left join RMS_CARRIER RCA
+                           on RCA.CARRIER_ID = RC.CARRIER_ID
+                 left join AMS_SALE_ORDER ASO
+                           on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
+                 left join RMS_CONSIGNEE RCON
+                           on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+        where OO.ORDER_NUMBER = #{orderNumber}
+    </select>
+    <select id="selectHuanPiaoDan">
+
+    </select>
+
+    <!--  查询订单子表关联的  -->
+    <select id="getOOMMes" parameterType="string" resultType="java.util.Map">
+        select RM.MATERIAL_NAME  "materialName",
+               RPP.PLATFORM_NAME "platformName",
+               RP.PERSONNEL_NAME "personnelName",
+               (
+                   select ORDER_MATERIAL_NUMBER
+                   from OMSTRUCK_ORDER_MATERIAL OOM
+                   where OOM.ORDER_ID = OO.ORDER_ID
+                     and TLR.MATERIAL_ID = OOM.MATERIAL_ID
+               )                 "orderMaterialNumber"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR
+                           on TTR.ORDER_ID = OO.ORDER_ID
+                 left join TMSTRUCK_LOAD_RESULT TLR
+                           on TTR.RESULT_TOTAL_ID = TLR.RESULT_TOTAL_ID
+                 left join RMS_PWAREHOUSE_PLATFORM RPP
+                           on RPP.PLATFORM_ID = TLR.LOADING_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = TLR.MATERIAL_ID
+                 left join RMS_PERSONNEL RP
+                           on RP.PERSONNEL_ID = TLR.LOADER_ID
+        where ORDER_NUMBER = #{orderNumber}
+    </select>
+
+    <sql id="orderBy">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+    </sql>
+
+    <!--  模糊查询所有物资  -->
+    <select id="queryMaterialByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_CODE "materialCode",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel"
+        FROM RMS_MATERIAL RM
+        WHERE RM.MATERIAL_NAME LIKE #{index}
+        )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialCode != null">
+                and
+                <foreach collection="materialCode" item="item" open="(" separator="or" close=")">
+                    "materialCode" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialSpecification != null">
+                and
+                <foreach collection="materialSpecification" item="item" open="(" separator="or" close=")">
+                    "materialSpecification" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialModel != null">
+                and
+                <foreach collection="materialModel" item="item" open="(" separator="or" close=")">
+                    "materialModel" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "materialId" desc
+        </if>
+    </select>
+    <!--    模糊查询发货单位 -->
+    <select id="querySupplierByLike" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (
+        SELECT RS.SUPPLIER_ID "supplierId",
+        RS.SUPPLIER_NAME "supplierName",
+        RS.SUPPLIER_ADDRESS "supplierAddress"
+        FROM RMS_SUPPLIER RS
+        WHERE RS.SUPPLIER_NAME LIKE #{index}
+        )
+        <where>
+            <if test="supplierName != null">
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierAddress != null">
+                and
+                <foreach collection="supplierAddress" item="item" open="(" separator="or" close=")">
+                    "supplierAddress" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+        <if test="orderField == null  ">
+            order by "supplierId" desc
+        </if>
+    </select>
+
+    <!--  获取所有的运力信息 -->
+    <select id="getAllCapacityByCarrierLike" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+        SELECT
+            RDC.DRIVER_CAPACITY_ID "driverCapacityId",
+            RDC.CAPACITY_ID "capacityId",
+            RCD.DRIVER_NAME "driverName",
+            RC.CAPACITY_NUMBER "capacityNumber",
+            RCA.CARRIER_NAME "carrierName"
+        FROM RMS_DRIVER_CAPACITY RDC
+        LEFT JOIN RMS_CAR_DRIVER RCD
+            ON RCD.DRIVER_ID = RDC.DRIVER_ID
+        LEFT JOIN RMS_CAPACITY RC
+            ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+        LEFT JOIN RMS_CARRIER RCA
+            ON RCA.CARRIER_ID = RDC.CARRIER_ID
+        WHERE RC.CAPACITY_STATUS = 0
+            and RCA.CARRIER_NAME LIKE #{index}
+    </select>
+
+</mapper>