修改

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

@@ -899,6 +899,15 @@ public class BMSController extends BaseRESTfulController {
         return bmstruckFeign.addTruckDetail(map);
     }
 
+    @PostMapping("updateConsignee")
+    @ApiOperation(value = "修改详单收货客户")
+    RESTfulResult updateConsignee(@RequestBody Map<String,Object> map) {
+        if(map==null){
+            return failed("参数为空!");
+        }
+        return bmstruckFeign.updateConsignee(map);
+    }
+
     @ApiOperation("查询发票图片")
     @PostMapping("/getStatementPhoto")
     public List<String> getStatementPhoto(@RequestParam BigDecimal statementId) throws Exception{

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

@@ -2,6 +2,8 @@ package com.steerinfo.dil.controller;
 
 
 import com.steerinfo.dil.mapper.BackgroundProcessingMapper;
+import com.steerinfo.dil.mapper.OmstruckOrderMapper;
+import com.steerinfo.dil.mapper.UniversalMapper;
 import com.steerinfo.dil.service.impl.BackgroundProcessingServiceImpl;
 import com.steerinfo.dil.util.BaseRESTfulController;
 import com.steerinfo.dil.util.DataChange;
@@ -32,6 +34,12 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     @Autowired
     private BackgroundProcessingServiceImpl backgroundProcessingService;
 
+    @Autowired
+    private OmstruckOrderMapper omstruckOrderMapper;
+
+    @Autowired
+    private UniversalMapper universalMapper;
+
 
     @ApiOperation(value = "关闭一车多趟方法")
     @PostMapping("/closePurOrderMoreTrips")
@@ -132,4 +140,34 @@ public class BackgroundProcessingController extends BaseRESTfulController {
     public RESTfulResult resetPrintNumber(@RequestBody(required = false) Map<String,Object> map){
         return success(backgroundProcessingMapper.resetPrintNumber(map));
     }
+
+    @ApiOperation(value = "删除进厂和排队")
+    @PostMapping("clearEnAndQue")
+    public RESTfulResult clearEnAndQue(@RequestBody(required = false) Map<String,Object> map){
+        try {
+            Map<String,Object> mesMap = backgroundProcessingMapper.getDetailsForEnAndQue(map);
+            if(mesMap == null){
+                return failed("没有符合条件的运单，请确认该运单是否已有净重！");
+            }
+            //清空进厂信息
+            backgroundProcessingMapper.clearEnDetails(mesMap);
+            //删除排队
+            int materialMesCount = omstruckOrderMapper.getMaterialNumByOrderId(mesMap);
+            if (materialMesCount == 1) {
+                //如果是单拼,则删除排队实绩
+                omstruckOrderMapper.deleteQueueList(DataChange.dataToBigDecimal(mesMap.get("capacityId")));
+                omstruckOrderMapper.deleteQueueResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            }else{
+                omstruckOrderMapper.deleteQueueSpellList(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+                omstruckOrderMapper.deleteQueueResult(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            }
+            //将总实绩里面的部分信息去掉,并改路段顺序号为null
+            omstruckOrderMapper.updateTotalResultNull(DataChange.dataToBigDecimal(mesMap.get("resultTotalId")));
+            universalMapper.updateLineSqe(mesMap);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed("未知异常!",e.getMessage());
+        }
+        return success("修改成功！");
+    }
 }

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

@@ -23,10 +23,17 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartRequest;
 
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.File;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.math.BigDecimal;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -1170,13 +1177,72 @@ public class UniversalController extends BaseRESTfulController {
     @ApiOperation("获取图片通用方法")
     @PostMapping("/getPicture")
     public List<String> getPicture(@RequestBody(required = false) Map<String,Object> map) throws Exception {
-        List<String> results=new ArrayList<>();
-        String urls = map.get("urls").toString();
-        String files[]=urls.split(";");
-        for(int i=0;i<files.length && files[i].length()>5;i++){
-            results.add((String)imageFileUtils.downloadFile(files[i]));
+        try{
+            List<String> results=new ArrayList<>();
+            String urls = map.get("urls").toString();
+            String files[]=urls.split(";");
+            for(int i=0;i<files.length && files[i].length()>5;i++){
+                results.add((String)imageFileUtils.downloadFile(files[i]));
+            }
+            return results;
+        }catch (Exception e){
+            return null;
+        }
+    }
+
+    @ApiOperation("获取图片通用方法")
+    @GetMapping("/getFile")
+    public RESTfulResult getFile(@RequestParam("path") String path, HttpServletResponse response) throws Exception {
+            try {
+                File file = new File(path);
+                if(file.isDirectory()){
+                    return failed("该路径是文件夹而非文件！");
+                }
+                FileInputStream inputStream = new FileInputStream(path);
+                byte[] data = new byte[inputStream.available()];
+                inputStream.read(data);
+                response.setCharacterEncoding("UTF-8");
+                response.setContentType("application/octet-stream;charset=UTF-8");
+                String diskfilename = URLEncoder.encode(file.getName(),"UTF-8") ;
+                response.setHeader("Content-Disposition", "attachment; filename=\"" + diskfilename + "\"");
+                response.setContentLength(data.length);
+                response.setHeader("Content-Range", "" + Integer.valueOf(data.length - 1));
+                response.setHeader("Accept-Ranges", "bytes");
+                OutputStream os = response.getOutputStream();
+                os.write(data);
+                //先声明的流后关掉！
+                os.flush();
+                os.close();
+                inputStream.close();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return failed("未知异常！",e.getMessage());
+            }
+            return success("成功！");
+    }
+
+    @ApiOperation("上传图片通用方法,返回成功后的url")
+    @PostMapping("/uploadPic")
+    public String getPicture(MultipartRequest request) throws Exception {
+        //添加到files数组
+        List<MultipartFile> files = new ArrayList<>();
+        for(int i=0;i<21;i++){
+            MultipartFile file = request.getFile("file"+i);
+            if(file!=null){
+                files.add(file);
+            }
+        }
+        //没有上传
+        if(files.size() == 0){
+            return  null;
+        }
+        //上传图片,拼接在一个url里
+        String url="";
+        for (int i=0;i<files.size();i++){
+            MultipartFile file=files.get(i);
+            url += imageFileUtils.updateFile(file,i)+';';
         }
-        return results;
+        return url;
     }
 
     @ApiOperation("销售钢材报表通用提交按钮")

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

@@ -149,6 +149,9 @@ public interface BmstruckFeign {
     @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/addTruckDetail")
     RESTfulResult addTruckDetail(@RequestBody Map<String, Object> map);
 
+    @PostMapping(value = "/api/v1/bmstruck/bmstruckdetailsorder/updateConsignee")
+    RESTfulResult updateConsignee(@RequestBody Map<String, Object> map);
+
     /**
      * 展示账单下的详单
      *

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

@@ -73,4 +73,10 @@ public interface BackgroundProcessingMapper {
 
     //重置钢材打印数量
     int resetPrintNumber(Map<String,Object> map);
+
+    //查询钢材车辆进厂并且没有净重的总实绩
+    Map<String,Object> getDetailsForEnAndQue(Map<String,Object> map);
+
+    //清空进厂信息
+    int clearEnDetails(Map<String,Object> map);
 }

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

@@ -0,0 +1,404 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.OmstruckOrder;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecimal> {
+    //根据销售订单id查找销售订单信息
+    List<Map<String, Object>> selectSaleNumberForCarrier(Integer saleOrderId);
+
+    //查询已接收的焦炭发运计划
+    List<Map<String, Object>> selectCokeDayPlanAndRecived(Map<String, Object> map);
+
+    //查询已接收的水渣发运计划
+    List<Map<String, Object>> selectWaterSlagDayPlanAndRecived(Integer carrierId);
+
+    //查询所有运输订单信息 状态：3
+    //查询所有已下发运输订单 状态：4
+    List<Map<String, Object>> getAllTruckOrder(Map<String, Object> map);
+
+    //查询最大主键Id
+    @Select("select seq_omstruck_order.nextval from dual")
+    BigDecimal selectMaxId();
+
+    //通过运输订单Id查询运输订单号
+    String getOrderNumberByOrderId(Integer orderId);
+
+    //通过运输订单号查询运输订单ID
+    Integer getOrderIdByOrderNumber(String orderNumber);
+
+    //查询所有运力信息
+    List<Map<String, Object>> getAllCapacity(Map<String, Object> map);
+
+    //通过运力Id 或 车牌号 修改运输状态
+    int updateCapacityByCarIdOrNum(Map<String, Object> map);
+
+    int updateCapacityById(Map<String, Object> map);
+
+    //通过运输订单ID 或 运输订单号 查询运力Id
+    BigDecimal getCapacityIdByOrderOrNum(Map<String, Object> map);
+
+    //通过ID获取派单时间
+    Date getInsertTimeById(Integer orderId);
+
+    //通过车牌号查询运力id
+    BigDecimal getCapacityIdByCapacityNum(String capacityNumber);
+
+    //司机接单调用接口 通过运力Id匹配  /  通过运单ID查询运单信息 APP
+    //查询所有接单或拒绝接单的订单 PC -- 采购
+    List<Map<String, Object>>   getTruckOrderByCapacityNum(Map<String, Object> map);
+
+    //查询所有接单或拒绝接单的订单 PC -- 销售
+    List<Map<String, Object>> getSaleTruckOrderByCapacityNum(Map<String, Object> map);
+
+    //查询司机所有已拒绝过的订单
+    List<Map<String, Object>> getReceiveRefuseOrderByCapacityId(Map<String, Object> map);
+
+    //  通过运输订单号或运输订单ID查询总实绩ID和订单类型
+    Map<String, Object> getResultTotalIdByOrderNumAndId(Map<String, Object> map);
+
+    // 通过运输订单Id查询运输订单子表有几种物资 ：物资ID
+    List<Integer> getMaterialIdListByOrderId(Integer orderId);
+
+    // 查询实绩地点和时间
+    List<Map<String, Object>> selectPlaceAndTime(BigDecimal orderId);
+
+    //通过运单号查询运单信息
+    List<Map<String, Object>> getOrderByOrderId(BigDecimal orderId);
+
+    //通过运输订单号查询预设路径的作业点ID  及 总实绩ID
+    Map<String, Object> getPointIdByOrderNum(Map<String, Object> map);
+
+    //运输派单
+    List<Map<String, Object>> getTransportDispatch(Map<String, Object> map);
+
+    //查询已下发未接受的销售订单信息
+    List<Map<String, Object>> getOrderUnReceive(BigDecimal orderType);
+
+    //查询已下发已接受的销售订单信息
+    List<Map<String, Object>> getOrderReceived(BigDecimal orderType);
+
+    //通过销售订单物资ID查找物资理重和物资件数
+    Map<String, Object> selectTheoreticalWeightAndMaterialNumber(Integer saleOrderMaterialId);
+
+    //销售物流：展示已经形成订单的水渣发运计划
+    List<Map<String, Object>> selectWaterSlagForOrder(Map<String, Object> map);
+
+    //销售物流：展示已经形成订单的焦炭发运计划
+    List<Map<String, Object>> selectCokeRailPlanForOrder(Map<String, Object> map);
+
+    //通过车序号表id查找物资id
+    List<Map<String, Object>> selectMaterialIdBysaleOrderMaterialId(Integer saleOrderMaterialId);
+
+    //查找司机排班表信息
+    List<Map<String, Object>> selectCapacityAndDriver(Map<String, Object> map);
+
+    //通过用户id查找用户姓名
+    String selectPersonNameByPersonnelId(Integer personnelId);
+
+    //通过车牌号、承运商匹配最新的运力id
+    BigDecimal selectCapacityId(BigDecimal carrierId, String capacityNumber);
+
+    //通过运输订单ID查询数据 用于websocket推送数据
+    Map<String, Object> pushMesToWebsocket(Map<String, Object> map);
+
+    //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号
+    Map<String, Object> selectNewOrderId(Map<String, Object> map);
+
+    //查询所有的收货单位
+    List<Map<String, Object>> getReceivingUnit();
+
+    //查询所有的发货单位
+    List<Map<String, Object>> getSupplier();
+
+    //通过采购订单号查找采购订单ID
+    BigDecimal getPurchaseOrderIdByNo(String purchaseOrderNo);
+
+
+    //App
+    //查询主干信息
+    Map<String, Object> getSaleTruckOrderByCapacityId(Map<String, Object> map);
+
+    //查询物资信息
+    List<Map<String, Object>> getSaleTruckOrderByCapacityNumMaterial(Map<String, Object> map);
+
+    //根据发运计划id查找物资id
+    Map<String, Object> selectMaterialIdAndWeightByDayPlanId(Integer dayPlanId);
+
+    //销售模块，查看所有订单
+    List<Map<String, Object>> selectAllOrderForSale(Map<String, Object> map);
+
+    //根据车序号id查找销售订单
+    List<Map<String, Object>> selectSaleBySaleOrderMaterialId(Integer saleOrderMaterialId);
+
+
+    //销售：接收运输订单展示pc端界面
+    List<Map<String, Object>> selectTransportOrderForSale(Map<String, Object> map);
+
+    List<Map<String, Object>> selectTransportOrderForSale1(Map<String, Object> map);
+
+    //销售：根据承运商查找承运商
+    List<Map<String, Object>> selectSaleMaterialIdByCarrierId(Integer carrierId);
+
+    //根据承运商查找销售订单
+    List<Map<String, Object>> selectSteelSaleForCarrier(Map<String, Object> map);
+
+    //根据销售订单id查找信息
+    List<Map<String, Object>> selectInfoBySaleOrderId(Integer saleOrderId);
+
+    //根据承运商查找发运计划
+    List<Map<String, Object>> selectCokeRailPlan(Map<String, Object> map);
+
+    //根据发运计划查找信息
+    List<Map<String, Object>> selectInfoByDayPlanId(Map<String, Object> map);
+
+    // 车牌号下拉
+    List<Map<String, Object>> getDriverCapacity();
+
+    // 派单信息
+    Map<String, Object> getTruckNoDispatchMap(BigDecimal dispatchId);
+
+    // 物资信息
+    List<Map<String, Object>> getMaterialMessages(BigDecimal dispatchId);
+
+    // 得到销售订单与物资中间表id
+    BigDecimal getSaleMaterialId(BigDecimal dispatchId);
+
+    // 根据车牌号查询运力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);
+
+    BigDecimal getInwardMaterial(BigDecimal planId);
+
+    List<Map<String, Object>> getInwardOrderList(Map<String, Object> mapValue);
+
+    List<Map<String, Object>> getResultList(BigDecimal driverCapacityId);
+
+    Map<String, Object> sendOrderToApp(Map<String, Object> map);
+
+    Map<String, Object> getSaleOrderMap(BigDecimal orderId);
+
+    Map<String, Object> getSteelInwardOrderMap(BigDecimal orderId);
+
+    Map<String, Object> getPurchaseOrderMap(BigDecimal orderId);
+
+    Map<String, Object> getInwardOrderMap(BigDecimal orderId);
+
+    //通过订单Id查询该订单下所有的物资
+    List<Map<String,Object>> getMaterialMes(@Param("orderId") BigDecimal orderId, @Param("steelJudge") String steelJudge);
+
+    //通过订单Id查询该订单下所有的物资
+    List<Map<String,Object>> getMaterialMesForGrossWeight(BigDecimal orderId, String steelJudge);
+
+    //通过订单Id查询该订单下所有的物资
+    List<Map<String,Object>> getMaterialMesNew(@Param("orderId") BigDecimal orderId, @Param("steelJudge") String steelJudge);
+
+    //根据运输订单查询车牌号
+    String selectCapacityNumber(BigDecimal orderId);
+
+    //根据运输订单查询运输状态
+    BigDecimal selectOrderType(BigDecimal orderId);
+
+    BigDecimal selectOrderId(BigDecimal dcId);
+
+    //查询采购订单数据 给司机
+    Map<String, Object> getCGOrderMessageToApp(Map<String, Object> map);
+
+    //查询内转运输订单给APP 9 10 11
+    Map<String, Object> getNZOrderMessageToApp(Map<String, Object> map);
+
+    //查询采购零星物资订单给app 12 13 14
+    Map<String,Object>  getSporadicOrder(Map<String, Object> map);
+
+    //查询发运计划运输订单给APP  2 3 4
+    Map<String, Object> getFYJHOrderMessageToApp(Map<String, Object> map);
+
+    //查询销售运输订单给APP 1
+    Map<String, Object> getXSOrderMessageToApp(Map<String, Object> map);
+
+
+    //通过运输订单号查询运输订单类型
+    Integer getOrderTypeByOrderNumber(@Param("orderId") BigDecimal orderId);
+
+    //通过车牌号查询该车牌下所有已下发 未接收 的 订单Id （4）
+    List<Map<String, Object>> getOrderIdListByCapacityNumber(String capacityNumber);
+
+    //通过车牌号查询该车牌下所有已接收的订单ID （5）
+    List<Integer> getReceiveOrderIdListByCapacityNum(String capacityNumber);
+
+    //通过车牌号查询运输订单号和运输订单ID
+    List<Map<String, Object>> getAllRefuseOrderNumberByCapacity(String capacityNumber);
+
+    //通过运输订单Id或运输订单号查询订单类型
+    Integer getOrderTypeByOrderId(BigDecimal orderId);
+
+    // 销售中的运输订单
+    Map<String, Object> getSaleMap(BigDecimal orderId);
+
+    // 内转钢材的运输订单
+    Map<String, Object> getSteelInwardMap(BigDecimal orderId);
+
+    // 采购的运输订单
+    Map<String, Object> getPurchaseMap(BigDecimal orderId);
+
+    // 内转的运输订单
+    Map<String, Object> getInwardMap(BigDecimal orderId);
+
+    // 判断是走采购，销售还是内转
+    List<Map<String, Object>> getResultListByCapacity(String capacityNumber);
+
+    // 通过卸货点名称查询卸货点id
+    BigDecimal getUnloadPointId(String unloadPoint);
+
+    // 通过ssoId查询承运商id
+    BigDecimal getCarrierIdBySSO(String carrierSsoId);
+
+    List<Map<String, Object>> getOrderMaterialList(BigDecimal orderId);
+
+    //通过订单查询趟次
+    Map<String,Object> getSporadicOrderTimes(BigDecimal orderId);
+
+
+
+    //根据运输订单id查找所有实绩id
+    List<Map<String,Object>> getAllResultId(BigDecimal orderId);
+
+    //查询订单是否确认
+    Integer getDriverConfirmation(BigDecimal orderId);
+
+    //查看当前订单最大路段顺序号 与当前订单路段顺序号
+    Map<String, Object> getMaxLineSeqByOrderId(BigDecimal orderId);
+
+    //查看配置表的相关信息
+    String getDilVersion();
+
+    //查询运输订单的送货单打印信息
+    BigDecimal getPrintNumber(BigDecimal orderId);
+
+    //通过订单id查询零星订单id，运力id
+    Map<String, Object> getSporadicOrdermapAddOrder(BigDecimal orderId);
+
+    //判断是否是钢材
+    BigDecimal getIsSteel(BigDecimal lineId);
+
+    //通过定向派单ID查询车序号表中的priceId
+    BigDecimal getPriceIdByDispatchId(BigDecimal dispatchId);
+//
+//    //通过订单查询趟次
+//    Integer getSporadicOrderTimes(BigDecimal orderId);
+   //删除计重实绩
+   int deleteWeightResult(BigDecimal resultTotalId);
+
+   //删除装货实绩
+   int deleteLoadResult(BigDecimal resultTotalId);
+
+   //删除出厂实绩
+   int deleteLeaveResult(BigDecimal resultTotalId);
+
+   //删除卸货实绩
+   int deleteUnloadResult(BigDecimal resultTotalId);
+
+   //删除进厂实绩
+   int deleteEnResult(BigDecimal resultTotalId);
+
+   //判断计时实绩是否已经存在
+    int getTimeTaskByTotalId(BigDecimal resultTotalId);
+
+   List<Map<String, Object>> getPurInwardOrderList(Map<String, Object> mapValue);
+
+   Map<String, Object> selectOrderMap(BigDecimal orderId);
+
+    int refuseCtrlZ(Map<String, Object> map);
+
+    Map<String, Object> getInwardOrderMessageToApp(Map<String, Object> map);
+
+    //计时订单
+    Map<String, Object> getInwardTimeOrderMessageToApp(Map<String, Object> map) throws Exception ;
+    //根据运输订单号查找需要用车时长
+    Map<String,Object>  selectInwardTimeByOrderId(BigDecimal orderId);
+
+    List<Map<String, Object>> getTimeTaskEndDetail(Map<String, Object> map);
+
+    List<Map<String, Object>> getPauseTimeTaskDetail(Integer orderId);
+
+    Map<String, Object> getInwardOrderMessage(Map<String, Object> map);
+
+     //删除计时实绩
+    int deleteTimeTaskByTotalId(BigDecimal resultTotalId);
+
+    int closeTruckOrder(BigDecimal orderId);
+
+    Map<String, Object> getSteelOrderMessageToApp(Map<String, Object> map);
+
+    List<Map<String, Object>> getLoadForLoadCarResult(Map<String, Object> map);
+    // 查询路段顺序号
+    BigDecimal getLineSeq(BigDecimal orderId);
+
+    String getCapacityNumberByCapacityId(BigDecimal capacityNumber);
+
+    //销售：接收运输订单展示pc端界面
+    List<Map<String, Object>> getDriverInfoForSale2(Map<String, Object> map);
+
+    List<Map<String, Object>> getTransportOrder(Map<String, Object> mapValue);
+
+    //判断是否为达钢厂区内转
+    Map<String,Object> isInwardLine(BigDecimal orderId);
+
+    // 通过运单id或者运单号查询车辆是否放行
+    String canCapacityEnfactory(Map<String, Object> mapValue);
+
+    // 出库信息
+    List<Map<String, Object>> getWarehouseMes(Map<String, Object> mapValue);
+
+    // 通过运单下的物资信息
+    int closeInwardOrderByPlan(BigDecimal bigDecimal);
+
+    Map<String, Object> getInwardSteelOrderMessageToApp(Map<String, Object> map);
+
+    //查询内转多拼
+    Map<String, Object> getMulInwardOrderMessageToApp(Map<String, Object> map);
+
+    List<Map<String, Object>> getMulInwardMaterials(Map<String, Object> map);
+
+    //查询出订单的钢材长度
+    List<Map<String,Object>> getMaterialId(BigDecimal orderId);
+
+
+    int getGoBeyondCount(Object orderId);
+
+    int getMaterialNumByOrderId(Map<String, Object> map);
+
+    int deleteQueueList(BigDecimal capacityId);
+
+    int deleteQueueResult(BigDecimal resultTotalId);
+
+    int deleteQueueSpellList(BigDecimal capacityId);
+
+    Date getOrderPrintDate(BigDecimal orderId);
+
+    String getPrintFlag();
+
+    List<Map<String, Object>> materialMesNewContinue(BigDecimal orderId, String steelJudge);
+
+    List<BigDecimal> selectContinueOrderId(BigDecimal orderId);
+
+    int updateTotalResultNull(BigDecimal resultTotalId);
+
+    int clsoePlanByPlan(BigDecimal bigDecimal);
+
+}

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

@@ -293,6 +293,10 @@ public interface UniversalMapper {
 
     int updateRemark(Map<String, Object> map);
 
+
     List<Map<String, Object>> getColumnAllScheme(Map<String, Object> map);
 
+
+    int updateRemarkPic(Map<String, Object> map);
+
 }

src/main/java/com/steerinfo/dil/model/OmstruckOrder.java

@@ -0,0 +1,454 @@
+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 OmstruckOrder implements IBasePO<BigDecimal> {
+    /**
+     * 运输订单id(ORDER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输订单id",required=true)
+    private BigDecimal orderId;
+
+    /**
+     * 车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID(ORDER_PLAN_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="车序号表ID/发运计划ID/采购订单ID/内转物流计划ID/零星订单ID",required=false)
+    private BigDecimal orderPlanId;
+
+    /**
+     * 运输订单号（WYSDD-年月日-8位数的顺序号）(ORDER_NUMBER,VARCHAR,50)
+     */
+    @ApiModelProperty(value="运输订单号（WYSDD-年月日-8位数的顺序号）",required=false)
+    private String orderNumber;
+
+    /**
+     * 运力ID(CAPACITY_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运力ID",required=false)
+    private BigDecimal capacityId;
+
+    /**
+     * 订单下发时间(ORDER_ISSUE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="订单下发时间",required=false)
+    private Date orderIssueTime;
+
+    /**
+     * 司机操作订单行为：0：拒绝；1：接收(ORDER_RECEIVE_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="司机操作订单行为：0：拒绝；1：接收",required=false)
+    private BigDecimal orderReceiveStatus;
+
+    /**
+     * 司机接收/拒绝订单时间(ORDER_RECEIVE_REFUSE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="司机接收/拒绝订单时间",required=false)
+    private Date orderReceiveRefuseTime;
+
+    /**
+     * 通信时长=司机接单/拒绝时间-订单下发时间(ORDER_COMMUNICATION_DURATION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="通信时长=司机接单/拒绝时间-订单下发时间",required=false)
+    private BigDecimal orderCommunicationDuration;
+
+    /**
+     * 运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭 10：不可作业(ORDER_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：已拒绝，7：逻辑删除 8: 关闭  9：退货关闭 10：不可作业",required=false)
+    private BigDecimal orderStatus;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,200)
+     */
+    @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;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除(DELETED,DECIMAL,0)
+     */
+    @ApiModelProperty(value="逻辑删除",required=false)
+    private BigDecimal deleted;
+
+    /**
+     * 订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）(ORDER_TYPE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="订单类型（1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：内转钢坯车 ; 10：采购内转(老区-厂内)； 11：厂内内转；12：零星物资进厂、13：零星物资出厂:14：钢材退货 ;15 内转精煤进厂；16 内转精煤出厂；17 采购化工材料新区订单； 18 采购化工材料老区订单）",required=false)
+    private BigDecimal orderType;
+
+    /**
+     * 路段顺序号：（1：进厂 ； 2：计毛；3：卸货；4：计皮；5：出厂；6：装货）(ORDER_LINE_SEQUENCE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="路段顺序号：（1：进厂 ； 2：计毛；3：卸货；4：计皮；5：出厂；6：装货）",required=false)
+    private BigDecimal orderLineSequence;
+
+    /**
+     * 运输路线ID(LINE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输路线ID",required=false)
+    private BigDecimal lineId;
+
+    /**
+     * 预计进厂时间(ORDER_ENTRY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="预计进厂时间",required=false)
+    private Date orderEntryTime;
+
+    /**
+     * 卸货点ID(UNLOAD_POINT_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="卸货点ID",required=false)
+    private BigDecimal unloadPointId;
+
+    /**
+     * 司机确认订单（1：已确认）(DRIVER_CONFIRMATION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="司机确认订单（1：已确认）",required=false)
+    private BigDecimal driverConfirmation;
+
+    /**
+     * 运输单价ID(PRICE_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="运输单价ID",required=false)
+    private BigDecimal priceId;
+
+    /**
+     * 订单所属承运商ID(CARRIER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="订单所属承运商ID",required=false)
+    private BigDecimal carrierId;
+
+    /**
+     * 行程ID(TRIP_ID,VARCHAR,200)
+     */
+    @ApiModelProperty(value="行程ID",required=false)
+    private String tripId;
+
+    /**
+     * 打印状态(ORDER_PRINT_STATUS,DECIMAL,0)
+     */
+    @ApiModelProperty(value="打印状态",required=false)
+    private BigDecimal orderPrintStatus;
+
+    /**
+     * 司机电话号码(DRIVER_TEL,VARCHAR,36)
+     */
+    @ApiModelProperty(value="司机电话号码",required=false)
+    private String driverTel;
+
+    /**
+     * 操作人员组织(OPTIONER_CODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="操作人员组织",required=false)
+    private String optionerCode;
+
+    /**
+     * 是否可作业(CAN_WORK,DECIMAL,0)
+     */
+    @ApiModelProperty(value="是否可作业",required=false)
+    private BigDecimal canWork;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.orderId;
+    }
+
+    @Override
+    public void setId(BigDecimal orderId) {
+        this.orderId = orderId;
+    }
+
+    public BigDecimal getOrderId() {
+        return orderId;
+    }
+
+    public void setOrderId(BigDecimal orderId) {
+        this.orderId = orderId;
+    }
+
+    public BigDecimal getOrderPlanId() {
+        return orderPlanId;
+    }
+
+    public void setOrderPlanId(BigDecimal orderPlanId) {
+        this.orderPlanId = orderPlanId;
+    }
+
+    public String getOrderNumber() {
+        return orderNumber;
+    }
+
+    public void setOrderNumber(String orderNumber) {
+        this.orderNumber = orderNumber == null ? null : orderNumber.trim();
+    }
+
+    public BigDecimal getCapacityId() {
+        return capacityId;
+    }
+
+    public void setCapacityId(BigDecimal capacityId) {
+        this.capacityId = capacityId;
+    }
+
+    public Date getOrderIssueTime() {
+        return orderIssueTime;
+    }
+
+    public void setOrderIssueTime(Date orderIssueTime) {
+        this.orderIssueTime = orderIssueTime;
+    }
+
+    public BigDecimal getOrderReceiveStatus() {
+        return orderReceiveStatus;
+    }
+
+    public void setOrderReceiveStatus(BigDecimal orderReceiveStatus) {
+        this.orderReceiveStatus = orderReceiveStatus;
+    }
+
+    public Date getOrderReceiveRefuseTime() {
+        return orderReceiveRefuseTime;
+    }
+
+    public void setOrderReceiveRefuseTime(Date orderReceiveRefuseTime) {
+        this.orderReceiveRefuseTime = orderReceiveRefuseTime;
+    }
+
+    public BigDecimal getOrderCommunicationDuration() {
+        return orderCommunicationDuration;
+    }
+
+    public void setOrderCommunicationDuration(BigDecimal orderCommunicationDuration) {
+        this.orderCommunicationDuration = orderCommunicationDuration;
+    }
+
+    public BigDecimal getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(BigDecimal orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    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 String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public BigDecimal getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(BigDecimal orderType) {
+        this.orderType = orderType;
+    }
+
+    public BigDecimal getOrderLineSequence() {
+        return orderLineSequence;
+    }
+
+    public void setOrderLineSequence(BigDecimal orderLineSequence) {
+        this.orderLineSequence = orderLineSequence;
+    }
+
+    public BigDecimal getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(BigDecimal lineId) {
+        this.lineId = lineId;
+    }
+
+    public Date getOrderEntryTime() {
+        return orderEntryTime;
+    }
+
+    public void setOrderEntryTime(Date orderEntryTime) {
+        this.orderEntryTime = orderEntryTime;
+    }
+
+    public BigDecimal getUnloadPointId() {
+        return unloadPointId;
+    }
+
+    public void setUnloadPointId(BigDecimal unloadPointId) {
+        this.unloadPointId = unloadPointId;
+    }
+
+    public BigDecimal getDriverConfirmation() {
+        return driverConfirmation;
+    }
+
+    public void setDriverConfirmation(BigDecimal driverConfirmation) {
+        this.driverConfirmation = driverConfirmation;
+    }
+
+    public BigDecimal getPriceId() {
+        return priceId;
+    }
+
+    public void setPriceId(BigDecimal priceId) {
+        this.priceId = priceId;
+    }
+
+    public BigDecimal getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(BigDecimal carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    public String getTripId() {
+        return tripId;
+    }
+
+    public void setTripId(String tripId) {
+        this.tripId = tripId == null ? null : tripId.trim();
+    }
+
+    public BigDecimal getOrderPrintStatus() {
+        return orderPrintStatus;
+    }
+
+    public void setOrderPrintStatus(BigDecimal orderPrintStatus) {
+        this.orderPrintStatus = orderPrintStatus;
+    }
+
+    public String getDriverTel() {
+        return driverTel;
+    }
+
+    public void setDriverTel(String driverTel) {
+        this.driverTel = driverTel == null ? null : driverTel.trim();
+    }
+
+    public String getOptionerCode() {
+        return optionerCode;
+    }
+
+    public void setOptionerCode(String optionerCode) {
+        this.optionerCode = optionerCode == null ? null : optionerCode.trim();
+    }
+
+    public BigDecimal getCanWork() {
+        return canWork;
+    }
+
+    public void setCanWork(BigDecimal canWork) {
+        this.canWork = canWork;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", orderId=").append(orderId);
+        sb.append(", orderPlanId=").append(orderPlanId);
+        sb.append(", orderNumber=").append(orderNumber);
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", orderIssueTime=").append(orderIssueTime);
+        sb.append(", orderReceiveStatus=").append(orderReceiveStatus);
+        sb.append(", orderReceiveRefuseTime=").append(orderReceiveRefuseTime);
+        sb.append(", orderCommunicationDuration=").append(orderCommunicationDuration);
+        sb.append(", orderStatus=").append(orderStatus);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", orderType=").append(orderType);
+        sb.append(", orderLineSequence=").append(orderLineSequence);
+        sb.append(", lineId=").append(lineId);
+        sb.append(", orderEntryTime=").append(orderEntryTime);
+        sb.append(", unloadPointId=").append(unloadPointId);
+        sb.append(", driverConfirmation=").append(driverConfirmation);
+        sb.append(", priceId=").append(priceId);
+        sb.append(", carrierId=").append(carrierId);
+        sb.append(", tripId=").append(tripId);
+        sb.append(", orderPrintStatus=").append(orderPrintStatus);
+        sb.append(", driverTel=").append(driverTel);
+        sb.append(", optionerCode=").append(optionerCode);
+        sb.append(", canWork=").append(canWork);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -349,6 +349,10 @@ public class UniversalServiceImpl implements UniversalService {
             universalMapper.updateRemark(map);
             responseMapList.add("修改备注成功");
         }
+        if(map.get("orderId") != null && map.get("urls") != null && !map.get("urls").equals(oldMes.get("urls"))) {
+            universalMapper.updateRemarkPic(map);
+            responseMapList.add("修改备注图片成功");
+        }
         //修改司机电话号码
         if(map.get("capacityTel") != null && !map.get("capacityTel").equals(oldMes.get("capacityTel"))) {
             Map<String, Object> updateDriverTelMap = new HashMap<>();

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

@@ -166,6 +166,16 @@
         GROUP BY T.SEGMENT_SQE
         HAVING count( T.SEGMENT_SQE ) > 1
     </select>
+    <select id="getDetailsForEnAndQue" resultType="java.util.Map">
+        SELECT OO .ORDER_ID "orderId",
+               TTR .RESULT_TOTAL_ID "resultTotalId",
+               OO .CAPACITY_ID "capacityId"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO .ORDER_ID = TTR .ORDER_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR ON TWR .RESULT_TOTAL_ID = TTR .RESULT_TOTAL_ID  AND TWR .RESULT_NET_WEIGHT IS NOT NULL
+        WHERE  TWR .WEIGHT_TASK_RESULT_ID IS NULL AND OO .ORDER_TYPE = 1 AND OO .ORDER_STATUS = 5 AND OO .ORDER_NUMBER= #{orderNumber}
+        FETCH NEXT 1 ROWS ONLY
+    </select>
 
     <delete id="deleteEnFactoryUnnecessaryResult">
         delete from TMSTRUCK_ENFACTORY_RESULT where RESULT_ID in
@@ -283,4 +293,9 @@
         SET PRINTNUMBER=0
         WHERE ORDER_ID = #{orderId}
     </update>
+    <update id="clearEnDetails">
+        UPDATE TMSTRUCK_ENFACTORY_RESULT
+        SET RESULT_ENTRY_MODE = NULL ,RESULT_ENTRY_GATE_TIME = NULL,INSERT_TIME = NULL
+        WHERE RESULT_TOTAL_ID = #{resultTotalId}
+    </update>
 </mapper>

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

@@ -0,0 +1,4519 @@
+<?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.OmstruckOrderMapper">
+    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.OmstruckOrder">
+        <id column="ORDER_ID" jdbcType="DECIMAL" property="orderId" />
+        <result column="ORDER_PLAN_ID" jdbcType="DECIMAL" property="orderPlanId" />
+        <result column="ORDER_NUMBER" jdbcType="VARCHAR" property="orderNumber" />
+        <result column="CAPACITY_ID" jdbcType="DECIMAL" property="capacityId" />
+        <result column="ORDER_ISSUE_TIME" jdbcType="TIMESTAMP" property="orderIssueTime" />
+        <result column="ORDER_RECEIVE_STATUS" jdbcType="DECIMAL" property="orderReceiveStatus" />
+        <result column="ORDER_RECEIVE_REFUSE_TIME" jdbcType="TIMESTAMP" property="orderReceiveRefuseTime" />
+        <result column="ORDER_COMMUNICATION_DURATION" jdbcType="DECIMAL" property="orderCommunicationDuration" />
+        <result column="ORDER_STATUS" jdbcType="DECIMAL" property="orderStatus" />
+        <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="INSERT_UPDATE_REMARK" jdbcType="VARCHAR" property="insertUpdateRemark" />
+        <result column="DELETED" jdbcType="DECIMAL" property="deleted" />
+        <result column="ORDER_TYPE" jdbcType="DECIMAL" property="orderType" />
+        <result column="ORDER_LINE_SEQUENCE" jdbcType="DECIMAL" property="orderLineSequence" />
+        <result column="LINE_ID" jdbcType="DECIMAL" property="lineId" />
+        <result column="ORDER_ENTRY_TIME" jdbcType="TIMESTAMP" property="orderEntryTime" />
+        <result column="UNLOAD_POINT_ID" jdbcType="DECIMAL" property="unloadPointId" />
+        <result column="DRIVER_CONFIRMATION" jdbcType="DECIMAL" property="driverConfirmation" />
+        <result column="PRICE_ID" jdbcType="DECIMAL" property="priceId" />
+        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
+        <result column="TRIP_ID" jdbcType="VARCHAR" property="tripId" />
+        <result column="ORDER_PRINT_STATUS" jdbcType="DECIMAL" property="orderPrintStatus" />
+        <result column="DRIVER_TEL" jdbcType="VARCHAR" property="driverTel" />
+        <result column="OPTIONER_CODE" jdbcType="VARCHAR" property="optionerCode" />
+        <result column="CAN_WORK" jdbcType="DECIMAL" property="canWork" />
+    </resultMap>
+    <sql id="columns">
+        ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
+    ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION, ORDER_STATUS, INSERT_USERNAME,
+    INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, DELETED, ORDER_TYPE,
+    ORDER_LINE_SEQUENCE, LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID, DRIVER_CONFIRMATION,
+    PRICE_ID, CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL, OPTIONER_CODE, CAN_WORK
+    </sql>
+    <sql id="columns_alias">
+        t.ORDER_ID, t.ORDER_PLAN_ID, t.ORDER_NUMBER, t.CAPACITY_ID, t.ORDER_ISSUE_TIME, t.ORDER_RECEIVE_STATUS,
+    t.ORDER_RECEIVE_REFUSE_TIME, t.ORDER_COMMUNICATION_DURATION, t.ORDER_STATUS, t.INSERT_USERNAME,
+    t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.DELETED,
+    t.ORDER_TYPE, t.ORDER_LINE_SEQUENCE, t.LINE_ID, t.ORDER_ENTRY_TIME, t.UNLOAD_POINT_ID,
+    t.DRIVER_CONFIRMATION, t.PRICE_ID, t.CARRIER_ID, t.TRIP_ID, t.ORDER_PRINT_STATUS,
+    t.DRIVER_TEL, t.OPTIONER_CODE, t.CAN_WORK
+    </sql>
+    <sql id="select">
+        SELECT <include refid="columns" /> FROM OMSTRUCK_ORDER
+    </sql>
+    <sql id="select_alias">
+        SELECT <include refid="columns_alias" /> FROM OMSTRUCK_ORDER t
+    </sql>
+    <sql id="where">
+        <where>
+            <if test="orderId != null">
+                and ORDER_ID = #{orderId}
+            </if>
+            <if test="orderPlanId != null">
+                and ORDER_PLAN_ID = #{orderPlanId}
+            </if>
+            <if test="orderNumber != null and orderNumber != ''">
+                and ORDER_NUMBER = #{orderNumber}
+            </if>
+            <if test="capacityId != null">
+                and CAPACITY_ID = #{capacityId}
+            </if>
+            <if test="orderIssueTime != null">
+                and TO_CHAR(ORDER_ISSUE_TIME,'yyyy-MM-dd') = #{orderIssueTime}
+            </if>
+            <if test="orderReceiveStatus != null">
+                and ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                and TO_CHAR(ORDER_RECEIVE_REFUSE_TIME,'yyyy-MM-dd') = #{orderReceiveRefuseTime}
+            </if>
+            <if test="orderCommunicationDuration != null">
+                and ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration}
+            </if>
+            <if test="orderStatus != null">
+                and ORDER_STATUS = #{orderStatus}
+            </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="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+            <if test="orderType != null">
+                and ORDER_TYPE = #{orderType}
+            </if>
+            <if test="orderLineSequence != null">
+                and ORDER_LINE_SEQUENCE = #{orderLineSequence}
+            </if>
+            <if test="lineId != null">
+                and LINE_ID = #{lineId}
+            </if>
+            <if test="orderEntryTime != null">
+                and TO_CHAR(ORDER_ENTRY_TIME,'yyyy-MM-dd') = #{orderEntryTime}
+            </if>
+            <if test="unloadPointId != null">
+                and UNLOAD_POINT_ID = #{unloadPointId}
+            </if>
+            <if test="driverConfirmation != null">
+                and DRIVER_CONFIRMATION = #{driverConfirmation}
+            </if>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="carrierId != null">
+                and CARRIER_ID = #{carrierId}
+            </if>
+            <if test="tripId != null and tripId != ''">
+                and TRIP_ID = #{tripId}
+            </if>
+            <if test="orderPrintStatus != null">
+                and ORDER_PRINT_STATUS = #{orderPrintStatus}
+            </if>
+            <if test="driverTel != null and driverTel != ''">
+                and DRIVER_TEL = #{driverTel}
+            </if>
+            <if test="optionerCode != null and optionerCode != ''">
+                and OPTIONER_CODE = #{optionerCode}
+            </if>
+            <if test="canWork != null">
+                and CAN_WORK = #{canWork}
+            </if>
+        </where>
+    </sql>
+    <sql id="whereLike">
+        <where>
+            <if test="orderId != null">
+                and ORDER_ID = #{orderId}
+            </if>
+            <if test="orderPlanId != null">
+                and ORDER_PLAN_ID = #{orderPlanId}
+            </if>
+            <if test="orderNumber != null and orderNumber != ''">
+                and ORDER_NUMBER LIKE '%${orderNumber}%'
+            </if>
+            <if test="capacityId != null">
+                and CAPACITY_ID = #{capacityId}
+            </if>
+            <if test="orderIssueTime != null">
+                and TO_CHAR(ORDER_ISSUE_TIME,'yyyy-MM-dd') = #{orderIssueTime}
+            </if>
+            <if test="orderReceiveStatus != null">
+                and ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                and TO_CHAR(ORDER_RECEIVE_REFUSE_TIME,'yyyy-MM-dd') = #{orderReceiveRefuseTime}
+            </if>
+            <if test="orderCommunicationDuration != null">
+                and ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration}
+            </if>
+            <if test="orderStatus != null">
+                and ORDER_STATUS = #{orderStatus}
+            </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="insertUpdateRemark != null and insertUpdateRemark != ''">
+                and INSERT_UPDATE_REMARK LIKE '%${insertUpdateRemark}%'
+            </if>
+            <if test="deleted != null">
+                and DELETED = #{deleted}
+            </if>
+            <if test="orderType != null">
+                and ORDER_TYPE = #{orderType}
+            </if>
+            <if test="orderLineSequence != null">
+                and ORDER_LINE_SEQUENCE = #{orderLineSequence}
+            </if>
+            <if test="lineId != null">
+                and LINE_ID = #{lineId}
+            </if>
+            <if test="orderEntryTime != null">
+                and TO_CHAR(ORDER_ENTRY_TIME,'yyyy-MM-dd') = #{orderEntryTime}
+            </if>
+            <if test="unloadPointId != null">
+                and UNLOAD_POINT_ID = #{unloadPointId}
+            </if>
+            <if test="driverConfirmation != null">
+                and DRIVER_CONFIRMATION = #{driverConfirmation}
+            </if>
+            <if test="priceId != null">
+                and PRICE_ID = #{priceId}
+            </if>
+            <if test="carrierId != null">
+                and CARRIER_ID = #{carrierId}
+            </if>
+            <if test="tripId != null and tripId != ''">
+                and TRIP_ID LIKE '%${tripId}%'
+            </if>
+            <if test="orderPrintStatus != null">
+                and ORDER_PRINT_STATUS = #{orderPrintStatus}
+            </if>
+            <if test="driverTel != null and driverTel != ''">
+                and DRIVER_TEL LIKE '%${driverTel}%'
+            </if>
+            <if test="optionerCode != null and optionerCode != ''">
+                and OPTIONER_CODE LIKE '%${optionerCode}%'
+            </if>
+            <if test="canWork != null">
+                and CAN_WORK = #{canWork}
+            </if>
+        </where>
+    </sql>
+    <delete id="deleteByPrimaryKey" parameterType="DECIMAL">
+        delete from OMSTRUCK_ORDER
+        where ORDER_ID = #{orderId,jdbcType=DECIMAL}
+    </delete>
+    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+        delete from OMSTRUCK_ORDER
+        where 1!=1
+        <if test="orderPlanId != null">
+            or ORDER_PLAN_ID = #{orderPlanId}
+        </if>
+        <if test="orderNumber != null and orderNumber != ''">
+            or ORDER_NUMBER = #{orderNumber}
+        </if>
+        <if test="capacityId != null">
+            or CAPACITY_ID = #{capacityId}
+        </if>
+        <if test="orderIssueTime != null">
+            or TO_CHAR(ORDER_ISSUE_TIME,'yyyy-MM-dd') = '#{orderIssueTime}'
+        </if>
+        <if test="orderReceiveStatus != null">
+            or ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
+        </if>
+        <if test="orderReceiveRefuseTime != null">
+            or TO_CHAR(ORDER_RECEIVE_REFUSE_TIME,'yyyy-MM-dd') = '#{orderReceiveRefuseTime}'
+        </if>
+        <if test="orderCommunicationDuration != null">
+            or ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration}
+        </if>
+        <if test="orderStatus != null">
+            or ORDER_STATUS = #{orderStatus}
+        </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="insertUpdateRemark != null and insertUpdateRemark != ''">
+            or INSERT_UPDATE_REMARK = #{insertUpdateRemark}
+        </if>
+        <if test="deleted != null">
+            or DELETED = #{deleted}
+        </if>
+        <if test="orderType != null">
+            or ORDER_TYPE = #{orderType}
+        </if>
+        <if test="orderLineSequence != null">
+            or ORDER_LINE_SEQUENCE = #{orderLineSequence}
+        </if>
+        <if test="lineId != null">
+            or LINE_ID = #{lineId}
+        </if>
+        <if test="orderEntryTime != null">
+            or TO_CHAR(ORDER_ENTRY_TIME,'yyyy-MM-dd') = '#{orderEntryTime}'
+        </if>
+        <if test="unloadPointId != null">
+            or UNLOAD_POINT_ID = #{unloadPointId}
+        </if>
+        <if test="driverConfirmation != null">
+            or DRIVER_CONFIRMATION = #{driverConfirmation}
+        </if>
+        <if test="priceId != null">
+            or PRICE_ID = #{priceId}
+        </if>
+        <if test="carrierId != null">
+            or CARRIER_ID = #{carrierId}
+        </if>
+        <if test="tripId != null and tripId != ''">
+            or TRIP_ID = #{tripId}
+        </if>
+        <if test="orderPrintStatus != null">
+            or ORDER_PRINT_STATUS = #{orderPrintStatus}
+        </if>
+        <if test="driverTel != null and driverTel != ''">
+            or DRIVER_TEL = #{driverTel}
+        </if>
+        <if test="optionerCode != null and optionerCode != ''">
+            or OPTIONER_CODE = #{optionerCode}
+        </if>
+        <if test="canWork != null">
+            or CAN_WORK = #{canWork}
+        </if>
+    </delete>
+    <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrder">
+        insert into OMSTRUCK_ORDER (ORDER_ID, ORDER_PLAN_ID, ORDER_NUMBER,
+                                    CAPACITY_ID, ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
+                                    ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION,
+                                    ORDER_STATUS, INSERT_USERNAME, INSERT_TIME,
+                                    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK,
+                                    DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
+                                    LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
+                                    DRIVER_CONFIRMATION, PRICE_ID, CARRIER_ID,
+                                    TRIP_ID, ORDER_PRINT_STATUS, DRIVER_TEL,
+                                    OPTIONER_CODE, CAN_WORK)
+        values (#{orderId,jdbcType=DECIMAL}, #{orderPlanId,jdbcType=DECIMAL}, #{orderNumber,jdbcType=VARCHAR},
+                #{capacityId,jdbcType=DECIMAL}, #{orderIssueTime,jdbcType=TIMESTAMP}, #{orderReceiveStatus,jdbcType=DECIMAL},
+                #{orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{orderCommunicationDuration,jdbcType=DECIMAL},
+                #{orderStatus,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
+                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR},
+                #{deleted,jdbcType=DECIMAL}, #{orderType,jdbcType=DECIMAL}, #{orderLineSequence,jdbcType=DECIMAL},
+                #{lineId,jdbcType=DECIMAL}, #{orderEntryTime,jdbcType=TIMESTAMP}, #{unloadPointId,jdbcType=DECIMAL},
+                #{driverConfirmation,jdbcType=DECIMAL}, #{priceId,jdbcType=DECIMAL}, #{carrierId,jdbcType=DECIMAL},
+                #{tripId,jdbcType=VARCHAR}, #{orderPrintStatus,jdbcType=DECIMAL}, #{driverTel,jdbcType=VARCHAR},
+                #{optionerCode,jdbcType=VARCHAR}, #{canWork,jdbcType=DECIMAL})
+    </insert>
+    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
+        insert into OMSTRUCK_ORDER
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">
+                ORDER_ID,
+            </if>
+            <if test="orderPlanId != null">
+                ORDER_PLAN_ID,
+            </if>
+            <if test="orderNumber != null">
+                ORDER_NUMBER,
+            </if>
+            <if test="capacityId != null">
+                CAPACITY_ID,
+            </if>
+            <if test="orderIssueTime != null">
+                ORDER_ISSUE_TIME,
+            </if>
+            <if test="orderReceiveStatus != null">
+                ORDER_RECEIVE_STATUS,
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                ORDER_RECEIVE_REFUSE_TIME,
+            </if>
+            <if test="orderCommunicationDuration != null">
+                ORDER_COMMUNICATION_DURATION,
+            </if>
+            <if test="orderStatus != null">
+                ORDER_STATUS,
+            </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="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK,
+            </if>
+            <if test="deleted != null">
+                DELETED,
+            </if>
+            <if test="orderType != null">
+                ORDER_TYPE,
+            </if>
+            <if test="orderLineSequence != null">
+                ORDER_LINE_SEQUENCE,
+            </if>
+            <if test="lineId != null">
+                LINE_ID,
+            </if>
+            <if test="orderEntryTime != null">
+                ORDER_ENTRY_TIME,
+            </if>
+            <if test="unloadPointId != null">
+                UNLOAD_POINT_ID,
+            </if>
+            <if test="driverConfirmation != null">
+                DRIVER_CONFIRMATION,
+            </if>
+            <if test="priceId != null">
+                PRICE_ID,
+            </if>
+            <if test="carrierId != null">
+                CARRIER_ID,
+            </if>
+            <if test="tripId != null">
+                TRIP_ID,
+            </if>
+            <if test="orderPrintStatus != null">
+                ORDER_PRINT_STATUS,
+            </if>
+            <if test="driverTel != null">
+                DRIVER_TEL,
+            </if>
+            <if test="optionerCode != null">
+                OPTIONER_CODE,
+            </if>
+            <if test="canWork != null">
+                CAN_WORK,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="orderId != null">
+                #{orderId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderPlanId != null">
+                #{orderPlanId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderNumber != null">
+                #{orderNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="capacityId != null">
+                #{capacityId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderIssueTime != null">
+                #{orderIssueTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="orderReceiveStatus != null">
+                #{orderReceiveStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                #{orderReceiveRefuseTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="orderCommunicationDuration != null">
+                #{orderCommunicationDuration,jdbcType=DECIMAL},
+            </if>
+            <if test="orderStatus != null">
+                #{orderStatus,jdbcType=DECIMAL},
+            </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="insertUpdateRemark != null">
+                #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                #{deleted,jdbcType=DECIMAL},
+            </if>
+            <if test="orderType != null">
+                #{orderType,jdbcType=DECIMAL},
+            </if>
+            <if test="orderLineSequence != null">
+                #{orderLineSequence,jdbcType=DECIMAL},
+            </if>
+            <if test="lineId != null">
+                #{lineId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderEntryTime != null">
+                #{orderEntryTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="unloadPointId != null">
+                #{unloadPointId,jdbcType=DECIMAL},
+            </if>
+            <if test="driverConfirmation != null">
+                #{driverConfirmation,jdbcType=DECIMAL},
+            </if>
+            <if test="priceId != null">
+                #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="carrierId != null">
+                #{carrierId,jdbcType=DECIMAL},
+            </if>
+            <if test="tripId != null">
+                #{tripId,jdbcType=VARCHAR},
+            </if>
+            <if test="orderPrintStatus != null">
+                #{orderPrintStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="driverTel != null">
+                #{driverTel,jdbcType=VARCHAR},
+            </if>
+            <if test="optionerCode != null">
+                #{optionerCode,jdbcType=VARCHAR},
+            </if>
+            <if test="canWork != null">
+                #{canWork,jdbcType=DECIMAL},
+            </if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrder">
+        update OMSTRUCK_ORDER
+        set ORDER_PLAN_ID = #{orderPlanId,jdbcType=DECIMAL},
+            ORDER_NUMBER = #{orderNumber,jdbcType=VARCHAR},
+            CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+            ORDER_ISSUE_TIME = #{orderIssueTime,jdbcType=TIMESTAMP},
+            ORDER_RECEIVE_STATUS = #{orderReceiveStatus,jdbcType=DECIMAL},
+            ORDER_RECEIVE_REFUSE_TIME = #{orderReceiveRefuseTime,jdbcType=TIMESTAMP},
+            ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration,jdbcType=DECIMAL},
+            ORDER_STATUS = #{orderStatus,jdbcType=DECIMAL},
+            INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+            INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+            UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+            UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+            INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            DELETED = #{deleted,jdbcType=DECIMAL},
+            ORDER_TYPE = #{orderType,jdbcType=DECIMAL},
+            ORDER_LINE_SEQUENCE = #{orderLineSequence,jdbcType=DECIMAL},
+            LINE_ID = #{lineId,jdbcType=DECIMAL},
+            ORDER_ENTRY_TIME = #{orderEntryTime,jdbcType=TIMESTAMP},
+            UNLOAD_POINT_ID = #{unloadPointId,jdbcType=DECIMAL},
+            DRIVER_CONFIRMATION = #{driverConfirmation,jdbcType=DECIMAL},
+            PRICE_ID = #{priceId,jdbcType=DECIMAL},
+            CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+            TRIP_ID = #{tripId,jdbcType=VARCHAR},
+            ORDER_PRINT_STATUS = #{orderPrintStatus,jdbcType=DECIMAL},
+            DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
+            OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR},
+            CAN_WORK = #{canWork,jdbcType=DECIMAL}
+        where ORDER_ID = #{orderId,jdbcType=DECIMAL}
+    </update>
+    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrder">
+        update OMSTRUCK_ORDER
+        <set>
+            <if test="orderPlanId != null">
+                ORDER_PLAN_ID = #{orderPlanId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderNumber != null">
+                ORDER_NUMBER = #{orderNumber,jdbcType=VARCHAR},
+            </if>
+            <if test="capacityId != null">
+                CAPACITY_ID = #{capacityId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderIssueTime != null">
+                ORDER_ISSUE_TIME = #{orderIssueTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="orderReceiveStatus != null">
+                ORDER_RECEIVE_STATUS = #{orderReceiveStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                ORDER_RECEIVE_REFUSE_TIME = #{orderReceiveRefuseTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="orderCommunicationDuration != null">
+                ORDER_COMMUNICATION_DURATION = #{orderCommunicationDuration,jdbcType=DECIMAL},
+            </if>
+            <if test="orderStatus != null">
+                ORDER_STATUS = #{orderStatus,jdbcType=DECIMAL},
+            </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="insertUpdateRemark != null">
+                INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+            </if>
+            <if test="deleted != null">
+                DELETED = #{deleted,jdbcType=DECIMAL},
+            </if>
+            <if test="orderType != null">
+                ORDER_TYPE = #{orderType,jdbcType=DECIMAL},
+            </if>
+            <if test="orderLineSequence != null">
+                ORDER_LINE_SEQUENCE = #{orderLineSequence,jdbcType=DECIMAL},
+            </if>
+            <if test="lineId != null">
+                LINE_ID = #{lineId,jdbcType=DECIMAL},
+            </if>
+            <if test="orderEntryTime != null">
+                ORDER_ENTRY_TIME = #{orderEntryTime,jdbcType=TIMESTAMP},
+            </if>
+            <if test="unloadPointId != null">
+                UNLOAD_POINT_ID = #{unloadPointId,jdbcType=DECIMAL},
+            </if>
+            <if test="driverConfirmation != null">
+                DRIVER_CONFIRMATION = #{driverConfirmation,jdbcType=DECIMAL},
+            </if>
+            <if test="priceId != null">
+                PRICE_ID = #{priceId,jdbcType=DECIMAL},
+            </if>
+            <if test="carrierId != null">
+                CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
+            </if>
+            <if test="tripId != null">
+                TRIP_ID = #{tripId,jdbcType=VARCHAR},
+            </if>
+            <if test="orderPrintStatus != null">
+                ORDER_PRINT_STATUS = #{orderPrintStatus,jdbcType=DECIMAL},
+            </if>
+            <if test="driverTel != null">
+                DRIVER_TEL = #{driverTel,jdbcType=VARCHAR},
+            </if>
+            <if test="optionerCode != null">
+                OPTIONER_CODE = #{optionerCode,jdbcType=VARCHAR},
+            </if>
+            <if test="canWork != null">
+                CAN_WORK = #{canWork,jdbcType=DECIMAL},
+            </if>
+        </set>
+        where ORDER_ID = #{orderId,jdbcType=DECIMAL}
+    </update>
+    <select id="selectByPrimaryKey" parameterType="DECIMAL" resultMap="BaseResultMap">
+        <include refid="select" />
+        where ORDER_ID = #{orderId,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 OMSTRUCK_ORDER
+        (ORDER_ID,
+        ORDER_PLAN_ID, ORDER_NUMBER, CAPACITY_ID,
+        ORDER_ISSUE_TIME, ORDER_RECEIVE_STATUS,
+        ORDER_RECEIVE_REFUSE_TIME, ORDER_COMMUNICATION_DURATION,
+        ORDER_STATUS, INSERT_USERNAME,
+        INSERT_TIME, UPDATE_USERNAME,
+        UPDATE_TIME, INSERT_UPDATE_REMARK,
+        DELETED, ORDER_TYPE, ORDER_LINE_SEQUENCE,
+        LINE_ID, ORDER_ENTRY_TIME, UNLOAD_POINT_ID,
+        DRIVER_CONFIRMATION, PRICE_ID,
+        CARRIER_ID, TRIP_ID, ORDER_PRINT_STATUS,
+        DRIVER_TEL, OPTIONER_CODE, CAN_WORK
+        )
+        ( <foreach collection="list" item="item" separator="union all">
+        select
+        #{item.orderId,jdbcType=DECIMAL},
+        #{item.orderPlanId,jdbcType=DECIMAL}, #{item.orderNumber,jdbcType=VARCHAR}, #{item.capacityId,jdbcType=DECIMAL},
+        #{item.orderIssueTime,jdbcType=TIMESTAMP}, #{item.orderReceiveStatus,jdbcType=DECIMAL},
+        #{item.orderReceiveRefuseTime,jdbcType=TIMESTAMP}, #{item.orderCommunicationDuration,jdbcType=DECIMAL},
+        #{item.orderStatus,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
+        #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
+        #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
+        #{item.deleted,jdbcType=DECIMAL}, #{item.orderType,jdbcType=DECIMAL}, #{item.orderLineSequence,jdbcType=DECIMAL},
+        #{item.lineId,jdbcType=DECIMAL}, #{item.orderEntryTime,jdbcType=TIMESTAMP}, #{item.unloadPointId,jdbcType=DECIMAL},
+        #{item.driverConfirmation,jdbcType=DECIMAL}, #{item.priceId,jdbcType=DECIMAL},
+        #{item.carrierId,jdbcType=DECIMAL}, #{item.tripId,jdbcType=VARCHAR}, #{item.orderPrintStatus,jdbcType=DECIMAL},
+        #{item.driverTel,jdbcType=VARCHAR}, #{item.optionerCode,jdbcType=VARCHAR}, #{item.canWork,jdbcType=DECIMAL}
+        from dual
+    </foreach> )
+    </insert>
+    <update id="batchUpdate" parameterType="java.util.List">
+        update OMSTRUCK_ORDER
+        set
+        ORDER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_PLAN_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderPlanId,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_NUMBER=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderNumber,jdbcType=VARCHAR}
+        </foreach>
+        ,CAPACITY_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.capacityId,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_ISSUE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderIssueTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,ORDER_RECEIVE_STATUS=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderReceiveStatus,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_RECEIVE_REFUSE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderReceiveRefuseTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,ORDER_COMMUNICATION_DURATION=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderCommunicationDuration,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_STATUS=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderStatus,jdbcType=DECIMAL}
+        </foreach>
+        ,INSERT_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,INSERT_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UPDATE_USERNAME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+        </foreach>
+        ,UPDATE_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,INSERT_UPDATE_REMARK=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+        </foreach>
+        ,DELETED=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.deleted,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_TYPE=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderType,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_LINE_SEQUENCE=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderLineSequence,jdbcType=DECIMAL}
+        </foreach>
+        ,LINE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.lineId,jdbcType=DECIMAL}
+        </foreach>
+        ,ORDER_ENTRY_TIME=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderEntryTime,jdbcType=TIMESTAMP}
+        </foreach>
+        ,UNLOAD_POINT_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.unloadPointId,jdbcType=DECIMAL}
+        </foreach>
+        ,DRIVER_CONFIRMATION=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.driverConfirmation,jdbcType=DECIMAL}
+        </foreach>
+        ,PRICE_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.priceId,jdbcType=DECIMAL}
+        </foreach>
+        ,CARRIER_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
+        </foreach>
+        ,TRIP_ID=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.tripId,jdbcType=VARCHAR}
+        </foreach>
+        ,ORDER_PRINT_STATUS=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.orderPrintStatus,jdbcType=DECIMAL}
+        </foreach>
+        ,DRIVER_TEL=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.driverTel,jdbcType=VARCHAR}
+        </foreach>
+        ,OPTIONER_CODE=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.optionerCode,jdbcType=VARCHAR}
+        </foreach>
+        ,CAN_WORK=
+        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
+            when #{item.orderId,jdbcType=DECIMAL} then #{item.canWork,jdbcType=DECIMAL}
+        </foreach>
+        where ORDER_ID in
+        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
+            #{item.orderId,jdbcType=DECIMAL}
+        </foreach>
+    </update>
+    <delete id="batchDelete" parameterType="java.util.List">
+        delete from OMSTRUCK_ORDER
+        where ORDER_ID in
+        <foreach close=")" collection="list" item="id" open="(" separator=",">
+            #{id}
+        </foreach>
+    </delete>
+    <!-- 友情提示！！！-->
+    <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+    <!--  根据插入时间排序  -->
+    <sql id="orderBy">
+        <if test="orderField != null and orderField != ''">
+            order by "${orderField}"
+            <if test="orderType != null and orderType != ''">
+                ${orderType}
+            </if>
+        </if>
+    </sql>
+
+    <!--  查询运输订单 -->
+    <select id="getAllTruckOrder" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+        select
+        *
+        from
+        (
+        select
+        OO.ORDER_ID "orderId",
+        APO.PURCHASE_ORDER_ID "purchaseOrderId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        APO.IS_MORE_TRIPS   "isMoreTrips",
+        RM.MATERIAL_NAME "materialName",
+        <if test="orderTypee == 8">
+            AP.PLAN_NO "planNo",
+            AP.PLAN_ID "planId",
+            to_char(AP.PLAN_TRUCK_TIME, 'yyyy-mm-dd')"planTruckTime",
+            to_char(AP.PLAN_INCOMING_TIME, 'yyyy-mm-dd') "planIncomingTime",
+        </if>
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_ID "capacityId",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        OO.INSERT_USERNAME "insertUsername",
+        OO.INSERT_TIME "insertTime",
+        OO.ORDER_NUMBER "orderNumber",
+        RW.WAREHOUSE_NAME "warehouseName", --卸货点
+        RW2.WAREHOUSE_NAME "loadName",
+        to_char(OO.ORDER_ENTRY_TIME, 'yyyy-mm-dd') "orderEntryTime", --进厂时间
+        RS.SUPPLIER_NAME "supplierName", --发货单位
+        RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName", --收货单位
+        OO.ORDER_ISSUE_TIME "orderIssueTime"
+
+        from OMSTRUCK_ORDER OO
+        left join AMS_PURCHASE_ORDER APO
+        on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
+        <if test="orderTypee == 8">
+            left join AMSTRUCK_PURPLAN AP
+            on AP.BATCH_ID = APO.BATCH_ID and AP.PLAN_STATUS != 3
+        </if>
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="carrierSSOId != null">
+            left join RMS_CARRIER RCA
+            on RCA.CARRIER_ID = OO.CARRIER_ID
+        </if>
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        left join RMS_WAREHOUSE RW
+        on OO.UNLOAD_POINT_ID = RW.WAREHOUSE_ID
+        left join RMS_WAREHOUSE RW2
+        ON OO.DRIVER_CONFIRMATION = RW2.WAREHOUSE_ID
+        left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        left join RMS_CONSIGNEE RCSE
+        on APO.RECEIVE_UNIT_ID = RCSE.CONSIGNEE_ID
+        <where>
+            <choose>
+                <when test="orderStatus != 111">
+                    and OO.ORDER_STATUS = #{orderStatus}
+                </when>
+                <when test="orderStatus == 111">
+                    and OO.ORDER_STATUS in (0, 1, 2, 4, 5, 6)
+                </when>
+            </choose>
+            <if test="planId != null ">
+                and AP.PLAN_ID = #{planId}
+            </if>
+            <if test="orderTypee != null">
+                and OO.ORDER_TYPE = #{orderTypee}
+            </if>
+            <if test="fuelOrder == 1">
+                and OO.ORDER_TYPE in (6, 7)
+            </if>
+            <if test="fuelOrder == 2">
+                and OO.ORDER_TYPE in (17, 18)
+            </if>
+            <if test="carrierSSOId != null">
+                and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+            </if>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =   OO.INSERT_TIME
+            </if>
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.INSERT_TIME
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=  OO.INSERT_TIME
+            </if>
+            <if test="con!=null">
+                and ((instr(RCSE.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
+                 or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0))
+            </if>
+        </where>
+        )
+        <where>
+            <if test="materialName != null">
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planNo != null">
+                and
+                <foreach collection="planNo" item="item" open="(" separator="or" close=")">
+                    "planNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planTruckTime != null">
+                and
+                <foreach collection="planTruckTime" item="item" open="(" separator="or" close=")">
+                    "planTruckTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planIncomingTime != null">
+                and
+                <foreach collection="planIncomingTime" item="item" open="(" separator="or" close=")">
+                    "planIncomingTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertUsername != null">
+                and
+                <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">
+                    "insertUsername" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertTime != null">
+                and
+                <foreach collection="insertTime" item="item" open="(" separator="or" close=")">
+                    "insertTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNumber != null">
+                and
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderEntryTime != null">
+                and
+                <foreach collection="orderEntryTime" item="item" open="(" separator="or" close=")">
+                    "orderEntryTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </select>
+
+    <!--  通过运输订单Id查询运输订单号 -->
+    <select id="getOrderNumberByOrderId" parameterType="int" resultType="string">
+        select OO.ORDER_NUMBER "orderNumber"
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  获取所有的运力信息 -->
+    <select id="getAllCapacity" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+        select
+        *
+        from
+        (
+        select
+        RC.CAPACITY_ID "capacityId",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_VIP "capacityVip",
+        RCA.CARRIER_NAME "carrierName",
+        RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+        RC.CAPACITY_BLACKLIST "capacityBlacklist",
+        RC.INSERT_TIME AS "insertTime"
+        from RMS_CAPACITY RC
+        left join RMS_CARRIER RCA
+        on RC.CARRIER_ID = RCA.CARRIER_ID
+        left join RMS_CAPACITY_TYPE RCT
+        on RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
+        <where>
+            <if test="capacityTypeId != null">
+                RC.CAPACITY_TYPE_ID = #{capacityTypeId}
+            </if>
+            <if test="capacityStatus != null">
+                and RC.CAPACITY_STATUS = #{capacityStatus}
+            </if>
+            <if test="carrierId != null">
+                and RC.CARRIER_ID = #{carrierId}
+            </if>
+        </where>
+        )
+        <where>
+            <if test="capacityTypeName != null">
+                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
+                    "capacityTypeName" like '%${item}%'
+                </foreach>
+            </if>
+
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityVip != null">
+                and
+                <foreach collection="capacityVip" item="item" open="(" separator="or" close=")">
+                    "capacityVip" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityBlacklist != null">
+                and
+                <foreach collection="capacityBlacklist" item="item" open="(" separator="or" close=")">
+                    "capacityBlacklist" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </select>
+
+    <!--  通过Id查询派发时间 -->
+    <select id="getInsertTimeById" parameterType="int" resultType="java.util.Date">
+        select ORDER_ISSUE_TIME
+        from OMSTRUCK_ORDER
+        where ORDER_ID = #{orderId}
+    </select>
+
+    <!--  通过车牌号匹配运力Id -->
+    <select id="getCapacityIdByCapacityNum" parameterType="string" resultType="java.math.BigDecimal">
+        select CAPACITY_ID
+        from RMS_CAPACITY
+        where CAPACITY_NUMBER = #{capacityNumber}
+    </select>
+
+    <!--  通过运输订单ID 或运输订单号 查询 运力ID  -->
+    <select id="getCapacityIdByOrderOrNum" parameterType="java.util.Map" resultType="java.math.BigDecimal">
+        select CAPACITY_ID
+        from OMSTRUCK_ORDER
+        <where>
+            <if test="orderId != null">
+                ORDER_ID = #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                and ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>
+
+    </select>
+
+    <!--  通过运力ID 或车牌号 修改 运力状态  -->
+    <update id="updateCapacityByCarIdOrNum" parameterType="java.util.Map">
+        update RMS_CAPACITY RC
+        set RC.CAPACITY_STATUS = #{capacityStatus}
+        where
+        <if test="capacityId != null">
+            RC.CAPACITY_ID = #{capacityId}
+        </if>
+        <if test="capacityNumber != null">
+            RC.CAPACITY_NUMBER = #{capacityNumber}
+        </if>
+    </update>
+
+
+    <!-- 销售物流，通过运力id修改运力状态 -->
+    <update id="updateCapacityById" parameterType="java.util.Map">
+        update RMS_CAPACITY RC
+        set RC.CAPACITY_STATUS = #{capacityStatus}
+        where
+        <if test="driverCapacityId != null">
+            RC.CAPACITY_ID = #{driverCapacityId}
+        </if>
+        <if test="capacityNumber != null">
+            RC.CAPACITY_NUMBER = #{capacityNumber}
+        </if>
+    </update>
+
+    <update id="refuseCtrlZ">
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = 4,
+            OO.INSERT_UPDATE_REMARK = '撤销订单状态变为4'
+        WHERE OO.ORDER_ID = #{orderId}
+    </update>
+
+
+    <update id="closeTruckOrder" parameterType="java.math.BigDecimal">
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_STATUS = 7,
+            OO.INSERT_UPDATE_REMARK = '过期订单'
+        where OO.ORDER_ID = #{orderId}
+    </update>
+
+
+    <!-- 通过运力ID 查询采购司机接单数据  、通过运单号查询所有运单信息-->
+    <select id="getTruckOrderByCapacityNum" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+        select OO.ORDER_NUMBER "orderNumber",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RW.WAREHOUSE_NAME "warehouseName",
+        RM.MATERIAL_NAME "materialName",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RW2.WAREHOUSE_NAME "warehouseName2",
+        OO.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        TTR.RESULT_TOTAL_ID "resultTotalId"
+        from OMSTRUCK_ORDER OO
+        left join RMS_CAPACITY RC on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        left join RMS_WAREHOUSE RW on RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        left join TMSTRUCK_TOTAL_RESULT TTR on TTR.ORDER_ID = OO.ORDER_ID
+        left join TMSTRUCK_LOAD_RESULT TLR on TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        left join RMS_WAREHOUSE RW2 on RW2.WAREHOUSE_ID = TLR.LOADING_ID
+        where OO.ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
+        and OO.ORDER_TYPE = #{orderTypee}
+        )
+        <where>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                and
+                <foreach collection="orderReceiveRefuseTime" item="item" open="(" separator="or" close=")">
+                    "orderReceiveRefuseTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName2 != null">
+                and
+                <foreach collection="warehouseName2" item="item" open="(" separator="or" close=")">
+                    "warehouseName2" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "orderReceiveRefuseTime" desc
+        </if>
+    </select>
+
+    <!-- 通过运力ID 查询销售司机接单数据  、通过运单号查询所有运单信息-->
+    <select id="getSaleTruckOrderByCapacityNum" parameterType="java.util.Map" resultType="java.util.Map">
+        select
+        distinct *
+        from(
+        select
+        OO.INSERT_TIME "insertTime",
+        OO.ORDER_ID "orderId",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "carNumber",
+        ASO.SALE_NUMBER "saleNumber",
+        RM.MATERIAL_NAME "materialName",
+        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
+        RS.SHIPPER_NAME "shipperName",
+        RCO.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RRA.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        OO.CAN_WORK "canWork",
+        OO.ORDER_STATUS "orderStatus"
+        from OMSTRUCK_ORDER OO
+        left join AMS_SALE_ORDER_MATERIAL ASOM
+        on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        left join AMS_SALE_ORDER ASO
+        on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        left join RMS_SHIPPER RS
+        on RS.SHIPPER_ID = ASO.SHIPPER_ID
+        left join RMS_CONSIGNEE RCO
+        on RCO.CONSIGNEE_ID = ASO.RECEIVE_ID
+        left join RMS_RECEIVE_ADDRESS RRA
+        on RRA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        left join RMS_CAPACITY RC --车牌号
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM --物资重量
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM --物资名称
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+
+        <where>
+            <if test="capacityId != null">
+                and OO.CAPACITY_ID = #{capacityId}
+            </if>
+            <if test="orderStatus != null">
+                and OO.ORDER_STATUS = #{orderStatus}
+            </if>
+            <if test="orderId != null">
+                and OO.ORDER_ID = #{orderId}
+            </if>
+            <if test="orderType != null">
+                and OO.ORDER_TYPE = #{orderType}
+            </if>
+            <if test="orderReceiveStatus != null">
+                and OO.ORDER_RECEIVE_STATUS = #{orderReceiveStatus}
+            </if>
+        </where>
+        )
+        <where>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carNumber != null">
+                <foreach collection="carNumber" item="item" open="(" separator="or" close=")">
+                    "carNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleNumber != null">
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" like '%${item}%'
+                </foreach>
+            </if>
+
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="addressDeliveryAddress != null">
+                and
+                <foreach collection="addressDeliveryAddress" item="item" open="(" separator="or" close=")">
+                    "addressDeliveryAddress" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleDateOfReceipt != null">
+                and
+                <foreach collection="saleDateOfReceipt" item="item" open="(" separator="or" close=")">
+                    "saleDateOfReceipt" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "insertTime" desc
+        </if>
+    </select>
+
+    <!-- 查询五个作业点名称sql片段 -->
+    <sql id="columnSql">
+        RG1.GATEPOST_NAME "gatepostName1",
+     RG2.GATEPOST_NAME "gatepostName2",
+     RTC1.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+     RW.WAREHOUSE_NAME    "warehouseName",
+     RTC2.TRUCK_CALCULATE_NUMBER "truckCalculateNum",
+    </sql>
+
+    <sql id="placeSql">
+        left join RMS_GATEPOST RG1 --进厂门岗
+    on RG1.GATEPOST_ID = RL.LINE_START_NODE_ID
+    left join RMS_GATEPOST RG2 --出厂门岗
+    on RG2.GATEPOST_ID = RL.LINE_END_NODE_ID
+
+    left join RMS_LINE_SEGEMNT RLS1
+    on RL.LINE_ID = RLS1.LINE_ID and RLS1.SEGMENT_END_NODE_TYPE = 1
+    left join RMS_TRUCK_CALCULATE RTC1 -- 计毛汽车衡
+    on RLS1.SEGMENT_END_NODE_ID = RTC1.TRUCK_CALCULATE_ID
+
+    left join RMS_LINE_SEGEMNT RLS2
+    on RL.LINE_ID = RLS2.LINE_ID and RLS2.SEGMENT_END_NODE_TYPE = 3
+    left join RMS_WAREHOUSE RW -- 卸货仓库
+    on RW.WAREHOUSE_ID = RLS2.SEGMENT_END_NODE_ID
+
+    left join RMS_LINE_SEGEMNT RLS3
+    on RL.LINE_ID = RLS3.LINE_ID and RLS3.SEGMENT_END_NODE_TYPE = 2
+    left join RMS_TRUCK_CALCULATE RTC2 -- 计皮汽车衡
+    on RLS3.SEGMENT_END_NODE_ID = RTC2.TRUCK_CALCULATE_ID
+    </sql>
+    <!--  通过运力ID 查询司机所有已拒绝已接收的订单 -->
+    <select id="getReceiveRefuseOrderByCapacityId" parameterType="java.util.Map" resultType="java.util.Map">
+        select OO.ORDER_ID     "orderId",
+               OO.ORDER_NUMBER "orderNumber"
+        from OMSTRUCK_ORDER OO
+        where CAPACITY_ID = #{capacityId}
+          and ORDER_RECEIVE_STATUS = 0
+
+    </select>
+
+    <!-- 查询实绩流程 -->
+    <select id="selectPlaceAndTime" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ERG.GATEPOST_NAME            as "entryGatepost",
+               TER.RESULT_ENTRY_GATE_TIME   as "entryTime",
+               GRTC.TRUCK_CALCULATE_NUMBER  as "grossCalculate",
+               TWR.RESULT_GROSS_WEIGHT_TIME as "grossTime",
+               RW.WAREHOUSE_NAME            as "unloadWarhouse",
+               TUR.RESULT_START_TIME        as "unloadTime",
+               TRTC.TRUCK_CALCULATE_NUMBER  as "tareCalculate",
+               TWR.RESULT_TARE_WEIGHT_TIME  as "tareTime",
+               LRG.GATEPOST_NAME            as "leaveGatepost",
+               TLFR.RESULT_OUT_GATE_TIME    as "outTime",
+               RWR.WAREHOUSE_NAME           as "receiptWarhouse",
+               TRR.INSERT_TIME              as "receiptTime",
+               OO.ORDER_LINE_SEQUENCE       as "orderLineSequence",
+               OO.ORDER_TYPE                as "orderType"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                           ON TTR.RESULT_TOTAL_ID = TER.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_GATEPOST ERG --进厂门岗
+                           ON ERG.GATEPOST_ID = TER.GATEPOST_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                           ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_TRUCK_CALCULATE GRTC --毛重汽车衡
+                           ON TWR.RESULT_GROSS_PLACE_ID = GRTC.TRUCK_CALCULATE_ID
+                 LEFT JOIN RMS_TRUCK_CALCULATE TRTC --皮重汽车衡
+                           ON TWR.RESULT_TARE_PLACE_ID = TRTC.TRUCK_CALCULATE_ID
+                 LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR
+                           ON TTR.RESULT_TOTAL_ID = TUR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_WAREHOUSE RW --卸货点
+                           ON RW.WAREHOUSE_ID = TUR.RESULT_UNLOAD_PLACE_ID
+                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                           ON TTR.RESULT_TOTAL_ID = TLFR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_GATEPOST LRG --出厂门岗
+                           ON LRG.GATEPOST_ID = TLFR.GATEPOST_ID
+                 LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR
+                           ON TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_WAREHOUSE RWR --异地库
+                           ON TRR.WAREHOUSE_ID = RWR.WAREHOUSE_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  通过运输订单ID查询运输订单相关信息 仅限单拼 -->
+    <select id="getOrderByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        SELECT APO.PURCHASE_ORDER_NO     "purchaseOrderNo",
+               RC.CAPACITY_NUMBER        "capacityNumber",
+               RM.MATERIAL_ID            "materialId",
+               RM.MATERIAL_NAME          "materialName",
+               OO.ORDER_ENTRY_TIME       "orderEntryTime",
+               OO.ORDER_TYPE             "orderType",
+               RW.WAREHOUSE_NAME         "warehouseName",
+               OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber",
+               OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                 left join AMS_PURCHASE_ORDER APO
+                           on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                 left join OMSTRUCK_ORDER_MATERIAL OOM
+                           on OOM.ORDER_ID = OO.ORDER_ID
+                 left join RMS_MATERIAL RM
+                           on RM.MATERIAL_ID = OOM.MATERIAL_ID
+                 left join RMS_WAREHOUSE RW
+                           on RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  通过运输订单号查询各路段预设作业点 以及总实绩ID -->
+    <select id="getPointIdByOrderNum" parameterType="java.util.Map" resultType="java.util.Map">
+        select
+        RL.LINE_START_NODE_ID "lineStartNodeId",
+        RL.LINE_END_NODE_ID "lineEndNodeId",
+        RLS1.SEGMENT_END_NODE_ID "truckCalculateIdMao",
+        RLS2.SEGMENT_END_NODE_ID "truckCalculateIdPi",
+        RLS3.SEGMENT_END_NODE_ID "resultUnloadPlaceId",
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.ORDER_TYPE "orderType"
+
+        from OMSTRUCK_ORDER OO
+        left join RMS_LINE RL
+        on RL.LINE_ID = OO.LINE_ID
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TTR.ORDER_ID = OO.ORDER_ID
+        left join RMS_LINE_SEGEMNT RLS1 --查询计毛汽车衡
+        on RL.LINE_ID = RLS1.LINE_ID and RLS1.SEGMENT_END_NODE_TYPE = 1
+        left join RMS_LINE_SEGEMNT RLS2 --查询计皮汽车衡
+        on RL.LINE_ID = RLS2.LINE_ID and RLS2.SEGMENT_END_NODE_TYPE = 2
+        left join RMS_LINE_SEGEMNT RLS3 --查询卸货点
+        on RL.LINE_ID = RLS3.LINE_ID and RLS3.SEGMENT_END_NODE_TYPE = 3
+
+        <where>
+            <if test="orderNumber != null">
+                OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+            <if test="orderId != null">
+                and OO.ORDER_ID = #{orderId}
+            </if>
+        </where>
+
+    </select>
+
+    <!--  查询运输派单信息  -->
+    <select id="getTransportDispatch" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+        select
+        *
+        from(
+        select
+        OO.ORDER_ID "orderId",
+        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+        OO.ORDER_NUMBER "orderNumber",
+        RS.SUPPLIER_NAME "supplierName",
+        RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RW.WAREHOUSE_NAME "warehouseName",
+        RCON.CONSIGNEE_CONTACT_NAME "consigneeContactName",
+        RCON.CONSIGNEE_CONTACT_TEL "consigneeContactTel",
+        to_char(APO.PUCHASE_ORDER_DELIVERY_DATE, 'yyyy-mm-dd') "puchaseOrderDeliveryDate",
+        RM.MATERIAL_NAME "materialName",
+        (
+        case when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then OOM.ORDER_MATERIAL_WEIGHT
+        when OOM.ORDER_MATERIAL_WEIGHT is null
+        then OOM.ORDER_MATERIAL_NUMBER
+        end
+        )    "orderMaterialWeight",
+        OO.ORDER_ISSUE_TIME "orderIssueTime",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RC.CAPACITY_NUMBER "capacityNumber"
+
+        from OMSTRUCK_ORDER OO
+        left join AMS_PURCHASE_ORDER APO
+        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        left join OMSTRUCK_ORDER_MATERIAL OOM
+        on OOM.ORDER_ID = OO.ORDER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID = OOM.MATERIAL_ID
+        left join RMS_SUPPLIER RS
+        on RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        left join RMS_CONSIGNEE RCON
+        on RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        left join RMS_WAREHOUSE RW
+        on RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = OO.CAPACITY_ID
+        <if test="carrierSSOId != null">
+            left join RMS_CARRIER RCA
+            on RCA.CARRIER_ID = OO.CARRIER_ID
+        </if>
+        <where>
+            <choose>
+                <when test="orderStatus != 111">
+                    and OO.ORDER_STATUS = #{orderStatus}
+                </when>
+                <when test="orderStatus == 111">
+                    and OO.ORDER_STATUS in (0, 1, 2, 5)
+                </when>
+            </choose>
+            <if test="orderTypee != null">
+                and OO.ORDER_TYPE = #{orderTypee}
+            </if>
+            <if test="fuelOrder == 1">
+                and OO.ORDER_TYPE in (6, 7)
+            </if>
+            <if test="fuelOrder == 2">
+                and OO.ORDER_TYPE in (17, 18)
+            </if>
+            <if test="carrierSSOId != null">
+                and RCA.CARRIER_SSO_ID = #{carrierSSOId}
+            </if>
+            <if test="oneDate != null">
+                and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.ORDER_ISSUE_TIME
+            </if>
+            <if test="startDate != null">
+                and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt; =    OO.ORDER_ISSUE_TIME
+                and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >=   OO.ORDER_ISSUE_TIME
+            </if>
+            <if test="con!=null">
+                and ((instr(RCON.CONSIGNEE_COMPANY_NAME, #{con}) > 0) or  (instr(RS.SUPPLIER_NAME, #{con}) > 0)
+                or (instr( RC.CAPACITY_NUMBER, #{con}) > 0) or (instr(RM.MATERIAL_NAME , #{con}) > 0))
+            </if>
+        </where>
+        )
+        <where>
+            <if test="purchaseOrderNo != null">
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "warehouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeContactName != null">
+                and
+                <foreach collection="consigneeContactName" item="item" open="(" separator="or" close=")">
+                    "consigneeContactName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeContactTel != null">
+                and
+                <foreach collection="consigneeContactTel" item="item" open="(" separator="or" close=")">
+                    "consigneeContactTel" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="puchaseOrderDeliveryDate != null">
+                and
+                <foreach collection="puchaseOrderDeliveryDate" item="item" open="(" separator="or" close=")">
+                    "puchaseOrderDeliveryDate" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderMaterialWeight != null">
+                and
+                <foreach collection="orderMaterialWeight" item="item" open="(" separator="or" close=")">
+                    "orderMaterialWeight" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderReceiveRefuseTime != null">
+                and
+                <foreach collection="orderReceiveRefuseTime" item="item" open="(" separator="or" close=")">
+                    "orderReceiveRefuseTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderIssueTime != null">
+                and
+                <foreach collection="orderIssueTime" item="item" open="(" separator="or" close=")">
+                    "orderIssueTime" like '%${item}%'
+                </foreach>
+            </if>
+            <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>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "orderReceiveRefuseTime" desc
+        </if>
+    </select>
+
+    <!-- 查询已下发已接受的销售订单信息 -->
+    <select id="getOrderReceived" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT aso.SALE_NUMBER as "saleNumber",
+        oo.ORDER_NUMBER as "orderNumber",
+        oo.INSERT_USERNAME as "insertUsername",
+        rc.CAPACITY_NUMBER as "capacityNumber"
+        FROM OMSTRUCK_ORDER oo
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL asom
+        ON asom.SALE_ORDER_MATERIAL_ID = oo.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER aso
+        ON aso.SALE_ORDER_ID = asom.SALE_ORDER_ID
+        LEFT JOIN RMS_CAPACITY rc
+        ON rc.CAPACITY_ID = oo.CAPACITY_ID
+        WHERE oo.ORDER_ISSUE_TIME IS NOT NULL
+        AND oo.ORDER_RECEIVE_STATUS = 1
+        AND oo.ORDER_TYPE = #{orderType}
+        <where>
+            <if test="saleNumber != null">
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="insertUsername != null">
+                <foreach collection="insertUsername" item="item" open="(" separator="or" close=")">
+                    "insertUsername" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <!--查询司机排班信息-->
+    <select id="selectCapacityAndDriver" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+        RDC.CAPACITY_ID "capacityId",
+        RC.CAPACITY_NUMBER "number",
+        RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+        RCD.DRIVER_NAME "name"
+
+        FROM
+        RMS_DRIVER_CAPACITY RDC
+        LEFT JOIN RMS_CAPACITY RC ON RDC.CAPACITY_ID = RC.CAPACITY_ID
+        LEFT JOIN RMS_CAPACITY_TYPE RCT ON RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
+        LEFT JOIN RMS_CAR_DRIVER RCD ON RCD.DRIVER_ID = RDC.DRIVER_ID
+        WHERE
+        RC.CAPACITY_STATUS =0 and RC.CARRIER_ID=#{carrierId}
+        <where>
+            <if test="capacityId != null">
+                <foreach collection="capacityId" item="item" open="(" separator="or" close=")">
+                    "capacityId" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="number != null">
+                <foreach collection="number" item="item" open="(" separator="or" close=")">
+                    "number" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityTypeName != null">
+                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
+                    "capacityTypeName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="name != null">
+                <foreach collection="name" item="item" open="(" separator="or" close=")">
+                    "name" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+
+    </select>
+
+    <!--根据id查找用户名    -->
+    <select id="selectPersonNameByPersonnelId" resultType="java.lang.String" parameterType="java.lang.Integer">
+        select RP.PERSONNEL_NAME "personnelName"
+        from RMS_PERSONNEL RP
+        where RP.PERSONNEL_ID = #{personnelId}
+    </select>
+    <!--  通过车牌号、承运商匹配最新的运力id-->
+    <select id="selectCapacityId" parameterType="java.util.Map" resultType="java.math.BigDecimal">
+        select t.CAPACITY_ID
+        from RMS_CAPACITY t
+        where t.CAPACITY_ID = #{capacityId}
+          and t.CAPACITY_NUMBER = #{capacityNumber}
+    </select>
+    <!-- 通过运输订单号或运输订单ID查询总实绩ID和订单类型 -->
+    <select id="getResultTotalIdByOrderNumAndId" parameterType="java.util.Map" resultType="java.util.Map">
+        select
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.ORDER_TYPE "orderType"
+        from OMSTRUCK_ORDER OO
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TTR.ORDER_ID = OO.ORDER_ID
+        <where>
+            <if test="orderId != null">
+                OO.ORDER_ID= #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                and OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>
+    </select>
+
+    <!--通过运输订单ID查询数据 用于websocket推送数据  如果订单实绩中有卸货点  没有卸货点通过传入的卸货点进行查询-->
+    <select id="pushMesToWebsocket" parameterType="java.util.Map" resultType="java.util.Map">
+        select OO.ORDER_NUMBER           "orderNumber",
+               RC.CAPACITY_NUMBER        "capacityNumber"
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+        where OO.ORDER_ID = #{orderId}
+          and rownum = 1
+    </select>
+
+
+    <!--  //通过物资id查询批次表匹配最新的批次，关联最新的采购订单号 -->
+    <select id="selectNewOrderId" parameterType="java.util.Map" resultType="java.util.Map">
+        select *
+        from (
+        select apo.PURCHASE_ORDER_NO "purchaseOrderNo",
+        apo.PURCHASE_ORDER_ID "purchaseOrderId",
+        db.RESULT_FOREIGN_SHIP_NAME "remark",
+        apo.RECEIVE_UNIT_ID     "receiveUnitId",
+        apo.purchasing_organization_id "purchaseOrgId"
+        from AMS_PURCHASE_ORDER APO
+        join DIL_BATCH DB on apo.BATCH_ID = db.BATCH_ID
+        where db.MATERIAL_ID = #{materialId}
+        and apo.SUPPLIER_UNIT_ID = #{supplierId}
+        and apo.deleted = 0
+        <if test="purchaseOrgId != null">
+            and apo.purchasing_organization_id = #{purchaseOrgId}
+        </if>
+        <if test="remark != null">
+            and instr(db.RESULT_FOREIGN_SHIP_NAME, #{remark}) > 0
+        </if>
+        order by apo.PURCHASE_ORDER_NO desc
+        )
+        where rownum = 1
+    </select>
+
+    <!--  查询所有的发货单位  -->
+    <select id="getReceivingUnit" resultType="java.util.Map">
+        SELECT *
+        from (
+                 select RC.CONSIGNEE_ID           "id",
+                        RC.CONSIGNEE_ID           "value",
+                        RC.CONSIGNEE_COMPANY_NAME "label"
+                 from RMS_CONSIGNEE RC
+                 order by RC.CONSIGNEE_ID
+             )
+        where rownum &lt; 20
+    </select>
+
+    <!--  查询所有的发货单位  -->
+    <select id="getSupplier" resultType="java.util.Map">
+        SELECT *
+        from (
+                 select RS.SUPPLIER_ID   "id",
+                        RS.SUPPLIER_ID   "value",
+                        RS.SUPPLIER_NAME "label"
+                 from RMS_SUPPLIER RS
+                 order by RS.SUPPLIER_ID
+             )
+        where rownum &lt; 20
+    </select>
+
+    <!--通过运输订单Id查询运输订单子表有几种物资 ：物资ID-->
+    <select id="getMaterialIdListByOrderId" parameterType="int" resultType="java.lang.Integer">
+        select OOM.MATERIAL_ID
+        from OMSTRUCK_ORDER OO
+                 left join OMSTRUCK_ORDER_MATERIAL OOM
+                           on OOM.ORDER_ID = OO.ORDER_ID
+    </select>
+
+    <!-- 通过采购订单号查找采购订单ID -->
+    <select id="getPurchaseOrderIdByNo" parameterType="string" resultType="java.math.BigDecimal">
+        select APO.PURCHASE_ORDER_ID
+        from AMS_PURCHASE_ORDER APO
+        where APO.PURCHASE_ORDER_NO = #{purchaseOrderNo}
+    </select>
+    <select id="getSaleTruckOrderByCapacityId" resultType="java.util.Map">
+        select oo.ORDER_ID                                "orderId",
+               oo.order_number                            "orderNumber",
+               rc.capacity_number                         "capacityNumber",
+               aso.sale_number                            "saleOrderNumber",
+               rs.shipper_name                            "shipperUnit",
+               rce.consignee_company_name                 "receiveUnit",
+               to_char(oo.order_issue_time, 'yyyy-mm-dd') "shipperDate",
+               rca.address_delivery_address               "receiveAddress",
+               asom.sale_date_of_receipt                  "receiveDate"
+        from omstruck_order oo
+                 left join rms_capacity rc
+                           on rc.capacity_id = OO.capacity_id
+                 left join omstruck_order_material oom
+                           on oom.order_id = oo.order_id
+                 left join ams_sale_order_material asom
+                           on asom.sale_order_material_id = oo.order_plan_id
+                 left join ams_sale_order aso
+                           on aso.sale_order_id = asom.sale_order_id
+                 left join rms_shipper rs
+                           on rs.shipper_id = aso.shipper_id
+                 left join rms_consignee rce
+                           on rce.consignee_id = aso.receive_id
+                 left join rms_receive_address rca
+                           on rca.address_id = asom.sale_shipping_address_id
+        where oo.ORDER_ID = #{orderId}
+    </select>
+    <select id="getSaleTruckOrderByCapacityNumMaterial" resultType="java.util.Map">
+        select rm.material_name          "materialName",
+               oom.order_material_weight "materialWeight"
+        from omstruck_order oo
+                 left join rms_capacity rc
+                           on rc.capacity_id = OO.capacity_id
+                 left join omstruck_order_material oom
+                           on oom.order_id = oo.order_id
+                 left join rms_material rm
+                           on rm.material_id = oom.material_id
+        where rc.capacity_id = #{capacityId}
+          and oo.order_status = #{orderStatus}
+          and oo.order_type = #{orderType}
+
+    </select>
+    <!-- 通过车序号查找物资id -->
+    <select id="selectMaterialIdBysaleOrderMaterialId" resultType="java.util.Map" parameterType="java.lang.Integer">
+        SELECT ASTM.MATERIAL_ID "materialId"
+        FROM AMS_SALE_ORDER_MATERIAL ASOM
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.TRUCKNO_MATERIAL_ID
+        WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
+    <!--通过销售订单物资ID查找物资理重和物资件数-->
+    <select id="selectTheoreticalWeightAndMaterialNumber" resultType="java.util.Map" parameterType="java.lang.Integer">
+        SELECT ASTM.SALE_ORDER_MATERIAL_NUMBER  "materialNumber",
+               ASTM.MATERIAL_THEORETICAL_WEIGHT "weight"
+
+        from AMS_SALE_ORDER_MATERIAL ASOM
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        WHERE ASTM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+    </select>
+    <!--销售，查看运输订单(钢材销售订单)并根据司机接受或者拒绝时间进行排序  -->
+    <select id="selectTransportOrderForSale" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT DISTINCT *from(
+        select
+        OO.ORDER_NUMBER "orderNumber",
+        ASO.SALE_NUMBER "saleNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN "addressDeliveryAddress",
+        ACTP.PRICE_VALUE "priceValue",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RS.SHIPPER_NAME "shipperName",
+        OO.ORDER_ID "orderId",
+        RC3.CARRIER_NAME "carrierName",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        OO.DRIVER_TEL "drivelTel",
+        ASM.SALE_WAREHOUSE "saleWarehouse",
+        ASM.MATERIAL_NUMBER "materialNumber"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_CARRIER RC3
+        ON RC3.CARRIER_ID = ADSO.CARRIER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2
+        ON RC2.CONSIGNEE_ID=ASO.RECEIVE_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON OO.CAPACITY_ID=RC.CAPACITY_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID=ASO.SHIPPER_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+        ON OO.PRICE_ID=ACTP.PRICE_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID=OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+        <where>
+            ASM.SALE_MATERIAL_ID IS NOT NULL
+            <if test="orderStatus!=null">
+                AND OO.ORDER_STATUS = #{orderStatus}
+            </if>
+            <if test="carrierSsoId!=null">
+                and RC3.CARRIER_SSO_ID = #{carrierSsoId}
+            </if>
+            <if test="orderTypee!=null">
+                and OO.ORDER_TYPE = #{orderTypee}
+            </if>
+            <if test="shipperId!=null">
+                and ASO.SHIPPER_ID = #{shipperId}
+            </if>
+        </where>
+        ) RRC
+        <if test="con != null">
+            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con} or RRC."carrierName" LIKE #{con}
+        </if>
+        )
+        <where>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleNumber != null">
+                and
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "orderNumber" desc
+        </if>
+    </select>
+
+    <select id="selectTransportOrderForSale1" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT  * FROM (
+        SELECT  *from(
+        select DISTINCT
+        OO.ORDER_NUMBER "orderNumber",
+        ASO.SALE_NUMBER "saleNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        RRA.ADDRESS_PROVINCE || RRA.ADDRESS_DISTRICT || RRA.ADDRESS_TOWN
+        ||RRP.ADDRESS_DELIVERY_ADDRESS "completeAddress",
+        ASOM.SALE_SHIPPING_ADDRESS_ID "addressId",
+        ACTP.PRICE_VALUE "priceValue",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
+        RS.SHIPPER_NAME "shipperName",
+        RC3.CARRIER_NAME "carrierName",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        ASM.SALE_MATERIAL_ID "saleMaterialId",
+        ASM.MATERIAL_ID "materialId",
+        ASTM.TRUCKNO_MATERIAL_ID "trucknoMaterialId",
+        OO.ORDER_ID "orderId",
+        ASM.STEEL_METER "meterNumber",
+        ASM.MATERIAL_NUMBER "orderPlanWeight",
+        ASM.IS_POUND_SALE "isPound",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "Specification",
+        ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
+        ASM.EAS_PRIMARY_ID "easId",
+        ASM.SALE_WAREHOUSE "warehouse",
+        ASM.MATERIAL_WEIGHT "materialWeight",
+        TWR.RESULT_NET_WEIGHT "netWeight",
+        OO.ORDER_LINE_SEQUENCE "lineSequence",
+        ASM.DELETED "materialStatus"
+        FROM AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        AND NVL(OO.ORDER_TYPE,0) BETWEEN 0 AND 1
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM
+        ON ASTM.MATERIAL_ID = ASM.SALE_MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        AND TWR.MATERIAL_ID = ASM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASO.SALE_ORDER_ID=ASOM.SALE_ORDER_ID
+        LEFT JOIN AMS_DISPATCH_SALE_ORDER ADSO
+        ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN RMS_CARRIER RC3
+        ON RC3.CARRIER_ID = ADSO.CARRIER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2
+        ON RC2.CONSIGNEE_ID=ASO.RECEIVE_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON OO.CAPACITY_ID=RC.CAPACITY_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID=ASO.SHIPPER_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP
+        ON RRP.PLACE_ID=ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+        ON RRA.ADDRESS_ID=RRP.ADDRESS_ID
+        LEFT JOIN AMS_CONTRACT_TRANSPORT_PRICE ACTP
+        ON OO.PRICE_ID=ACTP.PRICE_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+        <where>
+            ASM.SALE_MATERIAL_ID IS NOT NULL
+            <if test="saleOrderId!=null">
+                AND ASO.SALE_ORDER_ID = #{saleOrderId}
+            </if>
+            <if test="numberPlate!=null">
+                AND RC.CAPACITY_NUMBER LIKE #{numberPlate}
+            </if>
+        </where>
+        ) RRC
+        <if test="con != null">
+            WHERE RRC."consigneeCompanyName" LIKE #{con} or RRC."capacityNumber" LIKE #{con} or RRC."carrierName" LIKE #{con}
+        </if>
+        )
+        <where>
+            <if test="orderNumber != null">
+                <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+                    "orderNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="saleNumber != null">
+                and
+                <foreach collection="saleNumber" item="item" open="(" separator="or" close=")">
+                    "saleNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="shipperName != null">
+                and
+                <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+                    "shipperName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeCompanyName != null">
+                and
+                <foreach collection="consigneeCompanyName" item="item" open="(" separator="or" close=")">
+                    "consigneeCompanyName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+        <if test="orderField == null  ">
+            order by "orderNumber" desc
+        </if>
+    </select>
+    <!--根据车序号查找销售订单 -->
+    <select id="selectSaleBySaleOrderMaterialId" parameterType="java.lang.Integer" resultType="java.util.Map">
+        SELECT
+        ASO.SALE_NUMBER "saleNumber",
+        RS.SHIPPER_NAME "shipperName",
+        RC.CONSIGNEE_COMPANY_NAME "consigneeName",
+        RRA.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
+        ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
+        ASOM.SALE_DATE_OF_RECEIPT "receiptOfdate",
+        ASOM.SALE_ORDER_CONSIGNEE "saleOrderConsignee",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
+        ASOM.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        ASOM.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId",
+        (
+        SELECT
+        ASTM.SALE_ORDER_MATERIAL_NUMBER
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "saleOrderMaterialNumber",
+        (
+        SELECT
+        ASTM.MATERIAL_THEORETICAL_WEIGHT
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialTheoreticalWeight",
+        (
+        SELECT
+        RM.MATERIAL_NAME "materialName"
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialName",
+        (
+        SELECT
+        ASTM.MATERIAL_ID "materialId"
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialId"
+        FROM
+        AMS_SALE_ORDER_MATERIAL ASOM
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID=#{saleOrderMaterialId}
+        <include refid="orderBy"></include>
+    </select>
+
+
+    <!-- 根据承运商查找销售订单 -->
+    <select id="selectSaleMaterialIdByCarrierId" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select ADSO.SALE_ORDER_MATERIAL_ID "saleOrderMaterialId"
+        from AMS_DISPATCH_SALE_ORDER ADSO
+        where ADSO.CARRIER_ID = #{carrierId}
+    </select>
+    <!-- 查询所有下发的销售订单，根据下发状态进行筛选-->
+    <select id="selectSaleNumberForCarrier" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT ASO.SALE_NUMBER           "saleNumber",
+               RC.CONSIGNEE_COMPANY_NAME "companyName",
+               RS.SHIPPER_NAME           "shipperName"
+        FROM AMS_SALE_ORDER ASO
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON ASO.RECEIVE_ID = RC.CONSIGNEE_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        WHERE ASOM.SALE_ORDER_MATERIAL_ID = #{saleMaterialId}
+    </select>
+
+
+    <!-- 查询所有已接收的焦炭发运计划 -->
+    <select id="selectCokeDayPlanAndRecived" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select * from (
+        select
+        ARD.DAYPLAN_ID "dayPlanId",
+        ARD.DAYPLAN_NO "No",
+        RS.SHIPPER_NAME "shipperName",
+        ARD.DAYPLAN_TRUCK_NUMBER "TruckNumber",
+        ARD.DAYPLAN_DELIVERY_PLACE "DayPlanDeliveryPlace",
+        ARD.DAYPLAN_RECEIVE_UNIT "receiveUnit",
+        ARD.DAYPLAN_DELIVERY_DATE "deliveryDate",
+        ARD.DAYPLAN_MATERIAL_WEIGHT "weight",
+        RM.MATERIAL_NAME "materialName",
+        ARD.INSERT_UPDATE_REMARK "remark",
+        ARD.INSERT_TIME "insertTime"
+
+        FROM AMSTRUCK_RAIL_DAYPLAN ARD
+        left join RMS_SHIPPER RS
+        on ARD.SHIPMENT_UNIT_ID =RS.SHIPPER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID=ARD.MATERIAL_ID
+        left Join RMS_MATERIAL_TYPE RMT
+        on RMT.MATERIAL_TYPE_ID=RM.MATERIAL_TYPE_ID
+        where ARD.DAYPLAN_RECEIVE_STATUS=1 and ARD.CARRIER_ID=#{carrierId}
+
+        )
+        <!--    <where>-->
+        <!--  <if test="shipperName != null">-->
+        <!--    and-->
+        <!--    <foreach collection="shipperName" item="item" open="(" separator="or" close=")">-->
+        <!--      "shipperName" like '%${item}%'-->
+        <!--    </foreach>-->
+        <!--  </if>-->
+        <!--  <if test="TruckNumber != null">-->
+        <!--    and-->
+        <!--    <foreach collection="TruckNumber" item="item" open="(" separator="or" close=")">-->
+        <!--      "TruckNumber" like '%${item}%'-->
+        <!--    </foreach>-->
+        <!--  </if>-->
+        <!--  <if test="DayPlanDeliveryPlace != null">-->
+        <!--    and-->
+        <!--    <foreach collection="DayPlanDeliveryPlace" item="item" open="(" separator="or" close=")">-->
+        <!--      "DayPlanDeliveryPlace" like '%${item}%'-->
+        <!--    </foreach>-->
+        <!--    <if test="receiveUnit != null">-->
+        <!--      and-->
+        <!--      <foreach collection="receiveUnit" item="item" open="(" separator="or" close=")">-->
+        <!--        "receiveUnit" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--    <if test="materialName != null">-->
+        <!--      and-->
+        <!--      <foreach collection="materialName" item="item" open="(" separator="or" close=")">-->
+        <!--        "materialName" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--    <if test="remark != null">-->
+        <!--      and-->
+        <!--      <foreach collection="remark" item="item" open="(" separator="or" close=")">-->
+        <!--        "remark" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--  </if>-->
+        <!--</where>-->
+        <!--    <include refid="orderBy">-->
+        <!--    </include>-->
+        <!--    <if test="orderField == null  ">-->
+        <!--      order by "insertTime" desc-->
+        <!--    </if>-->
+    </select>
+
+    <!--查询所有已接收的水渣发运计划-->
+    <select id="selectWaterSlagDayPlanAndRecived" resultType="java.util.Map" parameterType="java.lang.Integer">
+        SELECT *
+        FROM (
+        SELECT
+        ARD.DAYPLAN_ID "dayPlanId",
+        ARD.DAYPLAN_NO "No",
+        RS.SHIPPER_NAME "shipperName",
+        ARD.DAYPLAN_RECEIVE_UNIT "receiveUnit",
+        ARD.DAYPLAN_DELIVERY_DATE "deliveryDate",
+        ARD.DAYPLAN_MATERIAL_WEIGHT "weight",
+        RM.MATERIAL_NAME "materialName",
+        ARD.INSERT_UPDATE_REMARK "remark",
+        ARD.INSERT_TIME "insertTime"
+        FROM AMSTRUCK_RAIL_DAYPLAN ARD
+        LEFT JOIN RMS_SHIPPER RS
+        ON ARD.SHIPMENT_UNIT_ID =RS.SHIPPER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=ARD.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL_TYPE RMT
+        ON RMT.MATERIAL_TYPE_ID=RM.MATERIAL_TYPE_ID
+        where ARD.DAYPLAN_RECEIVE_STATUS=1 AND ARD.CARRIER_ID=#{carrierId}
+        )
+        <!--<where>-->
+        <!--      <if test="shipperName != null">-->
+        <!--    and-->
+        <!--    <foreach collection="shipperName" item="item" open="(" separator="or" close=")">-->
+        <!--      "shipperName" like '%${item}%'-->
+        <!--    </foreach>-->
+        <!--  </if>-->
+        <!--  <if test="DayPlanDeliveryPlace != null">-->
+        <!--    and-->
+        <!--    <foreach collection="DayPlanDeliveryPlace" item="item" open="(" separator="or" close=")">-->
+        <!--      "DayPlanDeliveryPlace" like '%${item}%'-->
+        <!--    </foreach>-->
+        <!--    <if test="receiveUnit != null">-->
+        <!--      and-->
+        <!--      <foreach collection="receiveUnit" item="item" open="(" separator="or" close=")">-->
+        <!--        "receiveUnit" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--    <if test="materialName != null">-->
+        <!--      and-->
+        <!--      <foreach collection="materialName" item="item" open="(" separator="or" close=")">-->
+        <!--        "materialName" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--    <if test="remark != null">-->
+        <!--      and-->
+        <!--      <foreach collection="remark" item="item" open="(" separator="or" close=")">-->
+        <!--        "remark" like '%${item}%'-->
+        <!--      </foreach>-->
+        <!--    </if>-->
+        <!--  </if>-->
+        <!--</where>-->
+        <include refid="orderBy"></include>
+    </select>
+
+
+    <!--根据发运计划id查找物资id  -->
+    <select id="selectMaterialIdAndWeightByDayPlanId" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select APM.MATERIAL_ID             "materialId",
+               APM.DAYPLAN_MATERIAL_WEIGHT "materialWeight"
+        from AMSTRUCK_RAIL_DAYPLAN APM
+        WHERE APM.DAYPLAN_ID = #{dayPlanId}
+    </select>
+
+
+    <!--查询根据销售订单生成的运输订单  -->
+    <select id="selectAllOrderForSale" resultType="java.util.LinkedHashMap" parameterType="java.util.Map">
+        SELECT
+        ASO.SALE_NUMBER "saleNumber",
+        RS.SHIPPER_NAME "shipperName",
+        RC.CONSIGNEE_COMPANY_NAME "consigneeName",
+        RRA.ADDRESS_DELIVERY_ADDRESS "addressDeliveryAddress",
+        ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "truckNo",
+        ASOM.SALE_DATE_OF_RECEIPT "receiptOfdate",
+        ASOM.SALE_ORDER_CONSIGNEE "saleOrderConsignee",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
+        ASOM.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        RC2.CAPACITY_NUMBER "capacityNumber",
+        OO.ORDER_ID "orderId",
+        (
+        SELECT
+        ASTM.SALE_ORDER_MATERIAL_NUMBER
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "saleOrderMaterialNumber",
+        (
+        SELECT
+        ASTM.MATERIAL_THEORETICAL_WEIGHT
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialTheoreticalWeight",
+        (
+        SELECT
+        RM.MATERIAL_NAME "materialName"
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialName",
+        (
+        SELECT
+        ASTM.MATERIAL_ID "materialId"
+        FROM
+        AMS_SALE_TRUCKNO_MATERIAL ASTM
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = ASTM.MATERIAL_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM2 ON ASOM.SALE_ORDER_MATERIAL_ID = ASTM.SALE_ORDER_MATERIAL_ID
+        WHERE
+        ASOM.SALE_ORDER_MATERIAL_ID = ASOM2.SALE_ORDER_MATERIAL_ID
+        ) "materialId"
+
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASOM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+        LEFT JOIN RMS_CAPACITY RC2 ON RC2.CAPACITY_ID=OO.CAPACITY_ID
+        <where>
+            <if test="saleOrderMaterialId != null">
+                and ASOM.SALE_ORDER_MATERIAL_ID = #{saleOrderMaterialId}
+            </if>
+            <if test="orderStatus!=null">
+                and OO.ORDER_STATUS = #{orderStatus}
+            </if>
+            <if test="orderTypee != null">
+                and OO.ORDER_TYPE = #{orderTypee}
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+    <!--销售查询已经形成水渣日计划  -->
+    <select id="selectWaterSlagForOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select *
+        from (
+        SELECT ARD.DAYPLAN_NO "No",
+        RS.SHIPPER_NAME "shipperName",
+        ARD.DAYPLAN_TRUCK_NUMBER "TruckNumber",
+        ARD.DAYPLAN_DELIVERY_PLACE "DayPlanDeliveryPlace",
+        ARD.DAYPLAN_RECEIVE_UNIT "receiveUnit",
+        ARD.DAYPLAN_DELIVERY_DATE "deliveryDate",
+        ARD.DAYPLAN_MATERIAL_WEIGHT "weight",
+        ARD.INSERT_UPDATE_REMARK "remark",
+        ARD.INSERT_TIME "insertTime",
+        OO.ORDER_ID "orderId",
+        RM.MATERIAL_NAME "materialName"
+
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_RAIL_DAYPLAN ARD
+        ON ARD.DAYPLAN_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=ARD.MATERIAL_ID
+        left join RMS_SHIPPER RS
+        on ARD.SHIPMENT_UNIT_ID =RS.SHIPPER_ID
+        <where>
+            <if test="carrierId!=null">
+                and ARD.CARRIER_ID=#{carrierId}
+            </if>
+            <if test="dayPlanId!=null">
+                and ARD.DAYPLAN_ID=#{dayPlanId}
+            </if>
+            <if test="orderType!=null">
+                and OO.ORDER_TYPE=#{orderType}
+            </if>
+            <if test="orderStatus!=null">
+                and OO.ORDER_STATUS=#{orderStatus}
+            </if>
+            <if test="materialId!=null">
+                and RM.MATERIAL_ID=#{materialId}
+            </if>
+        </where>
+        )
+        <include refid="orderBy"></include>
+    </select>
+    <!--销售查询已经形成订单得水渣日计划-->
+    <select id="selectCokeRailPlanForOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select *
+        from (
+        SELECT ARD.DAYPLAN_NO "No",
+        ARD.DAYPLAN_ID "dayPlanId",
+        RS.SHIPPER_NAME "shipperName",
+        ARD.DAYPLAN_TRUCK_NUMBER "TruckNumber",
+        ARD.DAYPLAN_DELIVERY_PLACE "DayPlanDeliveryPlace",
+        ARD.DAYPLAN_RECEIVE_UNIT "receiveUnit",
+        ARD.DAYPLAN_DELIVERY_DATE "deliveryDate",
+        ARD.DAYPLAN_MATERIAL_WEIGHT "weight",
+        RM.MATERIAL_NAME "materialName",
+        ARD.INSERT_UPDATE_REMARK "remark",
+        ARD.INSERT_TIME "insertTime",
+        OO.ORDER_ID "orderId"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_RAIL_DAYPLAN ARD
+        ON ARD.DAYPLAN_ID=OO.ORDER_PLAN_ID
+        left join RMS_SHIPPER RS
+        on ARD.SHIPMENT_UNIT_ID =RS.SHIPPER_ID
+        left join RMS_MATERIAL RM
+        on RM.MATERIAL_ID=ARD.MATERIAL_ID
+        left join OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID=ARD.DAYPLAN_ID
+        <where>
+            <if test="carrierId!=null">
+                and ARD.CARRIER_ID=#{carrierId}
+            </if>
+            <if test="dayPlanId!=null">
+                and ARD.DAYPLAN_ID=#{dayPlanId}
+            </if>
+            <if test="orderType!=null">
+                and OO.ORDER_TYPE=#{orderType}
+            </if>
+            <if test="orderStatus!=null">
+                and OO.ORDER_STATUS=#{orderStatus}
+            </if>
+            <if test="materialId!=null">
+                and RM.MATERIAL_ID=#{materialId}
+            </if>
+        </where>
+        )
+        <include refid="orderBy"></include>
+    </select>
+    <!-- 根据承运商查找销售订单-->
+    <select id="selectSteelSaleForCarrier" resultType="java.util.LinkedHashMap" parameterType="java.lang.Integer">
+        select ASO.SALE_NUMBER               "saleNumber",
+               RS.SHIPPER_NAME               "shipperName",
+               RC.CONSIGNEE_COMPANY_NAME     "consigneeName",
+               RRA.ADDRESS_DELIVERY_ADDRESS  "addressDeliveryAddress",
+               ASOM.SALE_DATE_OF_RECEIPT     "receiptOfdate",
+               ASOM.SALE_ORDER_CONSIGNEE     "saleOrderConsignee",
+               ASOM.SALE_ORDER_CONSIGNEE_TEL "saleOrderConsigneeTel",
+               RC2.CARRIER_NAME              "carrierName",
+               ASO.SALE_ORDER_ID             "saleOderId"
+        from AMS_SALE_ORDER ASO
+                 left join AMS_SALE_ORDER_MATERIAL ASOM
+                           on ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 left join OMSTRUCK_ORDER OO
+                           on OO.ORDER_PLAN_ID = ASTM.SALE_ORDER_MATERIAL_ID
+                 left join RMS_CAPACITY RDC
+                           on RDC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN RMS_SHIPPER RS ON ASO.SHIPPER_ID = RS.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RC ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+                 left join RMS_CARRIER RC2 ON RC2.CARRIER_ID = RDC.CARRIER_ID
+        WHERE RDC.CARRIER_ID = #{carrierId}
+          and OO.ORDER_TYPE = 1
+          AND OO.ORDER_STATUS = 4
+    </select>
+
+    <select id="selectInfoBySaleOrderId" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select OO.ORDER_NUMBER                   "orderNumber",
+               RM.MATERIAL_NAME                  "materialName",
+               OOM.ORDER_MATERIAL_NUMBER         "orderMaterialNumber",
+               RM.MATERIAL_THEORETICAL_WEIGHT    "orderTheoreticalWeight",
+               ASOM.SALE_ORDER_MATERIAL_TRUCK_NO "saleOrderMaterialTruckNo",
+               OO.INSERT_UPDATE_REMARK           "remark",
+               RC.CAPACITY_NUMBER                "capacityNumber"
+
+        from AMS_SALE_ORDER ASO
+                 left join AMS_SALE_ORDER_MATERIAL ASOM
+                           on asom.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+                 left join OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+                           ON OOM.ORDER_ID = OO.ORDER_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+          and OO.ORDER_TYPE = 1
+          AND OO.ORDER_STATUS = 4
+    </select>
+
+    <!--根据承运商查找发运计划-->
+    <select id="selectCokeRailPlan" resultType="java.util.Map" parameterType="java.util.Map">
+        select ARD.DAYPLAN_NO             "dayPlanNo",
+               ARD.DAYPLAN_DELIVERY_DATE  "dayPlanDeliverydate",
+               ARD.DAYPLAN_TRUCK_NUMBER   "dayTruckNumber",
+               ARD.DAYPLAN_DELIVERY_PLACE "dayPlanDeliveryPlace",
+               ARD.DAYPLAN_RECEIVE_UNIT   "dayPlanReceiveUnit",
+               RS.SHIPPER_NAME            "shipperName",
+               ARD.DAYPLAN_ID             "dayPlanId"
+        from AMSTRUCK_RAIL_DAYPLAN ARD
+                 LEFT JOIN OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = ARD.SHIPMENT_UNIT_ID
+        WHERE ARD.CARRIER_ID = #{carrierId}
+          and OO.ORDER_TYPE = #{orderType}
+          AND OO.ORDER_STATUS = 4
+    </select>
+
+
+    <!-- 根据发运计划id查找信息 -->
+    <select id="selectInfoByDayPlanId" parameterType="java.lang.Integer" resultType="java.util.Map">
+
+        select OO.ORDER_NUMBER             "orderNumber",
+               RM.MATERIAL_NAME            "materialName",
+               ARD.DAYPLAN_MATERIAL_WEIGHT "materialWeight",
+               RC.CAPACITY_NUMBER          "capacityNumber",
+               OO.INSERT_UPDATE_REMARK     "remark"
+
+
+        from AMSTRUCK_RAIL_DAYPLAN ARD
+                 left join OMSTRUCK_ORDER OO
+                           ON OO.ORDER_PLAN_ID = ARD.DAYPLAN_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = ARD.MATERIAL_ID
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        where OO.ORDER_TYPE = #{orderType}
+          and ARD.DAYPLAN_ID = #{dayPlanId}
+          AND OO.ORDER_STATUS = 4
+    </select>
+
+
+    <select id="getOrderUnReceive" resultType="java.util.Map"></select>
+
+    <!-- 车牌号下拉 -->
+    <select id="getDriverCapacity" resultType="java.util.Map">
+        SELECT RCA.CAPACITY_NUMBER    AS "label",
+               RDC.DRIVER_CAPACITY_ID AS "value"
+        FROM RMS_DRIVER_CAPACITY RDC
+                 LEFT JOIN RMS_CAPACITY RCA
+                           ON RDC.CAPACITY_ID = RCA.CAPACITY_ID
+--         WHERE RCA.CAPACITY_STATUS = 0
+    </select>
+
+    <!-- 派单信息 -->
+    <select id="getTruckNoDispatchMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT ADSO.DISPATCH_ID                  AS "dispatchId",
+               ASOM.SALE_ORDER_MATERIAL_TRUCK_NO AS "saleOrderMaterialTruckNo",
+               ASO.SALE_NUMBER                   AS "saleNumber",
+               ADSO.DISPATCH_DEAL_TIME           AS "dispatchDealTime",
+               RSH.SHIPPER_NAME                  AS "shipperName",
+               RC.CONSIGNEE_COMPANY_NAME         AS "consigneeCompanyName",
+               RRA.ADDRESS_DELIVERY_ADDRESS      AS "addressDeliveryAddress",
+               ASOM.SALE_ORDER_CONSIGNEE         AS "saleOrderConsignee",
+               ASOM.SALE_ORDER_CONSIGNEE_TEL     AS "saleOrderConsigneeTel",
+               RCA.CARRIER_NAME                  AS "carrierName"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON ASOM.SALE_SHIPPING_ADDRESS_ID = RRA.ADDRESS_ID
+                 LEFT JOIN RMS_CARRIER RCA
+                           ON RCA.CARRIER_ID = ADSO.CARRIER_ID
+        WHERE ADSO.DISPATCH_STATUS = 0
+          AND ADSO.DISPATCH_ID = #{dispatchId}
+    </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 RM.MATERIAL_NAME                               AS "materialName",
+               RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel",
+               ASTM.MATERIAL_THEORETICAL_WEIGHT               AS "materialTheoreticalWeight",
+               ASTM.SALE_ORDER_MATERIAL_NUMBER                AS "saleOrderMaterialNumber",
+               ASM.MATERIAL_ID                               AS "materialId"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+                           ON ASTM.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+                 LEFT JOIN AMS_SALE_MATERIAL ASM
+                           ON ASM.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = ASM.MATERIAL_ID
+        WHERE ADSO.DISPATCH_ID = #{dispatchId}
+    </select>
+
+
+    <!--得到销售订单与物资中间表id-->
+    <select id="getSaleMaterialId" parameterType="DECIMAL" resultType="DECIMAL">
+        SELECT ASOM.SALE_ORDER_MATERIAL_ID AS "saleOrderMaterialId"
+        FROM AMS_DISPATCH_SALE_ORDER ADSO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ADSO.SALE_ORDER_MATERIAL_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        WHERE ADSO.DISPATCH_ID = #{dispatchId}
+    </select>
+
+    <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 *
+        FROM (SELECT RC.DRIVER_CAPACITY_ID AS "driverCapacityId"
+              FROM RMS_DRIVER_CAPACITY RC
+              WHERE RC.CAPACITY_ID = #{capacityId}
+                AND DELETED = 0
+              ORDER BY RC.INSERT_TIME)
+        WHERE ROWNUM = 1
+    </select>
+
+    <select id="getUnloadPointId" parameterType="java.lang.String" resultType="DECIMAL">
+        SELECT
+            RW.WAREHOUSE_ID AS "wareHouseId"
+        FROM RMS_WAREHOUSE RW
+        WHERE RW.WAREHOUSE_NAME = #{unloadPoint}
+    </select>
+
+    <select id="getCapacityAndDriver" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT *
+        FROM (SELECT RC.CAPACITY_NUMBER AS "capacityNumber",
+        RC.CAPACITY_ID AS "carrierId"
+        FROM RMS_CAPACITY RC
+        WHERE RC.CAPACITY_STATUS = 0
+        AND RC.CAPACITY_TYPE_ID = 1
+        <if test="carrierIds != null">
+            and RC.CARRIER_ID = (select rcr.carrier_id from rms_carrier rcr where rcr.carrier_sso_id = #{carrierIds})
+        </if>
+        )
+        <where>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+    </select>
+
+    <select id="getInwardMaterial" parameterType="DECIMAL" resultType="DECIMAL">
+        SELECT ARM.MATERIAL_ID AS "materialId"
+        FROM AMSTRUCK_REQUIREMENT_PLAN ARP
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                           ON ARP.REQUIREMENT_ID = ARM.REQUIREMENT_ID
+        WHERE ARP.PLAN_ID = #{planId}
+    </select>
+
+    <!-- 查询分解运输计划 -->
+    <select id="getInwardOrderList" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT *
+        FROM (SELECT
+        OO.ORDER_NUMBER                       "orderNumber",
+        AIP.PLAN_NUMBER                    AS "planNumber",
+        RCA.CARRIER_NAME                   AS "carrierName",
+        AIP.CARRIER_ID                     AS "carrierId",
+        RC.CAPACITY_NUMBER                 AS "capacityNumber",
+        OOM.ORDER_MATERIAL_NUMBER          AS "orderMaterialNumber",
+        AIR.REQUIREMENT_NUMBER             AS "requirementNumber",
+        AIP.PLAN_ISSUE_TIME                AS "planIssueTime",
+        AIP.PLAN_ISSUE_NAME                AS "planIssueName",
+        AIR.REQUIREMENT_TYPE               AS "requirementType",
+        AIR.REQUIREMENT_TRUCK_TIME         AS "requirementTruckTime",
+        AIR.REQUIREMENT_ID                 AS "requirementId",
+        AIR.REQUIREMENT_WORK_TYPE          AS "requirementWorkType",
+        AIR.REQUIREMENT_WORK_CONTENT       AS "requirementWorkContent",
+        AIR.REQUIREMENT_WORK_ENVIRONMENT   AS "requirementWorkEnvironment",
+        AIR.REQUIREMENT_ESTIMATED_DURATION AS "requirementEstimatedDuration",
+        OO.ORDER_ID                        AS "orderId",
+        AIP.INSERT_TIME                    AS "insertTime",
+        RW.WAREHOUSE_NAME                  AS "unloadName",
+        RW1.WAREHOUSE_NAME                 AS "loadName",
+        RM.MATERIAL_NAME                   AS "materialName",
+        RC.CAPACITY_NUMBER || RM.MATERIAL_NAME || RW1.WAREHOUSE_NAME || RW.WAREHOUSE_NAME "likeCon"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_CARRIER RCA
+        ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN  RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        WHERE AIP.DELETED = 0
+        AND OO.ORDER_TYPE in (11,21,25)
+        <if test="carrierId != null">
+            AND AIP.CARRIER_ID = (select rc.carrier_id from rms_carrier rc
+            where rc.carrier_sso_id =  #{carrierId})
+        </if>
+        <if test="orderStatus != null">
+            AND OO.ORDER_STATUS = #{orderStatus}
+        </if>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.INSERT_TIME
+        </if>
+        )
+        <where>
+            <if test="con != null">
+                and "likeCon" like #{con}
+            </if>
+            <if test="materialNumber != null">
+                and
+                <foreach collection="materialNumber" item="item" open="(" separator="or" close=")">
+                    "materialNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementNumber != null">
+                and
+                <foreach collection="requirementNumber" item="item" open="(" separator="or" close=")">
+                    "requirementNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementType != null">
+                and
+                <foreach collection="requirementType" item="item" open="(" separator="or" close=")">
+                    "requirementType" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planIssueTime != null">
+                and
+                <foreach collection="planIssueTime" item="item" open="(" separator="or" close=")">
+                    "planIssueTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="planIssueName != null">
+                and
+                <foreach collection="planIssueName" item="item" open="(" separator="or" close=")">
+                    "planIssueName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementTruckTime != null">
+                and
+                <foreach collection="requirementTruckTime" item="item" open="(" separator="or" close=")">
+                    "requirementTruckTime" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementWorkType != null">
+                and
+                <foreach collection="requirementWorkType" item="item" open="(" separator="or" close=")">
+                    "requirementWorkType" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="unloadName != null">
+                and
+                <foreach collection="unloadName" item="item" open="(" separator="or" close=")">
+                    "unloadName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="loadName != null">
+                and
+                <foreach collection="loadName" item="item" open="(" separator="or" close=")">
+                    "loadName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy"></include>
+    </select>
+
+    <select id="getResultList" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID   AS "orderId",
+               OO.ORDER_TYPE AS "orderType"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_STATUS = 4
+          AND OO.ORDER_TYPE NOT IN (4, 9, 10, 11)
+          AND OO.CAPACITY_ID = #{capacityId}
+    </select>
+    <!-- 销售订单 -->
+    <select id="getSaleOrderMap" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT ASO.SALE_NUMBER              AS "saleNumber",
+               RSH.SHIPPER_NAME             AS "shipperName",
+               RC.CONSIGNEE_COMPANY_NAME    AS "consigneeCompanyName",
+               OO.ORDER_NUMBER              AS "orderNumber",
+               RCA.CAPACITY_NUMBER          AS "capacityNumber",
+               RRA.ADDRESS_DELIVERY_ADDRESS AS "addressDeliveryAddress",
+               ASOM.SALE_DATE_OF_RECEIPT    AS "saleDateOfReceipt",
+               OO.ORDER_RECEIVE_REFUSE_TIME AS "orderReceiveRefuseTime"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RC
+                           ON RC.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_CAPACITY RCA
+                           ON OO.CAPACITY_ID = RCA.CAPACITY_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+    </select>
+
+    <!-- 物资信息 -->
+    <select id="getMaterialMes" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
+        SELECT
+        RM.MATERIAL_NAME || (
+            case
+                when OOM.MATERIAL_LUNO is not null
+                     then '-' || oom.MATERIAL_LUNO
+            end
+        )
+        <if test="steelJudge != null">
+            || '   ' || RW.WAREHOUSE_NAME
+        </if>
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        OOM.SALE_MATERIAL_ID    "saleMaterialId",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+            case
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        )
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        <if test="steelJudge != null">
+            LEFT JOIN RMS_WAREHOUSE RW
+            ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+        </if>
+        WHERE ORDER_ID = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+
+
+    <!-- 物资信息（特供给已完成物资总数）-->
+    <select id="getMaterialMesForGrossWeight"  resultType="java.util.LinkedHashMap">
+        SELECT
+        RM.MATERIAL_NAME || (
+        case
+        when OOM.MATERIAL_LUNO is not null
+        then '-' || oom.MATERIAL_LUNO
+        end
+        )
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+        case
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        )
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        <if test="steelJudge != null">
+            LEFT JOIN RMS_WAREHOUSE RW
+            ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+        </if>
+        WHERE ORDER_ID = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+
+    <!-- 物资信息(NEW) -->
+    <select id="getMaterialMesNew" parameterType="DECIMAL" resultType="java.util.LinkedHashMap">
+        SELECT
+        RM.MATERIAL_NAME
+        <if test="steelJudge != null">
+            || '   ' || RW.WAREHOUSE_NAME ||
+            AMS.STEEL_METER||'米'
+        </if>
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件'
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        )
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        <if test="steelJudge != null">
+            LEFT JOIN RMS_WAREHOUSE RW
+            ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+            LEFT JOIN OMSTRUCK_ORDER OO
+            ON OO.ORDER_ID=OOM.ORDER_ID
+            LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+            ON ASTM.SALE_ORDER_MATERIAL_ID=OO.ORDER_PLAN_ID
+            LEFT JOIN AMS_SALE_MATERIAL AMS
+            ON AMS.SALE_MATERIAL_ID=ASTM.MATERIAL_ID
+        </if>
+        WHERE OOM.ORDER_ID = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+
+    <!--根据ID查询-->
+    <select id="getMaterialId" resultType="java.util.Map">
+        select
+        distinct
+        AMS.MATERIAL_ID "materialId",
+        AMS.STEEL_METER "steelmeter"
+        from OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN AMS_SALE_TRUCKNO_MATERIAL ASTM
+        ON ASTM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_MATERIAL AMS
+        ON AMS.SALE_MATERIAL_ID = ASTM.MATERIAL_ID
+        WHERE OOM.ORDER_ID=#{orderId}
+        and AMS.SALE_MATERIAL_ID IS NOT NULL
+        and AMS.DELETED IS NULL
+    </select>
+    <!-- 内转原料司机接单 -->
+    <select id="getInwardOrderMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT AIR.REQUIREMENT_NUMBER AS "upNumber",
+               OO.ORDER_NUMBER        AS "orderNumber",
+               RC.CAPACITY_NUMBER     AS "capacityNumber",
+               RCA.CARRIER_NAME       AS "carrierName",
+               AIR.INSERT_UPDATE_REMARK "insertUpdateRemark"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                           ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON ARP.PLAN_ID = AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                 LEFT JOIN RMS_CARRIER RCA
+                           ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 内转钢材到异地库 -->
+    <select id="getSteelInwardOrderMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT AROD.DAYPLAN_NO    AS "upNumber",
+               OO.ORDER_NUMBER    AS "orderNumber",
+               RC.CAPACITY_NUMBER AS "capacityNumber",
+               RCA.CARRIER_NAME   AS "carrierName"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+                 LEFT JOIN AMS_RAIL_OFFSET_DAYPLAN AROD
+                           ON AROD.DAYPLAN_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_CARRIER RCA
+                           ON RCA.CARRIER_ID = AROD.CARRIER_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+    <select id="selectCapacityNumber" resultType="java.lang.String">
+        select rc.capacity_number
+        from omstruck_order oo
+                 left join rms_capacity rc
+                           on rc.capacity_id = OO.CAPACITY_ID
+        where oo.order_id = #{orderId}
+    </select>
+    <select id="selectOrderType" resultType="java.math.BigDecimal">
+
+    </select>
+    <select id="selectOrderId" resultType="java.math.BigDecimal">
+        select oo.order_id
+        from omstruck_order oo
+        where oo.CAPACITY_ID = #{dcId}
+          and oo.order_status = 3
+    </select>
+
+    <!-- 销售的运输订单 -->
+    <select id="getSaleMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID                  AS "orderId",
+               OO.ORDER_TYPE                AS "orderType",
+               OO.ORDER_NUMBER              AS "orderNumber",
+               RC.CAPACITY_NUMBER           AS "capacityNumber",
+               RSH.SHIPPER_NAME             AS "shipperName",
+               RCO.CONSIGNEE_COMPANY_NAME   AS "consigneeCompanyName",
+               RRA.ADDRESS_DELIVERY_ADDRESS AS "addressDeliveryAddress",
+               ASOM.SALE_DATE_OF_RECEIPT    AS "saleDateOfReceipt"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                 LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+                           ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMS_SALE_ORDER ASO
+                           ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = ASO.SHIPPER_ID
+                 LEFT JOIN RMS_CONSIGNEE RCO
+                           ON RCO.CONSIGNEE_ID = ASO.RECEIVE_ID
+                 LEFT JOIN RMS_RECEIVE_ADDRESS RRA
+                           ON RRA.ADDRESS_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 内转钢材的运输订单 -->
+    <select id="getSteelInwardMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID        AS "orderId",
+               OO.ORDER_TYPE      AS "orderType",
+               OO.ORDER_NUMBER    AS "orderNumber",
+               RC.CAPACITY_NUMBER AS "capacityNumber"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 采购的运输订单 -->
+    <select id="getPurchaseMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID        AS "orderId",
+               OO.ORDER_TYPE      AS "orderType",
+               OO.ORDER_NUMBER    AS "orderNumber",
+               RC.CAPACITY_NUMBER AS "capacityNumber",
+               RSU.SUPPLIER_NAME  AS "loadPoint",
+               RSH.SHIPPER_NAME   AS "unloadPoint"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                 LEFT JOIN AMS_PURCHASE_ORDER APO
+                           ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN RMS_SUPPLIER RSU
+                           ON RSU.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+                 LEFT JOIN RMS_SHIPPER RSH
+                           ON RSH.SHIPPER_ID = APO.PURCHASING_ORGANIZATION_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 内转的运输订单 -->
+    <select id="getInwardMap" parameterType="DECIMAL" resultType="java.util.Map">
+        SELECT OO.ORDER_ID             AS "orderId",
+               OO.ORDER_TYPE           AS "orderType",
+               OO.ORDER_NUMBER         AS "orderNumber",
+               RC.CAPACITY_NUMBER      AS "capacityNumber",
+               RWLOAD.WAREHOUSE_NAME   AS "loadPoint",
+               RWUNLOAD.WAREHOUSE_NAME AS "unloadPoint"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID = RC.CAPACITY_ID
+                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                           ON AIP.PLAN_ID = OO.ORDER_PLAN_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON ARP.PLAN_ID = AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+                 LEFT JOIN RMS_WAREHOUSE RWLOAD
+                           ON RWLOAD.WAREHOUSE_ID = AIR.REQUIREMNT_UNIT_ID
+                 LEFT JOIN RMS_WAREHOUSE RWUNLOAD
+                           ON RWUNLOAD.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!-- 判断是走采购，销售还是内转 -->
+    <select id="getResultListByCapacity" parameterType="java.lang.String" resultType="java.util.Map">
+        SELECT OO.ORDER_ID   AS "orderId",
+               OO.ORDER_TYPE AS "orderType"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+          AND OO.ORDER_STATUS = 4
+    </select>
+
+    <!--  通过运输订单号查询运输订单ID  -->
+    <select id="getOrderIdByOrderNumber" parameterType="string" resultType="java.lang.Integer">
+        select OO.ORDER_ID
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_NUMBER = #{orderNumber} AND OO.ORDER_STATUS=5
+        FETCH NEXT 1 ROWS ONLY
+    </select>
+
+    <!--   查询采购运输订单给APP 5 6 7 8 -->
+    <select id="getCGOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT OO.ORDER_ID        "orderId",
+        OO.ORDER_NUMBER    "orderNumber",
+        OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RS.SUPPLIER_NAME   "shipperName",
+        RCON.CONSIGNEE_COMPANY_NAME  "consigneeCompanyName",
+        RW.WAREHOUSE_NAME  "unloadName",
+        OO.ORDER_TYPE      "orderType",
+        RW2.WAREHOUSE_NAME "loadName",
+        (case when APO.PURCHASING_ORGANIZATION_ID = 1
+        then '一厂'
+        when APO.PURCHASING_ORGANIZATION_ID = 2
+        then '二厂'
+        end) "organizationCode"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+        left join RMS_WAREHOUSE RW2
+        ON RW2.WAREHOUSE_ID=OO.DRIVER_CONFIRMATION
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RCON
+        ON RCON.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+
+    <!--查询采购零星物资信息给app 12 -->
+    <select id="getSporadicOrder" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT  OO.ORDER_ID        "orderId",
+        OO.ORDER_NUMBER    "orderNumber",
+        OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        OO.ORDER_TYPE      "orderType",
+        RS.SUPPLIER_NAME  "shipperName",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        left join AMSTRUCK_SPORADIC_ORDER ASO
+        ON ASO.SPORADIC_ORDER_ID=OO.ORDER_PLAN_ID
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID=ASO.SEND_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RC2
+        ON RC2.CONSIGNEE_ID=ASO.RECEIVE_UNIT_ID
+        WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+
+    <!--  查询内转运输订单给APP 9 10 11-->
+    <select id="getNZOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT OO.ORDER_ID "orderId",
+        OO.ORDER_NUMBER "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RW.WAREHOUSE_NAME "unloadName",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_STATUS "orderStatus",
+        RS.SUPPLIER_NAME "shipperName",
+        RCG.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        APO.PURCHASING_ORGANIZATION_ID "organizationId",
+        DB.RESULT_FOREIGN_SHIP_NAME "shipName",
+        RW1.WAREHOUSE_NAME      "loadName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        LEFT JOIN DIL_BATCH DB
+        ON DB.BATCH_ID = APO.BATCH_ID
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RCG
+        ON RCG.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = air.requirement_unload_unit_id
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = AIR.REQUIREMENT_PLATFORM_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+        <if test="orderStatus == 4">
+            AND AIP.PLAN_EABLE_STATUS = 1
+        </if>
+    </select>
+    <!--  查询发运计划运输订单给APP  2 3 4 -->
+    <select id="getFYJHOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT OO.ORDER_ID        "orderId",
+        OO.ORDER_TYPE      "orderType",
+        OO.ORDER_LINE_SEQUENCE   "orderLineSequence",
+        OO.ORDER_NUMBER    "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RS.SHIPPER_NAME    "loadName",
+        RW.WAREHOUSE_NAME  "unloadName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        on ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO
+        ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = OO.UNLOAD_POINT_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status != null">
+            AND OO.ORDER_STATUS = 2
+        </if>
+    </select>
+    <!--  查询销售运输订单给APP 1 -->
+    <select id="getXSOrderMessageToApp" parameterType="java.util.Map" resultType="java.util.Map">
+        SELECT
+        OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+        CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),
+        RDA.ADDRESS_DELIVERY_ADDRESS ) "receiveAddressName",
+        ASM.SALE_WAREHOUSE "remark",
+        ASO.SALE_REMARK     "shipName"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN AMS_SALE_MATERIAL ASM ON ASM.SALE_ORDER_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+
+
+    <!--  通过运输订单号查询订单类型  -->
+    <select id="getOrderTypeByOrderNumber" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        SELECT OO.ORDER_TYPE
+        FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  通过车牌匹配所有已下发的 的订单Id -->
+    <select id="getOrderIdListByCapacityNumber" parameterType="string" resultType="java.util.LinkedHashMap">
+        SELECT OO.ORDER_ID "orderId",
+               OO.ORDER_TYPE  "orderType"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+          AND OO.ORDER_STATUS = 4
+        ORDER BY OO.ORDER_ID DESC
+    </select>
+
+    <!--  根据车牌号匹配所有已接收的运输订单Id  -->
+    <select id="getReceiveOrderIdListByCapacityNum" parameterType="string" resultType="java.lang.Integer">
+        SELECT OO.ORDER_ID
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        WHERE RC.CAPACITY_NUMBER = #{capacityNumber}
+          AND OO.ORDER_STATUS in (0, 1, 5)
+    </select>
+
+    <!--    通过车牌号查询运输订单号和运输订单ID  -->
+    <select id="getAllRefuseOrderNumberByCapacity" parameterType="string" resultType="java.util.Map">
+        select OO.ORDER_ID     "orderId",
+               OO.ORDER_NUMBER "orderNumber"
+        from OMSTRUCK_ORDER OO
+                 left join RMS_CAPACITY RC
+                           on RC.CAPACITY_ID = OO.CAPACITY_ID
+        where RC.CAPACITY_NUMBER = #{capacityNumber}
+          AND OO.ORDER_STATUS = 6
+    </select>
+
+    <!--   通过订单号或订单ID查询订单类型 -->
+    <select id="getOrderTypeByOrderId" parameterType="map" resultType="java.lang.Integer">
+        select ORDER_TYPE
+        from OMSTRUCK_ORDER
+        where ORDER_ID = #{orderId}
+    </select>
+
+
+    <select id="getCarrierIdBySSO" parameterType="java.lang.String" resultType="DECIMAL" >
+        SELECT
+            RC.CARRIER_ID AS "carrierId"
+        FROM RMS_CARRIER RC
+        WHERE RC.CARRIER_SSO_ID = #{carrierSsoId}
+    </select>
+
+    <select id="getOrderMaterialList" parameterType="DECIMAL" resultType="java.util.Map" >
+        SELECT
+            OOM.MATERIAL_ID AS "materialId",
+            RM.MATERIAL_NAME AS "materialName",
+            OOM.ORDER_MATERIAL_WEIGHT AS "materialWeight",
+            OOM.ORDER_MATERIAL_NUMBER AS "materialNumber",
+            RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL AS "specificationModel"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE OOM.ORDER_ID = #{orderId}
+    </select>
+
+    <select id="getSporadicOrderTimes" resultType="java.util.Map">
+        select aso.sporadic_order_times "orderTimes",
+               aso.SPORADIC_TRANS_TIMES "transTimes"
+        from OMSTRUCK_ORDER oo
+                 left join  AMSTRUCK_SPORADIC_ORDER  aso
+                            on oo.ORDER_PLAN_ID=aso.sporadic_order_id
+        where oo.order_id= #{orderId}
+    </select>
+
+    <select id="getAllResultId" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+        SELECT  DISTINCT TTR.RESULT_TOTAL_ID "resultTotalId",
+                         TWR.WEIGHT_TASK_RESULT_ID "weightResultId",
+                         TLR.RESULT_ID "loadResultId",
+                         TLFR.RESULT_ID "leaveResultId",
+                         TUR.RESULT_ID "unloadResultId",
+                         TER.RESULT_ID "enFactoryId"
+        FROM OMSTRUCK_ORDER OO
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON OO.ORDER_ID=TTR.ORDER_ID
+                 LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                           ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                           ON  TTR.RESULT_TOTAL_ID= TLR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+                           ON TLFR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_UNLOAD_RESULT TUR
+                           ON TUR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+                           ON TER.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        where OO.ORDER_ID=#{orderId}
+    </select>
+
+
+    <!--  查询订单是否确认  -->
+    <select id="getDriverConfirmation" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+        select OO.DRIVER_CONFIRMATION
+        from OMSTRUCK_ORDER OO
+        where OO.ORDER_ID = #{orderId}
+    </select>
+
+    <!--  查看当前订单最大路段顺序号  -->
+    <select id="getMaxLineSeqByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        select OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+               (select max(RLS.SEGMENT_SQE)
+                from RMS_LINE_SEGEMNT RLS
+                where RLS.LINE_ID = RL.LINE_ID
+               )    "segmentSqe"
+        from OMSTRUCK_ORDER OO
+                 join RMS_LINE RL
+                      on RL.LINE_ID = OO.LINE_ID
+        where OO.ORDER_ID = #{orderId}
+    </select>
+    <select id="getSporadicOrdermapAddOrder" resultType="java.util.Map">
+        select aso.sporadic_order_times "sporadicOrderTimes",
+               aso.SPORADIC_ORDER_ID "sporadicOrderId",
+               oo.CAPACITY_ID "capacityId",
+               ASO.TRANS_STATUS "transStatus"
+        from OMSTRUCK_ORDER oo
+                 left join  AMSTRUCK_SPORADIC_ORDER  aso
+                            on oo.ORDER_PLAN_ID=aso.sporadic_order_id
+        where oo.order_id= #{orderId}
+    </select>
+
+    <select id="getIsSteel" parameterType="DECIMAL" resultType="DECIMAL">
+        SELECT RL.IS_STEEL AS "isSteel"
+        FROM RMS_LINE RL
+        WHERE RL.LINE_ID = #{lineId}
+    </select>
+    <!--    采购内转运输订单-->
+    <select id="getPurInwardOrderList" resultType="java.util.Map">
+        SELECT * FROM (
+        SELECT APO.PURCHASE_ORDER_NO      AS "purchaseOrderNo",
+        RM.MATERIAL_NAME           AS "materialName",
+        RCA.CARRIER_NAME           AS "carrierName",
+        RC.CAPACITY_NUMBER         AS "capacityNumber",
+        AIR.REQUIREMENT_NUMBER     AS "requirementNumber",
+        RW.WAREHOUSE_NAME          AS "wareHouseName",
+        OO.ORDER_ID                AS "orderId",
+        RS.SUPPLIER_NAME           AS "supplierName",
+        RCE.CONSIGNEE_COMPANY_NAME AS "consigneeName",
+        OO.ORDER_NUMBER            AS "orderNo",
+        DB.RESULT_FOREIGN_SHIP_NAME AS "shipName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN AMS_PURCHASE_ORDER APO
+        ON APO.PURCHASE_ORDER_ID = AIR.PURCHASE_ORDER_ID
+        LEFT JOIN DIL_BATCH DB
+        ON APO.BATCH_ID = DB.BATCH_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = AIR.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_CARRIER RCA
+        ON RCA.CARRIER_ID = AIP.CARRIER_ID
+        LEFT JOIN RMS_SUPPLIER RS
+        ON RS.SUPPLIER_ID = APO.SUPPLIER_UNIT_ID
+        LEFT JOIN RMS_CONSIGNEE RCE
+        ON RCE.CONSIGNEE_ID = APO.RECEIVE_UNIT_ID
+        WHERE AIP.DELETED = 0
+        AND OO.ORDER_TYPE IN (10,20,15,16,23,24)
+        AND OO.ORDER_STATUS = #{orderStatus}
+        <if test="carrierId !=null">
+            AND AIP.CARRIER_ID = (SELECT RCR.CARRIER_ID FROM RMS_CARRIER RCR WHERE RCR.CARRIER_SSO_ID = #{carrierId})
+        </if>
+        <if test="planEnableStatus !=null">
+            AND AIP.PLAN_EABLE_STATUS = 1
+        </if>
+        <if test="con!=null and con!=''.toString()">
+            AND APO.PURCHASE_ORDER_NO || RC.CAPACITY_NUMBER LIKE CONCAT('%',CONCAT(#{con},'%'))
+        </if>
+        <if test="userId!=null">
+            AND OO.OPTIONER_CODE LIKE CONCAT('%',CONCAT(#{userId},'%'))
+        </if>
+        ORDER BY OO.INSERT_TIME DESC
+        )
+
+        <where>
+            <if test="shipName != null">
+                and
+                <foreach collection="shipName" item="item" open="(" separator="or" close=")">
+                    "shipName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="purchaseOrderNo != null">
+                and
+                <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
+                    "purchaseOrderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="orderNo != null">
+                and
+                <foreach collection="orderNo" item="item" open="(" separator="or" close=")">
+                    "orderNo" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="materialName != null">
+                and
+                <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+                    "materialName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="carrierName != null">
+                and
+                <foreach collection="carrierName" item="item" open="(" separator="or" close=")">
+                    "carrierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="capacityNumber != null">
+                and
+                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+                    "capacityNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="requirementNumber != null">
+                and
+                <foreach collection="requirementNumber" item="item" open="(" separator="or" close=")">
+                    "requirementNumber" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="warehouseName != null">
+                and
+                <foreach collection="warehouseName" item="item" open="(" separator="or" close=")">
+                    "wareHouseName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="supplierName != null">
+                and
+                <foreach collection="supplierName" item="item" open="(" separator="or" close=")">
+                    "supplierName" like '%${item}%'
+                </foreach>
+            </if>
+            <if test="consigneeName != null">
+                and
+                <foreach collection="consigneeName" item="item" open="(" separator="or" close=")">
+                    "consigneeName" like '%${item}%'
+                </foreach>
+            </if>
+        </where>
+        <include refid="orderBy">
+        </include>
+    </select>
+
+    <!--删除计重实绩id-->
+    <delete id="deleteWeightResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_WEIGHT_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <!-- 删除装车实绩   -->
+    <delete id="deleteLoadResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_LOAD_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+
+    <!--  删除出厂实绩-->
+    <delete id="deleteLeaveResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_LEAVE_FACTORY_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+
+    <!--删除卸货实绩-->
+    <delete id="deleteUnloadResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_UNLOAD_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <!--删除进厂实绩-->
+    <delete id="deleteEnResult" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_ENFACTORY_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <delete id="deleteTimeTaskByTotalId" parameterType="java.math.BigDecimal">
+        delete from TMSTRUCK_TIME_TASK_RESULT
+        where RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <!--根据订单id查询运输订单信息-->
+    <select id="selectOrderMap" resultType="java.util.Map" parameterType="DECIMAL">
+        select oo.order_plan_id "planId",
+               oo.capacity_id   "capacityId",
+               oo.order_type    "orderType",
+               oo.line_id       "lineId",
+               oom.material_id  "materialId"
+        from omstruck_order oo
+                 left join omstruck_order_material oom
+                           on oom.order_id = oo.order_id
+        where oo.order_id = #{orderId}
+    </select>
+
+    <!--  通过定向派单ID查询车序号表中的priceId  -->
+    <select id="getPriceIdByDispatchId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
+        select ASOM.PRICE_ID
+        from AMS_DISPATCH_SALE_ORDER ADSO
+                 left join AMS_SALE_ORDER_MATERIAL ASOM
+                           on ASOM.SALE_ORDER_MATERIAL_ID = ADSO.SALE_ORDER_MATERIAL_ID
+        where ADSO.DISPATCH_ID  = #{dispatchId}
+    </select>
+    <select id="getInwardOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DISTINCT
+        OO.ORDER_ID            "orderId",
+        OO.ORDER_NUMBER        "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER     "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        OO.ORDER_TYPE          "orderType",
+        OO.ORDER_STATUS        "orderStatus",
+        RS.SHIPPER_NAME        "shipperUnitName",
+        AIR.REQUIREMENT_ID     "requirementId",
+        AIR.DUE_DATE             "saleDateOfReceipt",
+        AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
+        AIR.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        RW1.WAREHOUSE_NAME       "shipperName",
+        RW1.WAREHOUSE_NAME       "loadName",
+        RW.WAREHOUSE_NAME        "unloadName",
+        RW.WAREHOUSE_NAME        "consigneeCompanyName",
+        OO.DELETED              "deleted"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        where oo.order_id = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+    <!-- 根据运输订单id查找需求日期 -->
+    <select id="selectInwardTimeByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+        select AIR.DUE_DATE  "dueTime",
+               OO.ORDER_TYPE "orderType",
+               aip.PLAN_EABLE_STATUS "planEnableStatus"
+        from OMSTRUCK_ORDER OO
+                 left join AMSTRUCK_INWARD_PLAN AIP
+                           on AIP.PLAN_ID=OO.ORDER_PLAN_ID
+                 left join AMSTRUCK_REQUIREMENT_PLAN ARP
+                           on ARP.PLAN_ID=AIP.PLAN_ID
+                 left join AMSTRUCK_INWARD_REQUIREMENT AIR
+                           on AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
+        where OO.ORDER_ID=#{orderId}
+    </select>
+    <select id="getTimeTaskEndDetail" resultType="java.util.Map" parameterType="java.util.Map">
+        select RC.CAPACITY_NUMBER "capacityNumber",
+               OO.ORDER_NUMBER "orderNumber",
+               RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+               TTTR.INSERT_TIME "insertTime",
+               (
+                   SELECT TTTR2.RESULT_TIME
+                   FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                   WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                     AND TTTR2.RESULT_TIME_TYPE = 1
+               ) "startTime",
+               (
+                   SELECT TTTR2.RESULT_TIME
+                   FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                   WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                     AND TTTR2.RESULT_TIME_TYPE = 3
+               ) "endTime",
+               ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
+               RM.MATERIAL_NAME "materialName",
+               RS.SHIPPER_NAME "shipperUnitName",
+               RW.WAREHOUSE_NAME "unloadName",
+               RW2.WAREHOUSE_NAME "loadName"
+        from OMSTRUCK_ORDER OO
+                 LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+                           ON AIP.PLAN_ID=OO.ORDER_PLAN_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+                           ON ARP.PLAN_ID=AIP.PLAN_ID
+                 LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+                           ON AIR.REQUIREMENT_ID=ARP.REQUIREMENT_ID
+                 LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+                           ON ARM.REQUIREMENT_ID=AIR.REQUIREMENT_ID
+                 LEFT JOIN RMS_WAREHOUSE RW
+                           ON ARM.REQUIREMENT_UNLOAD_UNIT_ID =RW.WAREHOUSE_ID
+                 LEFT JOIN RMS_WAREHOUSE RW2
+                           ON RW2.WAREHOUSE_ID=ARM.REQUIREMENT_PLATFORM_ID
+                 LEFT JOIN RMS_MATERIAL RM
+                           ON RM.MATERIAL_ID=ARM.MATERIAL_ID
+                 LEFT JOIN RMS_SHIPPER RS
+                           ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                           ON TTR.ORDER_ID=OO.ORDER_ID
+                 LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+                           ON  TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
+                 LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
+                           ON TTTR.RESULT_UOM_ID=RUOM.UNIT_OF_MEASURE_ID
+                 LEFT JOIN  RMS_CAPACITY RC
+                            ON RC.CAPACITY_ID=OO.CAPACITY_ID
+                 LEFT JOIN RMS_CAPACITY_TYPE RCT
+                           ON RCT.CAPACITY_TYPE_ID=RC.CAPACITY_TYPE_ID
+        where OO.ORDER_ID= #{orderId}  AND   TTTR.RESULT_VALUE IS NOT NULL and TTTR.RESULT_TIME_TYPE = 3
+    </select>
+    <select id="getInwardTimeOrderMessageToApp" resultType="java.util.Map">
+        SELECT DISTINCT
+        OO.ORDER_ID            "orderId",
+        OO.ORDER_NUMBER        "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER     "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        OO.ORDER_TYPE          "orderType",
+        OO.ORDER_STATUS        "orderStatus",
+        RS.SHIPPER_NAME        "shipperUnitName",
+        AIR.REQUIREMENT_ID     "requirementId",
+        AIR.DUE_DATE             "saleDateOfReceipt",
+        AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime",
+        RW1.WAREHOUSE_NAME       "shipperName",
+        RW1.WAREHOUSE_NAME       "loadName",
+        RW.WAREHOUSE_NAME        "unloadName",
+        RW.WAREHOUSE_NAME        "consigneeCompanyName",
+        AIR.INSERT_UPDATE_REMARK "insertUpdateRemark",
+        (
+        SELECT TTTR2.RESULT_TIME
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 1
+        ) "startTime",
+        (
+        SELECT TTTR2.RESULT_TIME
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 3
+        ) "endTime",
+        (
+        SELECT TTTR2.RESULT_VALUE
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 3
+        ) "totalTime",
+        (
+        SELECT TTTR2.RESULT_ABOUT_TIME
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+        WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        AND TTTR2.RESULT_TIME_TYPE = 3
+        ) "aboutTime"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID=OO.ORDER_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+
+        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+        ON TTTR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_UNIT_OF_MEASURE RUOM
+        ON RUOM.UNIT_OF_MEASURE_ID=TTTR.RESULT_UOM_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        where oo.order_id = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+    <select id="getPauseTimeTaskDetail" resultType="java.util.Map" parameterType="java.lang.Integer">
+        select  (
+                    SELECT TTTR2.RESULT_TIME
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 1
+                ) "startTime",
+                (
+                    SELECT TTTR2.RESULT_TIME
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 3
+                ) "endTime",
+                (
+                    SELECT TTTR2.RESULT_VALUE
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 3
+                ) "totalTime",
+                (
+                    SELECT TTTR2.RESULT_VALUE
+                    FROM TMSTRUCK_TIME_TASK_RESULT TTTR2
+                    WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                      AND TTTR2.RESULT_TIME_TYPE = 7
+                ) "pauseTime"
+        from OMSTRUCK_ORDER OO
+                 left join TMSTRUCK_TOTAL_RESULT TTR
+                           ON OO.ORDER_ID=TTR.ORDER_ID
+                 LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+                           ON TTR.RESULT_TOTAL_ID =TTTR.RESULT_TOTAL_ID
+        WHERE  OO.ORDER_ID = #{orderId}
+    </select>
+
+    <select id="getInwardOrderMessage" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        OO.ORDER_ID "orderId",
+        ( SELECT TTTR2.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR2 WHERE TTTR2.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR2.RESULT_TIME_TYPE = 1 ) "startTime",
+        ( SELECT TTTR3.RESULT_TIME FROM TMSTRUCK_TIME_TASK_RESULT TTTR3 WHERE TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR3.RESULT_TIME_TYPE = 3 ) "endTime",
+        ( SELECT TTTR4.RESULT_VALUE FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "time",
+        ( SELECT  CONCAT( TTTR.RESULT_VALUE, RUOM.UNIT_OF_MEASURE_NAME ) FROM TMSTRUCK_TIME_TASK_RESULT TTTR4 WHERE TTTR4.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID AND TTTR4.RESULT_TIME_TYPE = 3 ) "resultTime",
+        RM.MATERIAL_NAME "materialName"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR ON TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_UNIT_OF_MEASURE RUOM ON TTTR.RESULT_UOM_ID = RUOM.UNIT_OF_MEASURE_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+    <select id="getTimeTaskByTotalId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        select COUNT(*)
+        from TMSTRUCK_TOTAL_RESULT TTR
+                 LEFT JOIN TMSTRUCK_TIME_TASK_RESULT TTTR
+                           ON TTR.RESULT_TOTAL_ID=TTTR.RESULT_TOTAL_ID
+        WHERE TTR.RESULT_TOTAL_ID=#{resultTotalId} and TTTR.RESULT_TIME_TYPE=1
+    </select>
+
+    <select id="getSteelOrderMessageToApp" parameterType="map" resultType="map">
+        SELECT
+        OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderType",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        OO.ORDER_NUMBER "orderNumber",
+        CASE
+        WHEN TEMP."orderId" IS NOT NULL
+        THEN RC.CAPACITY_NUMBER || '('|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':未轧' ||')'
+        WHEN TEMP."orderId" IS NULL
+        THEN RC.CAPACITY_NUMBER || '('|| decode(ASO.SALE_ORDER_STATUS,4,'订单已审核','订单未审核') || ':已轧' || ')'
+        END
+        "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+        ASOM.SALE_DATE_OF_RECEIPT "saleDateOfReceipt",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
+        CONCAT(CONCAT( CONCAT( CONCAT( RDA.ADDRESS_PROVINCE, RDA.ADDRESS_DISTRICT ), RDA.ADDRESS_TOWN ),RDA.ADDRESS_DELIVERY_ADDRESS ),RRP.ADDRESS_DELIVERY_ADDRESS) "receiveAddressName",
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.CAN_WORK "canWork",
+        OO.ORDER_STATUS "orderStatus",
+        ASO.SALE_ORDER_ID   "saleOrderId",
+        OO.DELETED  "orderDeleted",
+        OO.UPDATE_USERNAME "deleteReason",
+        OO.PRINTNUMBER "printNumber"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN (
+        select OO.ORDER_ID "orderId"
+        from OMSTRUCK_ORDER OO
+        left join OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID=OOM.ORDER_ID
+        left join RMS_MATERIAL RM ON OOM.MATERIAL_ID = RM.MATERIAL_ID
+        where OO.ORDER_STATUS between 4 and 5
+        and (OOM.MATERIAL_PRIORITY !=71 OR OOM.MATERIAL_PRIORITY is null)
+        and
+        RM.MATERIAL_ID||'' in (select SPECTIONS_MODEL from QMS_MODEL_UNROOLED)
+        ) TEMP ON TEMP."orderId"=OO.ORDER_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS between 4 and 6
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+        <if test="status == 333">
+            AND OO.ORDER_STATUS in (4, 5)
+        </if>
+    </select>
+    <select id="getLoadForLoadCarResult" resultType="java.util.Map" parameterType="java.util.Map">
+        select *
+        from(select
+                 COUNT(RC.CAPACITY_NUMBER) "number",
+                 sum(TWR.RESULT_NET_WEIGHT) "netWeight",
+                 TLR.CAPACITY_REMARK "LoaderCapacityNumber"
+             from OMSTRUCK_ORDER OO
+                      LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                                ON TTR.ORDER_ID=OO.ORDER_ID
+                      LEFT JOIN RMS_CAPACITY RC
+                                ON RC.CAPACITY_ID=OO.CAPACITY_ID
+                      LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+                                ON TLR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+                      LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+                                ON TWR.RESULT_TOTAL_ID=TTR.RESULT_TOTAL_ID
+             where TLR.CAPACITY_REMARK IS NOT NULL and TLR.CAPACITY_REMARK=#{userName}
+               and TLR.RESULT_LOAD_END_TIME >= to_date(#{limitTime}, 'yyyy-mm-dd')
+             GROUP BY TLR.CAPACITY_REMARK
+            )
+    </select>
+
+    <select id="getLineSeq" parameterType="DECIMAL" resultType="DECIMAL" >
+        SELECT OO.ORDER_LINE_SEQUENCE AS "orderLineSequence"
+        FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+
+    <select id="getCapacityNumberByCapacityId" parameterType="java.math.BigDecimal" resultType="java.lang.String">
+        select CAPACITY_NUMBER from RMS_CAPACITY  where CAPACITY_ID = #{capacityId}
+    </select>
+
+    <select id="getDriverInfoForSale2" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT DISTINCT OO.ORDER_NUMBER AS "orderNumber",
+        RCC.CAPACITY_NUMBER AS "capacityNumber",
+        TWR.RESULT_NET_WEIGHT AS "netWeight",
+        TWR.RESULT_TARE_WEIGHT AS "tareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME AS "tareTime",
+        TWR.RESULT_GROSS_WEIGHT_TIME AS "grossTime",
+        TWR.RESULT_GROSS_WEIGHT AS "grossWeight",
+        RTCT.TRUCK_CALCULATE_NUMBER AS "tareCalculate",
+        RTCG.TRUCK_CALCULATE_NUMBER AS "grossCalculate",
+        TER.RESULT_ENTRY_GATE_TIME AS "enGateTime",
+        TLFR.RESULT_OUT_GATE_TIME AS "outGateTime",
+        TLR.RESULT_LOAD_START_TIME AS "loadTime",
+        RWA.WAREHOUSE_NAME AS "warehouse",
+        RM.MATERIAL_NAME AS "materialName",
+        OOM.ORDER_MATERIAL_WEIGHT AS "materialWeight",
+        RGE.GATEPOST_NAME AS "enGatepost",
+        RGL.GATEPOST_NAME AS "outGatepost",
+        OO.ORDER_STATUS AS "orderStatus",
+        ASO.DELETED AS "deleted",
+        OO.ORDER_LINE_SEQUENCE AS "lineSequence",
+        oo.ORDER_ID "orderId"
+        FROM AMS_SALE_ORDER ASO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_PLAN_ID = ASOM.SALE_ORDER_MATERIAL_ID
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RCC
+        ON RCC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTCT
+        ON RTCT.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        LEFT JOIN RMS_TRUCK_CALCULATE RTCG
+        ON RTCG.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RGE
+        ON RGE.GATEPOST_ID = TER.GATEPOST_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_WAREHOUSE RWA
+        ON RWA.WAREHOUSE_ID = TLR.LOADING_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN RMS_GATEPOST RGL
+        ON RGL.GATEPOST_ID = TLFR.GATEPOST_ID
+        LEFT JOIN TMSTRUCK_RECEIPT_RESULT TRR
+        ON TRR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        WHERE ASO.SALE_ORDER_ID = #{saleOrderId}
+        AND OO.ORDER_STATUS IS NOT NULL
+        AND OO.ORDER_TYPE IN (1,2)
+        <if test="con != null">
+            AND RCC.CAPACITY_NUMBER LIKE #{con}
+        </if>
+        ORDER BY OO.ORDER_NUMBER DESC
+    </select>
+
+    <select id="getTransportOrder" resultType="java.util.Map" parameterType="java.util.Map">
+        select  OO.DRIVER_CONFIRMATION "loadName",
+                RC.CAPACITY_NUMBER   "capacityNumber",
+                OO.ORDER_NUMBER  "orderNumber",
+                OO.ORDER_RECEIVE_REFUSE_TIME "receiveTime"
+        from OMSTRUCK_ORDER OO
+                 LEFT JOIN RMS_CAPACITY RC
+                           ON OO.CAPACITY_ID=RC.CAPACITY_ID
+        where  OO.ORDER_ID=#{orderId} and OO.ORDER_STATUS = #{orderStatus}
+    </select>
+
+   <!-- 判断是否为达钢厂区内转-->
+    <select id="isInwardLine" resultType="java.util.Map" parameterType="java.math.BigDecimal">
+     select RTR.TRANS_RANGE_VALUE "rangeValue"
+      from OMSTRUCK_ORDER OO
+     LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+     ON OO.ORDER_PLAN_ID =AIP.PLAN_ID
+     LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN  ARP
+     ON AIP.PLAN_ID =ARP.PLAN_ID
+     LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+     ON AIR.REQUIREMENT_ID =ARP.REQUIREMENT_ID
+     left join RMS_TRANS_RANGE RTR
+     ON AIR.LINE_ID = RTR.TRANS_RANGE_ID
+     WHERE  OO.ORDER_ID =#{orderId}
+    </select>
+
+    <select id="canCapacityEnfactory" parameterType="java.util.Map" resultType="java.lang.String">
+        SELECT * FROM (
+        SELECT
+        TER.INSERT_UPDATE_REMARK AS "isOk"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        <where>
+            <if test="orderId != null">
+                AND OO.ORDER_ID = #{orderId}
+            </if>
+            <if test="orderNumber != null">
+                AND OO.ORDER_NUMBER = #{orderNumber}
+            </if>
+        </where>)
+        WHERE ROWNUM = 1
+    </select>
+
+    <select id="getWarehouseMes" parameterType="java.util.Map" resultType="java.util.Map" >
+        SELECT DISTINCT * FROM (
+        SELECT OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        OO.ORDER_ID "orderId",
+        WOR.RESULT_ID "outboudId",
+        WORM.RESULT_MATERIAL_ID "outboudMaterialId",
+        OOM.ORDER_MATERIAL_NUMBER "materialNumber",
+        OOM.ORDER_MATERIAL_WEIGHT "materialWeight",
+        RM.MATERIAL_ID "materialId",
+        RM.MATERIAL_NAME "materialName",
+        RM.MATERIAL_SPECIFICATION "materialSpecification",
+        RM.MATERIAL_MODEL "materialModel",
+        RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL "specificationModel",
+        TWR.RESULT_GROSS_WEIGHT "grossWeight",
+        TWR.RESULT_GROSS_WEIGHT_TIME "grossWeightTime",
+        TWR.RESULT_TARE_WEIGHT       "tareWeight",
+        TWR.RESULT_TARE_WEIGHT_TIME  "tareWeightTime",
+        TWR.RESULT_NET_WEIGHT        "netWeight",
+        TLR.RESULT_LOAD_END_TIME     "loadTime",
+        TLFR.RESULT_OUT_GATE_TIME    "outGateTime",
+        TER.RESULT_ENTRY_GATE_TIME   "entryGateTime",
+        ASOM.SALE_ORDER_MATERIAL_ID  "saleOrderMaterialId",
+        ASOM.SALE_ORDER_ID          "saleOrderId"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM
+        ON OOM.ORDER_ID = OO.ORDER_ID
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM
+        ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
+        ON TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
+        ON TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND OOM.MATERIAL_ID = TWR.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_LOAD_RESULT TLR
+        ON TLR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+        AND OOM.MATERIAL_ID = TLR.MATERIAL_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN WMSP_OUTBOUND_RESULT WOR
+        ON WOR.BILL_LADING_ID = OO.ORDER_ID
+        LEFT JOIN WMSP_OUTBOUND_RESULT_MATERIAL WORM
+        ON WORM.OUTBOUND_RESULT_ID = WOR.RESULT_ID
+        AND WORM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE OO.ORDER_STATUS = 5
+        AND OO.ORDER_TYPE = 1
+        <if test="con != null">
+            and RC.CAPACITY_NUMBER || RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || RM.MATERIAL_MODEL LIKE #{con}
+        </if>
+        <if test="oneDate != null">
+            and to_date(#{oneDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+        </if>
+        <if test="startDate != null">
+            and to_date(#{startDate}, 'yyyy-mm-dd hh24:mi:ss') &lt;= OO.INSERT_TIME
+            and to_date(#{endDate}, 'yyyy-mm-dd hh24:mi:ss') >= OO.INSERT_TIME
+        </if>
+        )
+        ORDER BY "orderNumber" DESC
+    </select>
+    <select id="getInwardSteelOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT
+        OO.ORDER_ID "orderId",
+        OO.ORDER_TYPE "orderType",
+        '车皮订单' "inwardType",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        OO.ORDER_NUMBER "orderNumber",
+        RC.CAPACITY_NUMBER "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        RS.SHIPPER_NAME "shipperName",
+        ASOM.SALE_ORDER_CONSIGNEE_TEL "consigneeTel",
+        RC2.CONSIGNEE_COMPANY_NAME "consigneeCompanyNames",
+        TTR.RESULT_TOTAL_ID "resultTotalId",
+        OO.ORDER_STATUS "orderStatus",
+        RAS.ARRIVAL_NAME "sendStaionName"
+        FROM
+        OMSTRUCK_ORDER OO
+        LEFT JOIN AMS_SALE_ORDER_MATERIAL ASOM ON ASOM.SALE_ORDER_MATERIAL_ID = OO.ORDER_PLAN_ID
+        LEFT JOIN AMS_SALE_ORDER ASO ON ASO.SALE_ORDER_ID = ASOM.SALE_ORDER_ID
+        LEFT JOIN RMS_SHIPPER RS ON RS.SHIPPER_ID = ASO.SHIPPER_ID
+        LEFT JOIN RMS_CONSIGNEE RC2 ON ASO.RECEIVE_ID = RC2.CONSIGNEE_ID
+        LEFT JOIN RMS_CAPACITY RC ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN RMS_RECEIVE_PLACE RRP ON RRP.PLACE_ID = ASOM.SALE_SHIPPING_ADDRESS_ID
+        LEFT JOIN RMS_RECEIVE_ADDRESS RDA ON RDA.ADDRESS_ID = RRP.ADDRESS_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR ON OO.ORDER_ID = TTR.ORDER_ID
+        LEFT JOIN TMSTRAIN_PLEASE_APPROVE_RESULT TPAR  ON TPAR.RAIL_PLAN_ID = ASO.SALE_ORDER_ID
+        LEFT JOIN RMSTRAIN_ARRIVAL_SEND RAS  ON RAS.ARRIVAL_ID=TPAR.SEND_STATION_ID
+        WHERE
+        OO.ORDER_ID = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+        <if test="status == 333">
+            AND OO.ORDER_STATUS in (4, 5)
+        </if>
+    </select>
+
+    <update id="closeInwardOrderByPlan" parameterType="DECIMAL" >
+        UPDATE OMSTRUCK_ORDER OO
+        SET OO.ORDER_STATUS = 7
+        WHERE OO.ORDER_PLAN_ID = #{planId}
+        AND OO.ORDER_STATUS = 4
+        AND OO.ORDER_TYPE = 11
+    </update>
+    <update id="updateTotalResultNull" parameterType="DECIMAL">
+        UPDATE TMSTRUCK_TOTAL_RESULT TTR
+        SET TTR.QUEUE_ALLOW_TIME = NULL,
+            TTR.ENFACTORY_TIME = NULL,
+            TTR.QUEUE_START_TIME = NULL,
+            TTR.ORDER_STATUS = '已派单'
+        WHERE TTR.RESULT_TOTAL_ID = #{resultTotalId}
+    </update>
+
+    <select id="getMulInwardOrderMessageToApp" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DISTINCT
+        OO.ORDER_ID            "orderId",
+        OO.ORDER_NUMBER        "orderNumber",
+        OO.ORDER_LINE_SEQUENCE "orderLineSequence",
+        RC.CAPACITY_NUMBER     "capacityNumber",
+        RC.CAPACITY_TEL "capacityTel",
+        OO.ORDER_TYPE          "orderType",
+        OO.ORDER_STATUS        "orderStatus",
+        RS.SHIPPER_NAME        "shipperUnitName",
+        AIR.REQUIREMENT_ID     "requirementId",
+        AIR.DUE_DATE             "saleDateOfReceipt",
+        AIR.REQUIREMENT_TRUCK_TIME "requirementTruckTime"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        where oo.order_id = #{orderId}
+        AND rownum =1
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+
+    <select id="getMulInwardMaterials" resultType="java.util.Map" parameterType="java.util.Map">
+        SELECT DISTINCT
+        RW1.WAREHOUSE_NAME       "shipperName",
+        RW1.WAREHOUSE_NAME || '（' || RM.MATERIAL_NAME  || '）'     "loadName",
+        RW.WAREHOUSE_NAME  || '（' || RM.MATERIAL_NAME  || '）'      "unloadName",
+        RW.WAREHOUSE_NAME        "consigneeCompanyName"
+        FROM OMSTRUCK_ORDER OO
+        LEFT JOIN AMSTRUCK_INWARD_PLAN AIP
+        ON OO.ORDER_PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_PLAN ARP
+        ON ARP.PLAN_ID = AIP.PLAN_ID
+        LEFT JOIN AMSTRUCK_INWARD_REQUIREMENT AIR
+        ON AIR.REQUIREMENT_ID = ARP.REQUIREMENT_ID
+        LEFT JOIN RMS_SHIPPER RS
+        ON RS.SHIPPER_ID = AIR.REQUIREMENT_SHIPPER_ID
+        LEFT JOIN RMS_CAPACITY RC
+        ON RC.CAPACITY_ID = OO.CAPACITY_ID
+        LEFT JOIN AMSTRUCK_REQUIREMENT_MATERIAL ARM
+        ON ARM.REQUIREMENT_ID = AIR.REQUIREMENT_ID
+        LEFT JOIN RMS_WAREHOUSE RW
+        ON RW.WAREHOUSE_ID = ARM.REQUIREMENT_UNLOAD_UNIT_ID
+        LEFT JOIN RMS_WAREHOUSE RW1
+        ON RW1.WAREHOUSE_ID = ARM.REQUIREMENT_PLATFORM_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID=ARM.MATERIAL_ID
+        where oo.order_id = #{orderId}
+        <if test="status == null">
+            AND OO.ORDER_STATUS in (4, 5, 6)
+        </if>
+        <if test="status == 2">
+            AND OO.ORDER_STATUS = 2
+        </if>
+        <if test="status == 22">
+            AND OO.ORDER_STATUS in (2, 4, 5, 6)
+        </if>
+    </select>
+    <select id="getInwardMaterialMes" resultType="java.util.Map" parameterType="decimal">
+        SELECT
+        RM.MATERIAL_NAME
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+        case
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        )
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        WHERE ORDER_ID = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+    <select id="getGoBeyondCount" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT count(oo.order_id) FROM OMSTRUCK_ORDER OO
+        WHERE sysdate - oo.INSERT_TIME &lt;= 5
+        and oo.ORDER_ID = #{orderId}
+    </select>
+    <select id="getMaterialNumByOrderId" resultType="java.lang.Integer" parameterType="java.math.BigDecimal">
+        SELECT count(oom.ORDER_MATERIAL_ID) FROM  OMSTRUCK_ORDER_MATERIAL OOM
+        WHERE OOM.ORDER_ID = #{orderId}
+    </select>
+    <delete id="deleteQueueList">
+        delete from QMS_QUEUE_LIST QQL where CAPACITY_ID = #{capacityId}
+    </delete>
+    <delete id="deleteQueueResult">
+        delete from QMS_QUEUE_RESULT QQR WHERE QQR.RESULT_TOTAL_ID = #{resultTotalId}
+    </delete>
+    <delete id="deleteQueueSpellList">
+        delete from QMS_QUEUE_SPELLING_LIST QQSL where QQSL.QUEUE_RESULT_ID =
+        (SELECT QQR.RESULT_ID FROM QMS_QUEUE_RESULT QQR WHERE QQR.RESULT_TOTAL_ID = #{resultTotalId})
+    </delete>
+    <select id="getOrderPrintDate" resultType="java.util.Date" parameterType="java.math.BigDecimal">
+        SELECT OO.PRINTDATE FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId}
+    </select>
+    <select id="getPrintFlag" resultType="java.lang.String">
+        SELECT DILV.VERSION_VALUE FROM DIL_VERSION DILV
+        WHERE DILV.VERSION_ID = 7
+    </select>
+    <select id="materialMesNewContinue" resultType="java.util.Map">
+        SELECT
+        RM.MATERIAL_NAME
+        <if test="steelJudge != null">
+            || '   ' || RW.WAREHOUSE_NAME
+        </if>
+        "materialName",
+        RM.MATERIAL_ID   "materialId",
+        OOM.MATERIAL_PRIORITY "materialPriority",
+        CONCAT(CONCAT(RM.MATERIAL_MODEL, '('), CONCAT(MATERIAL_SPECIFICATION, ')')) "materialMC",
+        (case
+        when OOM.ORDER_MATERIAL_NUMBER is not null
+        then OOM.ORDER_MATERIAL_NUMBER || '件/支'
+        end
+        ) || (
+        case
+        when OOM.ORDER_MATERIAL_WEIGHT is not null
+        then '-'||OOM.ORDER_MATERIAL_WEIGHT  || '吨'
+        end
+        ) ||  '-(八点前装的)'
+        AS                                                                   "weightNum",
+        (   SELECT
+        LISTAGG ( TWR.RESULT_NET_WEIGHT, '、' ) within GROUP ( ORDER BY TWR.GROSS_SEGMENT_SQE )
+        FROM TMSTRUCK_WEIGHT_RESULT TWR
+        JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.RESULT_TOTAL_ID = TWR.RESULT_TOTAL_ID
+        WHERE TTR.ORDER_ID = #{orderId} and TWR.MATERIAL_ID = OOM.MATERIAL_ID
+        )                                                                    "netWeight"
+        FROM OMSTRUCK_ORDER_MATERIAL OOM
+        LEFT JOIN OMSTRUCK_ORDER OO
+        ON OO.ORDER_ID = OOM.ORDER_ID
+        LEFT JOIN RMS_MATERIAL RM
+        ON RM.MATERIAL_ID = OOM.MATERIAL_ID
+        LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+        ON TTR.ORDER_ID  = OO.ORDER_ID
+        LEFT JOIN TMSTRUCK_WEIGHT_RESULT TWR
+        ON twr.result_total_id = ttr.result_total_id
+        and oom.material_id = twr.material_id
+        or oom.sale_material_id is not null and oom.sale_material_id = twr.sale_material_id
+        <if test="steelJudge != null">
+            LEFT JOIN RMS_WAREHOUSE RW
+            ON OOM.MATERIAL_PRIORITY = RW.WAREHOUSE_ID
+        </if>
+        WHERE
+        OO.ORDER_STATUS = 2
+        and twr.result_net_weight is not null
+        and  OO.order_ID  = #{orderId}
+        ORDER BY RM.MATERIAL_NAME
+    </select>
+    <select id="selectContinueOrderId" resultType="java.math.BigDecimal" parameterType="java.math.BigDecimal">
+        SELECT OO.ORDER_ID FROM OMSTRUCK_ORDER OO
+        WHERE
+        OO.ORDER_STATUS = 2
+        AND OO.ORDER_NUMBER = (SELECT OO.ORDER_NUMBER FROM OMSTRUCK_ORDER OO
+        WHERE OO.ORDER_ID = #{orderId})
+    </select>
+    <update id="clsoePlanByPlan">
+        UPDATE AMSTRUCK_INWARD_PLAN AIP
+        SET AIP.PLAN_STATUS = 4
+        WHERE AIP.PLAN_ID = #{bigDecimal}
+    </update>
+</mapper>

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

@@ -1538,6 +1538,7 @@
                         NVL(R_CARRIER.CARRIER_ID,0) "carrierIds",
                         OO.ORDER_STATUS              "carStatus",
                         OO.REMARK "remark",
+                        OO.URL "urls",
                         DECODE(ASO.SALE_ORDER_STATUS,1,'销售订单已上报',
                                2,'销售已提交',
                                4,'财务已审批',
@@ -1635,4 +1636,9 @@
       AND DTCR.TABLE_NAME = #{tableName}
       AND NVL(DROT.PRIMARY_NAME,'') != '默认方案'
     </select>
+    <update id="updateRemarkPic">
+        UPDATE OMSTRUCK_ORDER
+        SET URL = #{urls}
+        WHERE ORDER_ID = #{orderId}
+    </update>
 </mapper>