Merge branch 'dev' of https://git.steerinfo.com/DAL-DAZHOU/DAL-DAZHOU-API into dev

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

@@ -997,18 +997,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);
     }
 
     //获取到站名称
@@ -1031,4 +1033,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

@@ -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,6 +493,27 @@ 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(){

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

@@ -17,6 +17,7 @@ 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;
 
@@ -61,12 +62,79 @@ public class UniversalController extends BaseRESTfulController {
                                            Integer pageSize,
                                            Integer apiId,
                                            String index) {
-        index = index + "%";
-        List<Map<String, Object>> list = universalMapper.queryMaterialByLike(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(index);
+        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

@@ -590,7 +590,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);
 
     /**
      * 新增销售订单物资信息
@@ -1114,7 +1115,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);
 
@@ -1124,4 +1125,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

@@ -89,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,
@@ -259,8 +258,6 @@ public interface OmsFeign {
 
     );
 
-
-
     @ApiOperation(value="车牌号下拉")
     @GetMapping(value = "api/v1/oms/omstruckorders/getDriverCapacity")
     Map<String, Object> getDriverCapacity();
@@ -273,7 +270,20 @@ 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();

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

@@ -20,7 +20,11 @@ public interface UniversalMapper {
     List<Map<String, Object>> getOOMMes(String orderNumber);
 
     //模糊查询所有物资
-    List<Map<String, Object>> queryMaterialByLike(String index);
+    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/resources/com/steerinfo/dil/mapper/UniversalMapper.xml

@@ -2,9 +2,9 @@
 <!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",
+        select OO.ORDER_NUMBER             "orderNumber",
+               RC.CAPACITY_NUMBER          "capacityNumber",
+               RCA.CARRIER_NAME            "carrierName",
                RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
 
         from OMSTRUCK_ORDER OO
@@ -22,18 +22,17 @@
 
     </select>
 
-<!--  查询订单子表关联的  -->
+    <!--  查询订单子表关联的  -->
     <select id="getOOMMes" parameterType="string" resultType="java.util.Map">
-        select
-               RM.MATERIAL_NAME                          "materialName",
-               RPP.PLATFORM_NAME                         "platformName",
-               RP.PERSONNEL_NAME                         "personnelName",
+        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"
+                   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
@@ -47,14 +46,104 @@
                            on RP.PERSONNEL_ID = TLR.LOADER_ID
         where ORDER_NUMBER = #{orderNumber}
     </select>
-<!--  模糊查询所有物资  -->
-    <select id="queryMaterialByLike" parameterType="string" resultType="java.util.Map">
+
+    <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"
+        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>