浏览代码

'定向派单,公开抢单'

HUJIANGUO 3 年之前
父节点
当前提交
85c61fd152

+ 1 - 1
pom.xml

@@ -109,7 +109,7 @@
                     <!--包名-->
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
                     <tables>
-                    <param>AMSTRUCK_RAIL_DAYPLAN</param>
+                    <param>RMS_DRIVER_CAPACITY</param>
                     </tables>
                     </tables>
                 </configuration>
                 </configuration>
                 <executions>
                 <executions>

+ 59 - 9
src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -893,12 +893,11 @@ public class OmstruckOrderController extends BaseRESTfulController {
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
             @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
     })
     })
-    @PostMapping("/getTransportDispatch/{orderReceiveStatus}")
+    @PostMapping("/getTransportDispatch")
     public RESTfulResult getTransportDispatch(@RequestBody(required = false) Map<String, Object> mapValue,
     public RESTfulResult getTransportDispatch(@RequestBody(required = false) Map<String, Object> mapValue,
                                               Integer apiId,
                                               Integer apiId,
                                               Integer pageNum,
                                               Integer pageNum,
                                               Integer pageSize,
                                               Integer pageSize,
-                                              @PathVariable Integer orderReceiveStatus,
                                               Integer orderType,
                                               Integer orderType,
                                               Integer orderStatus,
                                               Integer orderStatus,
                                               Integer fuelOrder,
                                               Integer fuelOrder,
@@ -909,10 +908,6 @@ public class OmstruckOrderController extends BaseRESTfulController {
             mapValue.put("orderTypee", orderType);
             mapValue.put("orderTypee", orderType);
             count++;
             count++;
         }
         }
-        if (orderReceiveStatus != null) {
-            mapValue.put("orderReceiveStatus", orderReceiveStatus);
-            count++;
-        }
         if (orderStatus != null) {
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
             mapValue.put("orderStatus", orderStatus);
             count++;
             count++;
@@ -948,8 +943,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
             //删除
             //删除
             allOrder.remove(allOrder.size() - 1);
             allOrder.remove(allOrder.size() - 1);
         }
         }
-        if (allOrder == null)
+        if (allOrder == null) {
             allOrder = omstruckOrderService.getTransportDispatch(mapValue);
             allOrder = omstruckOrderService.getTransportDispatch(mapValue);
+        }
         PageHelper.startPage(pageNum, pageSize);
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
         //分页数据
         List<Map<String, Object>> order = omstruckOrderService.getTransportDispatch(mapValue);
         List<Map<String, Object>> order = omstruckOrderService.getTransportDispatch(mapValue);
@@ -958,6 +954,16 @@ public class OmstruckOrderController extends BaseRESTfulController {
         return success(pageList);
         return success(pageList);
     }
     }
 
 
+    @ApiOperation(value = "根据运单id关闭订单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "orderId", value = "运单主键", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/closeOmstruckOrder")
+    public RESTfulResult closeOmstruckOrder(@RequestParam Integer orderId) {
+        int result = omstruckOrderService.closeOmstruckOrder(new BigDecimal(orderId));
+        return success(result);
+    }
+
     @ApiOperation(value = "查询所有空闲的司机排班信息")
     @ApiOperation(value = "查询所有空闲的司机排班信息")
     @ApiImplicitParams({
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
@@ -1146,9 +1152,53 @@ public class OmstruckOrderController extends BaseRESTfulController {
     @PostMapping("/addAppTruckOrder")
     @PostMapping("/addAppTruckOrder")
     public RESTfulResult addAppTruckOrder(@RequestParam Integer dispatchId,
     public RESTfulResult addAppTruckOrder(@RequestParam Integer dispatchId,
                                           @RequestParam Integer orderType,
                                           @RequestParam Integer orderType,
-                                          @RequestParam Integer driverCapacityId) {
-        int result = omstruckOrderService.addAppTruckOrder(dispatchId, orderType, driverCapacityId);
+                                          @RequestParam String capacityNumber,
+                                          @RequestParam Integer carrierId) {
+        int result = omstruckOrderService.addAppTruckOrder(dispatchId, orderType, capacityNumber,carrierId);
         return success(result);
         return success(result);
     }
     }
 
 
+    @ApiOperation(value = " 查询所有车牌号和司机")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
+            @ApiImplicitParam(name = "apiId(246)", value = "动态表头", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
+    })
+    @PostMapping("/getCapacityAndDriverList")
+    public RESTfulResult getCapacityAndDriverList(@RequestBody(required = false) Map<String, Object> mapValue,
+                                                  Integer apiId,
+                                                  Integer pageNum,
+                                                  Integer pageSize,
+                                                  String con) {
+        if (con != null) {
+            if(!"undefined".equals(con)){
+                String index="get_capacity_driver";//设置要查询的索引名称
+                return success(esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con));//获取查询结果
+            }
+        }
+        List<Map<String, Object>> dispatchSaleOrderList = null;
+        if (mapValue.size() == 0) {
+            //将查询结果存入索引中
+            dispatchSaleOrderList = omstruckOrderService.getCapacityAndDriverList(mapValue);
+            Map<String, Object> map1 = new HashMap<>();
+            //添加索引
+            map1.put("index","get_capacity_driver");
+            //添加id
+            map1.put("indexId","driverCapacityId");
+            dispatchSaleOrderList.add(map1);
+            //新建索引
+            esFeign.insertIndex(dispatchSaleOrderList);
+            //删除
+            dispatchSaleOrderList.remove(dispatchSaleOrderList.size()-1);
+        }
+        if (dispatchSaleOrderList == null) {
+            dispatchSaleOrderList = omstruckOrderService.getCapacityAndDriverList(mapValue);
+        }
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String, Object>> columnList = omstruckOrderService.getCapacityAndDriverList(mapValue);
+        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, dispatchSaleOrderList,columnList);
+        return success(pageList);
+    }
+
 }
 }

+ 9 - 2
src/main/java/com/steerinfo/dil/mapper/OmstruckOrderMapper.java

@@ -161,6 +161,13 @@ public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecim
     // 得到销售订单与物资中间表id
     // 得到销售订单与物资中间表id
     BigDecimal getSaleMaterialId(BigDecimal dispatchId);
     BigDecimal getSaleMaterialId(BigDecimal dispatchId);
 
 
-    // 根据司机排班表查询运力id
-    BigDecimal getCapacityId(BigDecimal driverCapacityId);
+    // 根据车牌号查询运力id
+    BigDecimal getCapacityId(String capacityNumber);
+
+    // 根据运力id查询司机排班id
+    BigDecimal getDriverCapacityId(BigDecimal capacityId);
+
+    List<Map<String,Object>> getCapacityAndDriver(Map<String,Object> mapValue);
+
+    List<BigDecimal> getNullOrNotNull(BigDecimal dispatchId);
 }
 }

+ 10 - 0
src/main/java/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.java

@@ -0,0 +1,10 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.RmsDriverCapacity;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface RmsDriverCapacityMapper extends IBaseMapper<RmsDriverCapacity, BigDecimal> {
+}

+ 183 - 0
src/main/java/com/steerinfo/dil/model/RmsDriverCapacity.java

@@ -0,0 +1,183 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.IBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.Date;
+
+@ApiModel(value="司机排班")
+public class RmsDriverCapacity implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(DRIVER_CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal driverCapacityId;
+
+    /**
+     * 司机ID(DRIVER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="司机ID",required=false)
+    private BigDecimal driverId;
+
+    /**
+     * 运力ID(CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运力ID",required=false)
+    private BigDecimal capacityId;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    /**
+     * 承运商ID(CARRIER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="承运商ID",required=false)
+    private BigDecimal carrierId;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.driverCapacityId;
+    }
+
+    @Override
+    public void setId(BigDecimal driverCapacityId) {
+        this.driverCapacityId = driverCapacityId;
+    }
+
+    public BigDecimal getDriverCapacityId() {
+        return driverCapacityId;
+    }
+
+    public void setDriverCapacityId(BigDecimal driverCapacityId) {
+        this.driverCapacityId = driverCapacityId;
+    }
+
+    public BigDecimal getDriverId() {
+        return driverId;
+    }
+
+    public void setDriverId(BigDecimal driverId) {
+        this.driverId = driverId;
+    }
+
+    public BigDecimal getCapacityId() {
+        return capacityId;
+    }
+
+    public void setCapacityId(BigDecimal capacityId) {
+        this.capacityId = capacityId;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public BigDecimal getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(BigDecimal carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", driverCapacityId=").append(driverCapacityId);
+        sb.append(", driverId=").append(driverId);
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", carrierId=").append(carrierId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

+ 6 - 1
src/main/java/com/steerinfo/dil/service/IOmstruckOrderService.java

@@ -143,6 +143,11 @@ public interface IOmstruckOrderService {
     Map<String, Object> getTruckNoDispatchMap(Integer dispatchId);
     Map<String, Object> getTruckNoDispatchMap(Integer dispatchId);
 
 
     //承运商分派运输订单给司机
     //承运商分派运输订单给司机
-    int addAppTruckOrder(Integer dispatchId, Integer orderType, Integer driverCapacityId);
+    int addAppTruckOrder(Integer dispatchId, Integer orderType, String capacityNumber,Integer carrierId);
 
 
+    // 根据运单id关闭订单
+    int closeOmstruckOrder(BigDecimal orderId);
+
+    // 查询所有车牌号和司机
+    List<Map<String, Object>> getCapacityAndDriverList(Map<String, Object> mapValue);
 }
 }

+ 41 - 9
src/main/java/com/steerinfo/dil/service/impl/OmstruckOrderServiceImpl.java

@@ -6,10 +6,8 @@ import com.steerinfo.dil.feign.TmsTruckFeign;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
 import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
 import com.steerinfo.dil.mapper.RmsCapacityMapper;
-import com.steerinfo.dil.model.AmsSaleOrderMaterial;
-import com.steerinfo.dil.model.OmstruckOrder;
-import com.steerinfo.dil.model.OmstruckOrderMaterial;
-import com.steerinfo.dil.model.RmsCapacity;
+import com.steerinfo.dil.mapper.RmsDriverCapacityMapper;
+import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.service.IOmstruckOrderService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.DataChange;
 import javafx.scene.paint.Material;
 import javafx.scene.paint.Material;
@@ -56,6 +54,9 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     @Autowired
     @Autowired
     RmsCapacityMapper rmsCapacityMapper;
     RmsCapacityMapper rmsCapacityMapper;
 
 
+    @Autowired
+    RmsDriverCapacityMapper rmsDriverCapacityMapper;
+
 
 
     /**
     /**
      * 用于远程调用运输订单新增
      * 用于远程调用运输订单新增
@@ -970,6 +971,10 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
     @Override
     @Override
     public Map<String, Object> getTruckNoDispatchMap(Integer dispatchId) {
     public Map<String, Object> getTruckNoDispatchMap(Integer dispatchId) {
         Map<String, Object> map = omstruckOrderMapper.getTruckNoDispatchMap(new BigDecimal(dispatchId));
         Map<String, Object> map = omstruckOrderMapper.getTruckNoDispatchMap(new BigDecimal(dispatchId));
+        List<BigDecimal> orderIdList = omstruckOrderMapper.getNullOrNotNull(new BigDecimal(dispatchId));
+        if (orderIdList != null || orderIdList.size() != 0) {
+            return null;
+        }
         List<Map<String, Object>> materialMessages = omstruckOrderMapper.getMaterialMessages(new BigDecimal(dispatchId));
         List<Map<String, Object>> materialMessages = omstruckOrderMapper.getMaterialMessages(new BigDecimal(dispatchId));
         String allMaterialName = "";
         String allMaterialName = "";
         String allMaterialNumber = "";
         String allMaterialNumber = "";
@@ -1031,15 +1036,15 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
 
 
     /**
     /**
      * 承运商分派运输订单给司机
      * 承运商分派运输订单给司机
-     *
      * @param dispatchId
      * @param dispatchId
      * @param orderType
      * @param orderType
-     * @param driverCapacityId
+     * @param capacityNumber
+     * @param carrierId
      * @return
      * @return
      */
      */
     @Transactional
     @Transactional
     @Override
     @Override
-    public int addAppTruckOrder(Integer dispatchId, Integer orderType, Integer driverCapacityId) {
+    public int addAppTruckOrder(Integer dispatchId, Integer orderType, String capacityNumber, Integer carrierId) {
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         OmstruckOrder omstruckOrder = new OmstruckOrder();
         BigDecimal orderId = omstruckOrderMapper.selectMaxId();
         BigDecimal orderId = omstruckOrderMapper.selectMaxId();
         omstruckOrder.setOrderId(orderId);
         omstruckOrder.setOrderId(orderId);
@@ -1056,7 +1061,12 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
         omstruckOrder.setInsertUpdateRemark("无");
         omstruckOrder.setInsertUpdateRemark("无");
         omstruckOrder.setDeleted(new BigDecimal(0));
         omstruckOrder.setDeleted(new BigDecimal(0));
         omstruckOrder.setOrderType(new BigDecimal(orderType));
         omstruckOrder.setOrderType(new BigDecimal(orderType));
-        omstruckOrder.setDriverCapacityId(new BigDecimal(driverCapacityId));
+        BigDecimal capacityId = omstruckOrderMapper.getCapacityId(capacityNumber);
+        BigDecimal driverCapacityId = omstruckOrderMapper.getDriverCapacityId(capacityId);
+        omstruckOrder.setDriverCapacityId(driverCapacityId);
+        RmsDriverCapacity rmsDriverCapacity = rmsDriverCapacityMapper.selectByPrimaryKey(driverCapacityId);
+        rmsDriverCapacity.setCarrierId(new BigDecimal(carrierId));
+        rmsDriverCapacityMapper.updateByPrimaryKeySelective(rmsDriverCapacity);
         List<Map<String, Object>> mapList = omstruckOrderMapper.getMaterialMessages(new BigDecimal(dispatchId));
         List<Map<String, Object>> mapList = omstruckOrderMapper.getMaterialMessages(new BigDecimal(dispatchId));
         if (mapList != null && mapList.size() != 0) {
         if (mapList != null && mapList.size() != 0) {
             for (Map<String, Object> map : mapList) {
             for (Map<String, Object> map : mapList) {
@@ -1080,12 +1090,34 @@ public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
                 omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
                 omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
             }
             }
         }
         }
-        BigDecimal capacityId = omstruckOrderMapper.getCapacityId(new BigDecimal(driverCapacityId));
         RmsCapacity rmsCapacity = rmsCapacityMapper.selectByPrimaryKey(capacityId);
         RmsCapacity rmsCapacity = rmsCapacityMapper.selectByPrimaryKey(capacityId);
         rmsCapacity.setCapacityStatus(new BigDecimal(2));
         rmsCapacity.setCapacityStatus(new BigDecimal(2));
         rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
         rmsCapacityMapper.updateByPrimaryKeySelective(rmsCapacity);
         return omstruckOrderMapper.insertSelective(omstruckOrder);
         return omstruckOrderMapper.insertSelective(omstruckOrder);
     }
     }
 
 
+    /**
+     * 根据运单id关闭订单
+     * @param orderId
+     * @return
+     */
+    @Override
+    public int closeOmstruckOrder(BigDecimal orderId) {
+        OmstruckOrder omstruckOrder = omstruckOrderMapper.selectByPrimaryKey(orderId);
+        omstruckOrder.setOrderStatus(new BigDecimal(7));
+        int result = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
+        return result;
+    }
+
+    /**
+     * 查询所有车牌号和司机
+     * @param mapValue
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getCapacityAndDriverList(Map<String, Object> mapValue) {
+        return omstruckOrderMapper.getCapacityAndDriver(mapValue);
+    }
+
 
 
 }
 }

+ 53 - 9
src/main/resources/com/steerinfo/dil/mapper/OmstruckOrderMapper.xml

@@ -1276,7 +1276,9 @@
         *
         *
         from(
         from(
         select
         select
+        OO.ORDER_ID "orderId",
         APO.PURCHASE_ORDER_NO "purchaseOrderNo",
         APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        OO.ORDER_NUMBER "orderNumber",
         RS.SUPPLIER_NAME "supplierName",
         RS.SUPPLIER_NAME "supplierName",
         RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
         RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
         RW.WAREHOUSE_NAME "warehouseName",
         RW.WAREHOUSE_NAME "warehouseName",
@@ -1316,9 +1318,6 @@
             <if test="orderTypee != null">
             <if test="orderTypee != null">
                 and OO.ORDER_TYPE = #{orderTypee}
                 and OO.ORDER_TYPE = #{orderTypee}
             </if>
             </if>
-            <if test="orderReceiveStatus != null">
-                and OO.ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
-            </if>
             <if test="fuelOrder != null">
             <if test="fuelOrder != null">
                 and OO.ORDER_TYPE in (6, 7)
                 and OO.ORDER_TYPE in (6, 7)
             </if>
             </if>
@@ -1330,6 +1329,11 @@
                     "purchaseOrderNo" like '%${item}%'
                     "purchaseOrderNo" like '%${item}%'
                 </foreach>
                 </foreach>
             </if>
             </if>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
             <if test="supplierName != null">
             <if test="supplierName != null">
                 and
                 and
                 <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
                 <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
@@ -2247,6 +2251,16 @@
           AND ADSO.DISPATCH_ID = #{dispatchId}
           AND ADSO.DISPATCH_ID = #{dispatchId}
     </select>
     </select>
 
 
+    <select id="getNullOrNotNull" parameterType="DECIMAL" resultType="java.util.List">
+        SELECT OO.ORDER_ID AS "orderId"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = ADSO.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        WHERE ADSO.DISPATCH_ID = #{dispatchId}
+    </select>
+
     <select id="getMaterialMessages" parameterType="DECIMAL" resultType="java.util.Map">
     <select id="getMaterialMessages" parameterType="DECIMAL" resultType="java.util.Map">
         SELECT RM.MATERIAL_NAME                               AS "materialName",
         SELECT RM.MATERIAL_NAME                               AS "materialName",
                RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
                RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
@@ -2272,13 +2286,43 @@
         WHERE ADSO.DISPATCH_ID = #{dispatchId}
         WHERE ADSO.DISPATCH_ID = #{dispatchId}
     </select>
     </select>
 
 
-    <select id="getCapacityId" parameterType="DECIMAL" resultType="DECIMAL">
+    <select id="getCapacityId" parameterType="java.lang.String" resultType="DECIMAL">
+        SELECT RC.CAPACITY_ID AS "capacityId"
+        FROM RMS_CAPACITY RC
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+    </select>
+
+    <select id="getDriverCapacityId" parameterType="DECIMAL" resultType="DECIMAL">
+        SELECT RC.DRIVER_CAPACITY_ID AS "driverCapacityId"
+        FROM RMS_DRIVER_CAPACITY RC
+        WHERE RC.CAPACITY_ID = #{capacityId}
+    </select>
+
+    <select id="getCapacityAndDriver" parameterType="java.util.Map" resultType="java.util.Map">
         SELECT *
         SELECT *
-        FROM (SELECT RDC.CAPACITY_ID AS "capacityId"
-              FROM RMS_DRIVER_CAPACITY RDC
-              WHERE RDC.DRIVER_CAPACITY_ID = #{driverCapacityId}
-              ORDER BY RDC.INSERT_TIME)
-        WHERE ROWNUM = 1
+        FROM (SELECT RC.CAPACITY_NUMBER AS "capacityNumber",
+        RCD.DRIVER_NAME AS "driverName"
+        FROM RMS_DRIVER_CAPACITY RDC
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+        LEFT JOIN RMS_CAR_DRIVER RCD
+        ON RDC.DRIVER_ID = RCD.DRIVER_ID
+        WHERE RC.CAPACITY_STATUS = 0
+        )
+        <where>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="driverName != null">
+                and
+                <foreach collection="driverName" item="item" open="(" separator="or" close=")">
+                    "driverName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
     </select>
     </select>
 
 
 </mapper>
 </mapper>

+ 2 - 2
src/main/resources/com/steerinfo/dil/mapper/RmsCapacityMapper.xml

@@ -192,7 +192,7 @@
       </if>
       </if>
     </where>
     </where>
   </sql>
   </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.lang.Short">
+  <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
     delete from RMS_CAPACITY
     delete from RMS_CAPACITY
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </delete>
   </delete>
@@ -527,7 +527,7 @@
     </set>
     </set>
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </update>
   </update>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Short" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
     <include refid="select" />
     <include refid="select" />
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
     where CAPACITY_ID = #{capacityId,jdbcType=DECIMAL}
   </select>
   </select>

+ 343 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsDriverCapacityMapper.xml

@@ -0,0 +1,343 @@
+<?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.RmsDriverCapacityMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.RmsDriverCapacity">
+    <id column="DRIVER_CAPACITY_ID" jdbcType="DECIMAL" property="driverCapacityId" />
+    <result column="DRIVER_ID" jdbcType="DECIMAL" property="driverId" />
+    <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
+    <result column="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+    <result column="INSERT_USERNAME" jdbcType="VARCHAR" property="insertUsername" />
+    <result column="INSERT_TIME" jdbcType="TIMESTAMP" property="insertTime" />
+    <result column="UPDATE_USERNAME" jdbcType="VARCHAR" property="updateUsername" />
+    <result column="UPDATE_TIME" jdbcType="TIMESTAMP" property="updateTime" />
+    <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+    <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
+  </resultMap>
+  <sql id="columns">
+    DRIVER_CAPACITY_ID, DRIVER_ID, CAPACITY_ID, INSERT_UPDATE_REMARK, INSERT_USERNAME, 
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, DELETED, CARRIER_ID
+  </sql>
+  <sql id="columns_alias">
+    t.DRIVER_CAPACITY_ID, t.DRIVER_ID, t.CAPACITY_ID, t.INSERT_UPDATE_REMARK, t.INSERT_USERNAME, 
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.DELETED, t.CARRIER_ID
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns" /> FROM RMS_DRIVER_CAPACITY
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias" /> FROM RMS_DRIVER_CAPACITY t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="driverCapacityId != null">
+        and DRIVER_CAPACITY_ID = #{driverCapacityId}
+      </if>
+      <if test="driverId != null">
+        and DRIVER_ID = #{driverId}
+      </if>
+      <if test="capacityId != null">
+        and CAPACITY_ID = #{capacityId}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="driverCapacityId != null">
+        and DRIVER_CAPACITY_ID = #{driverCapacityId}
+      </if>
+      <if test="driverId != null">
+        and DRIVER_ID = #{driverId}
+      </if>
+      <if test="capacityId != null">
+        and CAPACITY_ID = #{capacityId}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        and INSERT_USERNAME LIKE '%${insertUsername}%'
+      </if>
+      <if test="insertTime != null">
+        and TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = #{insertTime}
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        and UPDATE_USERNAME LIKE '%${updateUsername}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="deleted != null">
+        and DELETED = #{deleted}
+      </if>
+      <if test="carrierId != null">
+        and CARRIER_ID = #{carrierId}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from RMS_DRIVER_CAPACITY
+    where DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from RMS_DRIVER_CAPACITY
+    where 1!=1 
+      <if test="driverId != null">
+        or DRIVER_ID = #{driverId}
+      </if>
+      <if test="capacityId != null">
+        or CAPACITY_ID = #{capacityId}
+      </if>
+      <if test="insertUpdateRemark != null and insertUpdateRemark != ''">
+        or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+      </if>
+      <if test="insertUsername != null and insertUsername != ''">
+        or INSERT_USERNAME = #{insertUsername}
+      </if>
+      <if test="insertTime != null">
+        or TO_CHAR(INSERT_TIME,'yyyy-MM-dd') = '#{insertTime}'
+      </if>
+      <if test="updateUsername != null and updateUsername != ''">
+        or UPDATE_USERNAME = #{updateUsername}
+      </if>
+      <if test="updateTime != null">
+        or TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = '#{updateTime}'
+      </if>
+      <if test="deleted != null">
+        or DELETED = #{deleted}
+      </if>
+      <if test="carrierId != null">
+        or CARRIER_ID = #{carrierId}
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.RmsDriverCapacity">
+    insert into RMS_DRIVER_CAPACITY (DRIVER_CAPACITY_ID, DRIVER_ID, CAPACITY_ID, 
+      INSERT_UPDATE_REMARK, INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, DELETED, 
+      CARRIER_ID)
+    values (#{driverCapacityId,jdbcType=DECIMAL}, #{driverId,jdbcType=DECIMAL}, #{capacityId,jdbcType=DECIMAL}, 
+      #{insertUpdateRemark,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
+      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{deleted,jdbcType=DECIMAL}, 
+      #{carrierId,jdbcType=DECIMAL})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.RmsDriverCapacity">
+    insert into RMS_DRIVER_CAPACITY
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="driverCapacityId != null">
+        DRIVER_CAPACITY_ID,
+      </if>
+      <if test="driverId != null">
+        DRIVER_ID,
+      </if>
+      <if test="capacityId != null">
+        CAPACITY_ID,
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK,
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME,
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME,
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME,
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME,
+      </if>
+      <if test="deleted != null">
+        DELETED,
+      </if>
+      <if test="carrierId != null">
+        CARRIER_ID,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="driverCapacityId != null">
+        #{driverCapacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="driverId != null">
+        #{driverId,jdbcType=DECIMAL},
+      </if>
+      <if test="capacityId != null">
+        #{capacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleted != null">
+        #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierId != null">
+        #{carrierId,jdbcType=DECIMAL},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.RmsDriverCapacity">
+    update RMS_DRIVER_CAPACITY
+    set DRIVER_ID = #{driverId,jdbcType=DECIMAL},
+      CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+      INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      DELETED = #{deleted,jdbcType=DECIMAL},
+      CARRIER_ID = #{carrierId,jdbcType=DECIMAL}
+    where DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.RmsDriverCapacity">
+    update RMS_DRIVER_CAPACITY
+    <set>
+      <if test="driverId != null">
+        DRIVER_ID = #{driverId,jdbcType=DECIMAL},
+      </if>
+      <if test="capacityId != null">
+        CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="deleted != null">
+        DELETED = #{deleted,jdbcType=DECIMAL},
+      </if>
+      <if test="carrierId != null">
+        CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+      </if>
+    </set>
+    where DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select" />
+    where DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL}
+  </select>
+  <select id="selectByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="where" />
+  </select>
+  <select id="selectLikeByParameters" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <include refid="whereLike" />
+  </select>
+  <insert id="batchInsert" parameterType="java.util.List">
+    insert into RMS_DRIVER_CAPACITY 
+      (DRIVER_CAPACITY_ID, 
+      DRIVER_ID, CAPACITY_ID, INSERT_UPDATE_REMARK, 
+      INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      DELETED, CARRIER_ID)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.driverCapacityId,jdbcType=DECIMAL}, 
+      #{item.driverId,jdbcType=DECIMAL}, #{item.capacityId,jdbcType=DECIMAL}, #{item.insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.deleted,jdbcType=DECIMAL}, #{item.carrierId,jdbcType=DECIMAL} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update RMS_DRIVER_CAPACITY
+     set
+       DRIVER_CAPACITY_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
+          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.driverCapacityId,jdbcType=DECIMAL}
+       </foreach>
+       ,DRIVER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
+          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.driverId,jdbcType=DECIMAL}
+       </foreach>
+       ,CAPACITY_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
+          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
+          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
+          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
+          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
+          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
+          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,DELETED=
+       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
+          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+       </foreach>
+       ,CARRIER_ID=
+       <foreach close="end" collection="list" index="index" item="item" open="case DRIVER_CAPACITY_ID" separator=" ">
+          when #{item.driverCapacityId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+       </foreach>
+     where DRIVER_CAPACITY_ID in 
+     <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+    #{item.driverCapacityId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from RMS_DRIVER_CAPACITY
+    where DRIVER_CAPACITY_ID in 
+    <foreach close=")" collection="list" item="id" open="(" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示!!!-->
+  <!-- 请将自己写的代码放在此标签之下,方便以后粘贴复制。-->
+
+  
+</mapper>