提取AMS OMS 修改代码结构

pom.xml

@@ -124,7 +124,7 @@
                     <!--包名-->
                     <targetPackage>com.steerinfo.dil</targetPackage>
                     <tables>
-                        <param>TMSTRUCK_LOAD_RESULT</param>
+                        <param>TMSTRUCK_TIME_TSK_RESULT</param>
                     </tables>
                 </configuration>
                 <executions>

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

@@ -1,221 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.alibaba.fastjson.JSON;
-import com.steerinfo.dil.feign.ESFeign;
-import com.steerinfo.dil.model.AmstruckPurplan;
-import com.steerinfo.dil.service.IAmstruckPurplanMaterialService;
-import com.steerinfo.dil.service.IAmstruckPurplanService;
-import com.steerinfo.dil.util.*;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.*;
-
-import com.steerinfo.dil.util.ColumnDataUtil;
-
-/**
- * AmstruckPurplan RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-02 10:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-02
- * 作者：TXF
- * 参考：
- * 描述：AmstruckPurplan RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/amstruckpurplans")
-public class AmstruckPurplanController extends BaseRESTfulController {
-
-    @Autowired
-    IAmstruckPurplanMaterialService amstruckPurplanMaterialService;
-
-    @Autowired
-    IAmstruckPurplanService amstruckPurplanService;
-
-    @Autowired
-    ColumnDataUtil columnDataUtil;
-
-    @Autowired
-    ESFeign esFeign;
-
-    @ApiOperation(value="查询运输预约")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(79)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllPurPlan")
-    public RESTfulResult getAllPurPlan(@RequestBody(required=false) Map<String,Object> mapValue,
-                                           Integer apiId,
-                                           Integer pageNum,
-                                           Integer pageSize,
-                                           Integer status){
-        //初始化过滤
-        List<Map<String, Object>> detailListTotal = null;
-        //如果有条件查询则跳过初始化，和创建索引
-        if(mapValue==null){
-            mapValue = new HashMap<>();
-            mapValue.put("planStatus", status);
-            //将查询结果存入索引中
-            detailListTotal = amstruckPurplanService.getAllPurPlan(mapValue);
-            Map<String, Object> map = new HashMap<>();
-            //添加索引
-            map.put("index","get_pur_plan_list");
-            //添加id
-            map.put("indexId","planId");
-            detailListTotal.add(map);
-            //新建索引
-            String s = JSON.toJSONString(detailListTotal);
-            esFeign.insertIndex(detailListTotal);
-            //删除
-            detailListTotal.remove(detailListTotal.size()-1);
-        }else {
-            mapValue.put("planStatus", status);
-        }
-        if(detailListTotal == null){
-            detailListTotal = amstruckPurplanService.getAllPurPlan(mapValue);
-        }
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> purPlan = amstruckPurplanService.getAllPurPlan(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, detailListTotal,purPlan);
-        return success(pageList);
-    }
-    //框计算查询
-    @PostMapping("/getAllPurPlan/{apiId}")
-    public RESTfulResult getAllPurPlan(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       @PathVariable("apiId") Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer status,
-                                       String con){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        //设置要查询的索引名称
-        String index="get_pur_plan_list";
-        mapValue.put("planStatus", status);
-        //获取查询结果
-        PageListAdd pageList = esFeign.getConResult(mapValue,index,apiId,pageNum,pageSize,con);
-        return success(pageList);
-    }
-
-
-
-    @ApiOperation(value="通过Id查询请车作业")
-    @PostMapping ("/getPurPlanById/{planId}")
-    public RESTfulResult getPurPlanById(@PathVariable("planId")Integer planId){
-        List<Map<String, Object>> purPlanById = amstruckPurplanService.getPurPlanById(planId);
-        return success(purPlanById);
-    }
-
-    @ApiOperation(value="新增运输计划 状态：0")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amstruckPurplan", value = "运输计划实绩对象", required = false, dataType = "AmstruckPurplan"),
-    })
-    @PostMapping("/addPurPlan")
-    public RESTfulResult addPurPlan(@RequestBody AmstruckPurplan amstruckPurplan){
-        int i = amstruckPurplanService.addPurPlan(amstruckPurplan);
-        return success(i);
-    }
-
-    @ApiOperation(value="修改运输计划")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "amstruckPurplan", value = "请车作业实绩对象", required = false, dataType = "AmstruckPurplan"),
-    })
-    @PostMapping("/updatePurPlan")
-    public RESTfulResult updatePurPlan(@RequestBody AmstruckPurplan amstruckPurplan){
-        amstruckPurplan.setUpdateTime(new Date()); //设置更新时间
-        int i = amstruckPurplanService.updatePurPlan(amstruckPurplan);
-        return success(i);
-    }
-
-    @ApiOperation(value="下发运输计划 状态：1")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/sendPurPlan/{planId}")
-    public RESTfulResult sendPurPlan(@PathVariable("planId")Integer planId){
-        AmstruckPurplan amstruckPurplan = new AmstruckPurplan();
-        amstruckPurplan.setPlanId(new BigDecimal(planId));
-        amstruckPurplan.setPlanStatus(new BigDecimal(1));
-        int i = amstruckPurplanService.sendPurPlan(amstruckPurplan);
-        return success(i);
-    }
-
-    @ApiOperation(value="接收运输计划 状态：2")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/receptionPurPlan/{planId}")
-    public RESTfulResult receptionPurPlan(@PathVariable("planId")Integer planId){
-        AmstruckPurplan amstruckPurplan = new AmstruckPurplan();
-        amstruckPurplan.setPlanId(new BigDecimal(planId));
-        amstruckPurplan.setPlanStatus(new BigDecimal(2));
-        int i = amstruckPurplanService.receptionPurPlan(amstruckPurplan);
-        return success(i);
-    }
-
-    @ApiOperation(value="逻辑删除运输计划 状态：3")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/deletePurPlan/{planId}")
-    public RESTfulResult deletePurPlan(@PathVariable("planId")Integer planId){
-        AmstruckPurplan amstruckPurplan = new AmstruckPurplan();
-        amstruckPurplan.setPlanId(new BigDecimal(planId));
-        amstruckPurplan.setPlanStatus(new BigDecimal(3));
-        int i = amstruckPurplanService.deletePurPlan(amstruckPurplan);
-        return success(i);
-    }
-
-//    ******************************************************************************************************************
-
-    @ApiOperation(value="查询要分派的计划")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(82)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getDecomposedPlan")
-    public RESTfulResult getDecomposedPlan(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer planId,
-                                               Integer status){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(planId != null){
-            mapValue.put("planId", planId);
-        }
-        if(status != null){
-            mapValue.put("planStatus", status);
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allPlan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> plan = amstruckPurplanMaterialService.getDecomposedPlan(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allPlan,plan);
-        return success(pageList);
-    }
-
-
-
-}

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

@@ -1,368 +0,0 @@
-package com.steerinfo.dil.controller;
-
-import com.steerinfo.dil.service.IOmstruckOrderService;
-
-import com.steerinfo.dil.util.BaseRESTfulController;
-import com.steerinfo.dil.util.ColumnDataUtil;
-import com.steerinfo.dil.util.PageListAdd;
-import com.steerinfo.framework.controller.RESTfulResult;
-import com.steerinfo.framework.service.pagehelper.PageHelper;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * OmstruckOrder RESTful接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-03 03:47
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：TXF
- * 参考：
- * 描述：OmstruckOrder RESTful接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@RestController
-@RequestMapping("/${api.version}/omstruckorders")
-public class OmstruckOrderController extends BaseRESTfulController {
-
-    @Autowired
-    IOmstruckOrderService omstruckOrderService;
-
-    @Autowired
-    ColumnDataUtil columnDataUtil;
-
-    @ApiOperation(value="查询所有运输订单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(86)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "status", value = "状态码", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllTruckOrder")
-    public RESTfulResult getAllTruckOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                       Integer apiId,
-                                       Integer pageNum,
-                                       Integer pageSize,
-                                       Integer orderStatus,
-                                       Integer planId,
-                                       Integer orderType){
-
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(orderStatus != null){
-            mapValue.put("orderStatus", orderStatus);
-        }
-        if(planId != null){
-            mapValue.put("planId", planId);
-        }
-        if(orderType != null){
-            mapValue.put("orderType", orderType);
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allTruckOrder = omstruckOrderService.getAllTruckOrder(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> truckOrder = omstruckOrderService.getAllTruckOrder(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allTruckOrder,truckOrder);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="不适用表头返回数据")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-    })
-    @PostMapping("/getAllTruckOrderReturnListMap")
-    public RESTfulResult getAllTruckOrder(
-                                          Integer orderStatus,
-                                          Integer planId,
-                                          Integer orderType){
-        Map<String, Object> map = new HashMap<>();
-        if(orderStatus != null){
-            map.put("orderStatus", orderStatus);
-        }
-        if(planId != null){
-            map.put("planId", planId);
-        }
-        if(orderType != null){
-            map.put("orderType", orderType);
-        }
-        List<Map<String, Object>> truckOrder = omstruckOrderService.getAllTruckOrder(map);
-        return success(truckOrder);
-    }
-
-    @ApiOperation(value="查询所有空闲的运力信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(85)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getAllCapacity")
-    public RESTfulResult getAllCapacity(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               Integer carrierId
-                                               ){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(carrierId != null){
-            mapValue.put("carrierId", carrierId);
-        }
-        mapValue.put("capacityTypeId", 1);
-        mapValue.put("capacityStatus", 0);
-        //不分页筛选数据
-        List<Map<String, Object>> allCapacity = omstruckOrderService.getAllCapacity(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> capacity = omstruckOrderService.getAllCapacity(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="分解运输计划后 新增订单  或者直接新增订单 ")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
-            @ApiImplicitParam(name = "orderType", value = "运输订单类型:1表示销售订单，3表示运输订单", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "saleOrderId", value = "销售订单", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/addPurOrder")
-    public RESTfulResult addPurOrder(@RequestBody(required=false) Map<String,Object> mapValue){
-        Integer orderType=(Integer)mapValue.get("orderType");
-        int i=0;
-        int i1=0;
-        if (orderType==3) {
-            i = omstruckOrderService.addPurOrder(mapValue);
-        }
-        if (orderType==1){
-            i1=omstruckOrderService.addOrderForSale(mapValue);
-        }
-        //判断return为5则为正确
-        return success(i+i1);
-    }
-
-    @ApiOperation(value="修改分派计划")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/updateOrder")
-    public RESTfulResult updateOrder(@RequestBody Map<String, Object> map){
-        int i = omstruckOrderService.updateOrder(map);
-        return success(i);
-    }
-
-    @ApiOperation(value="派单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/dispatchOrder/{orderId}")
-    public RESTfulResult dispatchOrder(@PathVariable("orderId") Integer orderId){
-        int i = omstruckOrderService.dispatchOrder(orderId);
-        return success(i);
-    }
-
-    @ApiOperation(value="逻辑删除运单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/deleteOrder")
-    public RESTfulResult deleteOrder(@RequestBody(required = false) Map<String, Object> map,
-                                     Integer planId){
-        if(planId != null){
-            map.put("planId", planId);
-        }
-        Object orderMaterialWeight = map.get("orderMaterialWeight");
-        if(orderMaterialWeight != null){
-            if(orderMaterialWeight instanceof  Integer){
-                map.put("orderMaterialWeight", -((Integer)orderMaterialWeight));
-            }else if(orderMaterialWeight instanceof Double){
-                map.put("orderMaterialWeight", -((Double)orderMaterialWeight));
-            }
-            //模拟前端传来新重量 复用
-            map.put("weight", 0);
-        }
-        int i = omstruckOrderService.deleteOrder(map);
-        return success(i);
-    }
-
-    @ApiOperation(value="司机接收、拒绝接单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "planId", value = "运输计划Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/driverReceiveOrRefuse/{orderId}")
-    public RESTfulResult driverReceiveOrRefuse(@PathVariable("orderId") Integer orderId, Integer orderReceiveStatus){
-        Map<String, Object> map = new HashMap<>();
-        map.put("orderId", orderId);
-        map.put("orderReceiveStatus", orderReceiveStatus);
-        int i = omstruckOrderService.driverReceiveOrRefuse(map);
-        return success(i);
-    }
-
-    @ApiOperation(value="司机接单信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getReceiveRefuseOrder/{orderReceiveStatus}")
-    public RESTfulResult getReceiveRefuseOrder(@RequestBody(required=false) Map<String,Object> mapValue,
-                                        Integer apiId,
-                                        Integer pageNum,
-                                        Integer pageSize,
-                                        @PathVariable Integer orderReceiveStatus,
-                                        Integer orderType,
-                                        Integer orderStatus
-    ){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(orderType != null){
-            mapValue.put("orderTypee", orderType);
-        }
-        if(orderReceiveStatus != null){
-            mapValue.put("orderReceiveStatus", orderReceiveStatus);
-        }
-        if(orderStatus != null){
-            mapValue.put("orderStatus", orderStatus);
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allOrder = omstruckOrderService.getReceiveRefuseOrder(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> order = omstruckOrderService.getReceiveRefuseOrder(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allOrder,order);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="司机APP端调用接口查询数据 4 已下发 5 已接收")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "capacityNumber", value = "运输计划Id", required = false, dataType = "String"),
-    })
-    @PostMapping("/sendMesToDriver")
-    public RESTfulResult sendMesToDriver(String capacityNumber, Integer orderStatus){
-        HashMap<String, Object> map = new HashMap<>();
-        if(orderStatus != null)
-        map.put("orderStatus", orderStatus);
-        if(capacityNumber != null)
-        map.put("capacityNumber", capacityNumber);
-        List<Map<String, Object>> mesToDriver = omstruckOrderService.sendMesToDriver(map);
-        return success(mesToDriver);
-    }
-
-    @ApiOperation(value="通过车牌获取所有已拒绝的订单")
-    @ApiImplicitParams({
-                @ApiImplicitParam(name = "capacityNumber", value = "运输计划Id", required = false, dataType = "String"),
-    })
-    @PostMapping("/getRefuseOrderByCapacityNum")
-    public RESTfulResult sendMesToDriver(String capacityNumber){
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("capacityNumber", capacityNumber);
-        List<Map<String, Object>> receiveRefuseOrderByCapacityId = omstruckOrderService.getReceiveRefuseOrderByCapacityId(map);
-        return success(receiveRefuseOrderByCapacityId);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询运单信息 包含各个作业路径")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "capacityNumber", value = "运输计划Id", required = false, dataType = "String"),
-    })
-    @PostMapping("/getOrderMesByOrderNum/{orderId}")
-    public RESTfulResult getOrderMesByOrderNum(@PathVariable("orderId") Integer orderId){
-        HashMap<String, Object> map = new HashMap<>();
-        map.put("orderId", orderId);
-        List<Map<String, Object>> mesToDriver = omstruckOrderService.getOrderMesByOrderNum(map);
-        return success(mesToDriver);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询实绩地点和时间")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "orderId", value = "运输订单Id", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/selectPlaceAndTime/{orderId}")
-    public RESTfulResult selectPlaceAndTime(@PathVariable("orderId") Integer orderId){
-        List<Map<String, Object>> placeAndTime = omstruckOrderService.selectPlaceAndTime(new BigDecimal(orderId));
-        return success(placeAndTime);
-    }
-
-    @ApiOperation(value="通过运输订单ID查询运单信息")
-    @PostMapping("/selectOrderByOrderId/{orderId}")
-    public RESTfulResult selectOrderByOrderId(@PathVariable("orderId") Integer orderId){
-        List<Map<String, Object>> mapList = omstruckOrderService.getOrderByOrderId(new BigDecimal(orderId));
-        return  success(mapList);
-    }
-
-    @ApiOperation(value="查看运输派单")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(117)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getTransportDispatch/{orderReceiveStatus}")
-    public RESTfulResult getTransportDispatch(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize,
-                                               @PathVariable Integer orderReceiveStatus,
-                                               Integer orderType,
-                                               Integer orderStatus
-    ){
-        if(mapValue == null){
-            mapValue = new HashMap<>();
-        }
-        if(orderType != null){
-            mapValue.put("orderTypee", orderType);
-        }
-        if(orderReceiveStatus != null){
-            mapValue.put("orderReceiveStatus", orderReceiveStatus);
-        }
-        if(orderStatus != null){
-            mapValue.put("orderStatus", orderStatus);
-        }
-        //不分页筛选数据
-        List<Map<String, Object>> allOrder = omstruckOrderService.getTransportDispatch(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> order = omstruckOrderService.getTransportDispatch(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allOrder, order);
-        return success(pageList);
-    }
-
-    @ApiOperation(value="查询所有空闲的司机排班信息")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(186)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getCapacityForLeisure")
-    public RESTfulResult getCapacityForLeisure(@RequestBody(required=false) Map<String,Object> mapValue,
-                                               Integer apiId,
-                                               Integer pageNum,
-                                               Integer pageSize
-
-    ){
-
-        //不分页筛选数据
-        List<Map<String, Object>> allCapacity = omstruckOrderService.selectCapacityAndDriver(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> capacity = omstruckOrderService.selectCapacityAndDriver(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allCapacity,capacity);
-        return success(pageList);
-    }
-}

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

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -50,8 +51,10 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
     public RESTfulResult getAllEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                        Integer apiId,
                                        Integer pageNum,
-                                       Integer pageSize
+                                       Integer pageSize,
+                                       Integer orderType
                                        ){
+        mapValue.put("orderTypee", orderType);
         //不分页筛选数据
         List<Map<String, Object>> allEnFactoryResult = tmstruckEnfactoryResultService.getAllEnFactoryResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -61,38 +64,35 @@ public class TmstruckEnfactoryResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
-    @ApiOperation(value="新增进厂作业实绩")
+
+    @ApiOperation(value="通过PDA添加进厂实绩")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "mapValue", value = "门岗名称 运输订单号", required = false, dataType = "Map"),
     })
-    @PostMapping("/addEnFactoryResult")
-    public RESTfulResult addEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
-        int i = tmstruckEnfactoryResultService.addEnFactoryResult(mapValue);
+    @PostMapping("/enFactoryResultByPDA")
+    public RESTfulResult enFactoryResultByPDA(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckEnfactoryResultService.enFactoryResultByPDA(mapValue);
         return success(i);
     }
 
-    @ApiOperation(value="PDA扫描更新进厂作业实绩")
+    @ApiOperation(value="通过门禁进厂")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "mapValue", value = "门岗名称 运输订单号 车牌号 进厂时间", required = false, dataType = "Map"),
     })
-    @PostMapping("/updateEnactoryResult")
-    public RESTfulResult updateEnactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
-//        String orderNumber= mapValue.get("orderNumber").toString();
-//        int nodeNumber = tmstruckEnfactoryResultService.selectNodeNumber(orderNumber);
-//        if (nodeNumber == 1) {
-            int i = tmstruckEnfactoryResultService.updateEnFactoryByPDA(mapValue);
-            return success(i);
-//        }
-//        return failed();
+    @PostMapping("/enFactoryResultByMJ")
+    public RESTfulResult enFactoryResultByMJ(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckEnfactoryResultService.enFactoryResultByMJ(mapValue);
+        return success(i);
     }
 
-    @ApiOperation(value="使用门禁系统更新进厂作业实绩")
+
+    @ApiOperation(value="新增进厂作业实绩：oms远程调用")
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "运输计划实绩对象", required = false, dataType = "Map"),
+            @ApiImplicitParam(name = "mapValue", value = "总实绩Id、线路起点", required = false, dataType = "Map"),
     })
-    @PostMapping("/updateEnFactoryByMenJin")
-    public RESTfulResult updateEnFactoryByMenJin(@RequestBody(required=false) Map<String,Object> mapValue){
-        int i = tmstruckEnfactoryResultService.updateEnFactoryByMenJin(mapValue);
+    @PostMapping("/addEnFactoryResult")
+    public RESTfulResult addEnFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckEnfactoryResultService.addEnFactoryResult(mapValue);
         return success(i);
     }
 

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

@@ -43,15 +43,15 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
     @Autowired
     ColumnDataUtil columnDataUtil;
 
-//    @ApiOperation(value="新增汽车出厂实绩")
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "mapValue", value = "", required = false, dataType = "Map"),
-//    })
-//    @PostMapping("/addLeaveFactoryResult")
-//    public RESTfulResult addLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue){
-//        int i = tmstruckLeaveFactoryResultService.addLeaveFactoryResult(mapValue);
-//        return success(i);
-//    }
+    @ApiOperation(value="新增汽车出厂实绩：oms远程调用")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "总实绩ID、线路终点", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addLeaveFactory")
+    public RESTfulResult addLeaveFactory(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckLeaveFactoryResultService.addLeaveFactory(mapValue);
+        return success(i);
+    }
 
     @ApiOperation(value="查询出厂实绩")
     @ApiImplicitParams({
@@ -65,8 +65,10 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
     public RESTfulResult getLeaveFactoryResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize
+                                          Integer pageSize,
+                                               Integer orderType
     ){
+        mapValue.put("orderTypee", orderType);
         //不分页筛选数据
         List<Map<String, Object>> allLeaveFactoryResult = tmstruckLeaveFactoryResultService.getLeaveFactoryResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);
@@ -87,31 +89,10 @@ public class TmstruckLeaveFactoryResultController extends BaseRESTfulController
         //执行查询语句找出运输类型进行判断，是否为出厂 4 已完成计皮
         Integer i = tmstruckLeaveFactoryResultService.selectTransportRoute(nu);
 //        if (i == 4) {
-            int leaveFactory=tmstruckLeaveFactoryResultService.updateLeaveFactoryByPDA(mapValue);
+            int leaveFactory=tmstruckLeaveFactoryResultService.leaveFactoryByPDA(mapValue);
             return  success(leaveFactory);
 //        }else
 //            return  failed();
     }
 
-    @ApiOperation(value="销售物流查询所有的出厂实绩")
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),
-            @ApiImplicitParam(name = "apiId(174)", value = "动态表头", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageNum", value = "页码", required = false, dataType = "Integer"),
-            @ApiImplicitParam(name = "pageSize", value = "页", required = false, dataType = "Integer"),
-    })
-    @PostMapping("/getLeaveFactoryResultForSale")
-    public RESTfulResult getLeaveFactoryResultForSale(@RequestBody(required=false) Map<String,Object> mapValue,
-                                                      Integer apiId,
-                                                      Integer pageNum,
-                                                      Integer pageSize
-    ){
-        //不分页筛选数据
-        List<Map<String, Object>> allLeaveFactoryResult = tmstruckLeaveFactoryResultService.selectAllLeaveFacatoryForSale(mapValue);
-        PageHelper.startPage(pageNum,pageSize);
-        //分页数据
-        List<Map<String, Object>> leaveFactoryResult = tmstruckLeaveFactoryResultService.selectAllLeaveFacatoryForSale(mapValue);
-        PageListAdd pageList = columnDataUtil.tableColumnData(apiId, allLeaveFactoryResult,leaveFactoryResult);
-        return success(pageList);
-    }
 }

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

@@ -168,4 +168,14 @@ public class TmstruckLoadResultController extends BaseRESTfulController {
         return success(pageList);
     }
 
+
+    @ApiOperation(value="销售订单新增 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "", required = false, dataType = "Map"),
+    })
+    @PostMapping("addSaleLoadResult")
+    public RESTfulResult addSaleLoadResult(@RequestBody(required=false) Map<String, Object> map){
+        int i = tmstruckLoadResultService.addSaleLoadResult(map);
+        return success(i);
+    }
 }

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

@@ -51,8 +51,10 @@ public class TmstruckReceiptResultController extends BaseRESTfulController {
     public RESTfulResult getReceiveResult(@RequestBody(required=false) Map<String,Object> mapValue,
                                           Integer apiId,
                                           Integer pageNum,
-                                          Integer pageSize
+                                          Integer pageSize,
+                                          Integer orderType
     ){
+        mapValue.put("orderTypee", orderType);
         //不分页筛选数据
         List<Map<String, Object>> allReceiveResult = tmstruckReceiptResultService.getReceiveResult(mapValue);
         PageHelper.startPage(pageNum,pageSize);

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

@@ -29,7 +29,7 @@ public class TmstruckReturnResultController extends BaseRESTfulController {
     ITmstruckReturnResultService tmstruckReturnResultService;
 
     @ApiOperation(value = "新增退货实绩", notes = "需要运输订单号")
-    @PostMapping(value = "/addReturnGoodsResult")//BigDecimal
+    @PostMapping(value = "/addReturnGoodsResult")
     public RESTfulResult addReturnGoodsResult(@RequestBody(required = false) Map<String, Object> map) {
         int i = tmstruckReturnResultService.addReturnGoodsResult(map);
         return success(i);

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

@@ -0,0 +1,113 @@
+package com.steerinfo.dil.controller;
+import com.steerinfo.dil.service.ITmstruckTimeTaskResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * TmstruckTimeTskResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 07:28
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-22
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckTimeTskResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmstrucktimetaskresults")
+public class TmstruckTimeTaskResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmstruckTimeTaskResultService tmstruckTimeTaskResultService;
+
+    @ApiOperation(value="司机申请开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/applyStartTime")
+    public RESTfulResult applyStartTime(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.applyStartTime(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="用车单位确认开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/unitSureStartTime")
+    public RESTfulResult unitSureStartTime(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.unitSureStartTime(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="司机申请暂停开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/applyStartTimeout")
+    public RESTfulResult applyStartTimeout(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.applyStartTimeout(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="用车单位确认暂停申请开始")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/unitSureStartTimeout")
+    public RESTfulResult unitSureStartTimeout(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.unitSureStartTimeout(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="司机申请暂停结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/applyEndTimeout")
+    public RESTfulResult applyEndTimeout(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.applyEndTimeout(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="用车单位确认暂停结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/unitSureEndTimeout")
+    public RESTfulResult unitSureEndTimeout(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.unitSureEndTimeout(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="司机申请结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/applyEndTime")
+    public RESTfulResult applyEndTime(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.applyEndTime(mapValue);
+        return success(i);
+    }
+
+    @ApiOperation(value="用车单位确认结束")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "运输订单号", required = false, dataType = "Map"),
+    })
+    @PostMapping("/unitSureEndTime")
+    public RESTfulResult unitSureEndTime(@RequestBody(required=false) Map<String,Object> mapValue){
+        int i = tmstruckTimeTaskResultService.unitSureEndTime(mapValue);
+        return success(i);
+    }
+
+}

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

@@ -0,0 +1,41 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.ITmstruckTotalResultService;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.framework.controller.RESTfulResult;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/27 10:24
+ */
+
+@RestController
+@RequestMapping("/${api.version}/tmstrucktotalresults")
+public class TmstruckTotalResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmstruckTotalResultService tmstruckTotalResultService;
+
+    @ApiOperation(value="添加总实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "订单Id", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addTotalResult")
+    public RESTfulResult addTotalResult(@RequestBody(required=false) Map<String, Object> map){
+        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
+        int i = tmstruckTotalResultService.addTotalResult(orderId);
+        return success(i);
+    }
+}

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

@@ -67,10 +67,20 @@ public class TmstruckUnloadResultController extends BaseRESTfulController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "resultId", value = "装车作业实绩ID", required = false, dataType = "Integer"),
     })
-    @PostMapping("/addUnloadResult")
-    public RESTfulResult addUnloadResult(@RequestBody Map<String, Object> mapValue){
+    @PostMapping("/updateUnloadResult")
+    public RESTfulResult updateUnloadResult(@RequestBody Map<String, Object> mapValue){
         int i = tmstruckUnloadResultService.updateUnloadResult(mapValue);
         return success(i);
     }
 
+
+    @ApiOperation(value="新增卸货实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "总实绩ID、卸货点", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addUnloadResult")
+    public RESTfulResult addUnloadResult(@RequestBody(required=false) Map<String, Object> mapValue){
+        int i = tmstruckUnloadResultService.addUnloadResult(mapValue);
+        return success(i);
+    }
 }

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

@@ -41,6 +41,16 @@ public class TmstruckWeightResultController extends BaseRESTfulController {
     @Autowired
     ColumnDataUtil columnDataUtil;
 
+    @ApiOperation(value="新增计量实绩 ")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "mapValue", value = "总实绩ID、计皮点、计毛点", required = false, dataType = "Map"),
+    })
+    @PostMapping("/addWeightResult")
+    public RESTfulResult addWeightResult(@RequestBody Map<String, Object> mapValue){
+        int i = tmstruckWeightResultService.addWeightResult(mapValue);
+        return success(i);
+    }
+
     @ApiOperation(value="查询计毛实绩")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "mapValue", value = "表头和参数", required = false, dataType = "map"),

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

@@ -0,0 +1,25 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/27 18:05
+ */
+
+@FeignClient(value = "dil-oms-dev", url = "${openfeign.OmsFeign.url}")
+public interface OmsFeign {
+
+    //远程调用新增运输订单
+    @PostMapping("api/v1/oms/utilscontroller/insertSelectiveOrder")
+    RESTfulResult insertSelectiveOrder(@RequestBody(required = false) Map<String, Object> omstruckOrder);
+
+    //远程调用新增运输订单子表
+    @PostMapping("api/v1/oms/utilscontroller/insertSelectiveOrderMaterial")
+    RESTfulResult insertSelectiveOrderMaterial(@RequestBody(required = false) Map<String, Object> omstruckOrderMaterial);
+}

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

@@ -1,32 +0,0 @@
-package com.steerinfo.dil.mapper;
-
-import com.steerinfo.dil.model.AmstruckPurplan;
-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.List;
-import java.util.Map;
-
-@Mapper
-public interface AmstruckPurplanMapper extends IBaseMapper<AmstruckPurplan, BigDecimal> {
-
-    //查询所有运输计划
-    List<Map<String, Object>> getAllPurPlan(Map<String, Object> map);
-
-    //新增运输计划
-    int insertSelective(AmstruckPurplan amstruckPurplan);
-
-    //查询最大ID值
-    @Select("select seq_amstruck_purplan.nextval from dual")
-    BigDecimal selectMaxId();
-
-    //通过ID查询运输计划
-    List<Map<String, Object>> getPurPlanById(@Param("planId") Integer planId);
-
-    //修改运输计划
-    int updateByPrimaryKeySelective(AmstruckPurplan amstruckPurplan);
-
-}

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

@@ -1,30 +0,0 @@
-package com.steerinfo.dil.mapper;
-
-import com.steerinfo.dil.model.AmstruckPurplanMaterial;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface AmstruckPurplanMaterialMapper extends IBaseMapper<AmstruckPurplanMaterial, BigDecimal> {
-    //新增运输计划同时新增运输计划子表数据
-    int insertSelective(AmstruckPurplanMaterial amstruckPurplanMaterial);
-
-    //通过Id查询运输计划  包含分解信息  未分配、已分配
-    List<Map<String, Object>> getDecomposedPlan(Map<String, Object> map);
-
-    //通过Id查询已分配重量、未分配重量
-    List<Map<String, Object>> getWeight(Integer planId);
-
-    //查询最大主键Id
-    @Select("select seq_amstruck_purplan_material.nextval from dual")
-    BigDecimal selectMaxId();
-
-    //通过运输计划Id查询计划子表主键ID
-    BigDecimal getChildIdByPlanId(BigDecimal planId);
-
-}

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

@@ -1,79 +0,0 @@
-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.Select;
-import org.apache.poi.ss.formula.functions.T;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-@Mapper
-public interface OmstruckOrderMapper extends IBaseMapper<OmstruckOrder, BigDecimal> {
-    //查询所有运输订单信息 状态：3
-    //查询所有已下发运输订单 状态：4
-    List<Map<String, Object>> getAllTruckOrder(Map<String, Object> map);
-
-    //新增运单
-    int insertSelective(OmstruckOrder omstruckOrder);
-
-    //查询最大主键Id
-    @Select("select seq_omstruck_order.nextval from dual")
-    BigDecimal selectMaxId();
-
-    //通过运输订单Id查询运输订单号
-    String getOrderNumberByOrderId(Integer orderId);
-
-    //查询所有运力信息
-    List<Map<String, Object>> getAllCapacity(Map<String, Object> map);
-
-    //通过运力Id 或 车牌号 修改运输状态
-    int updateCapacityByCarIdOrNum(Map<String, Object> map);
-
-    //通过运输订单ID 或 运输订单号 查询运力Id
-    BigDecimal getCapacityIdByOrderOrNum(Map<String, Object> map);
-
-    //修改运输订单 、分配运单给司机
-    int updateByPrimaryKeySelective(OmstruckOrder omstruckOrder);
-
-    //通过ID获取派单时间
-    Date getInsertTimeById(Integer orderId);
-
-    //通过车牌号查询运力id
-    BigDecimal getCapacityIdByCapacityNum(String capacityNumber);
-
-    //司机接单调用接口 通过运力Id匹配  /  通过运单ID查询运单信息 APP
-    //查询所有接单或拒绝接单的订单 PC
-    List<Map<String, Object>> getTruckOrderByCapacityNum(Map<String, Object> map);
-
-    //查询司机所有已拒绝过的订单
-    List<Map<String, Object>> getReceiveRefuseOrderByCapacityId(Map<String, Object> map);
-
-
-    // 查询实绩地点和时间
-    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);
-
-    //通过运输订单号查找物资理重和物资件数
-    Map<String,Object> selectTheoreticalWeightAndMaterialNumber(Integer saleOrderMaterialId);
-
-    //通过用户id查找用户姓名
-    String selectPersonNameByPersonnelId(Integer personnelId);
-
-    //通过车序号表id查找物资id
-    List<Map<String,Object>> selectMaterialIdBysaleOrderMaterialId(Integer saleOrderMaterialId);
-
-    //查找司机排班表信息
-    List<Map<String,Object>> selectCapacityAndDriver(Map<String,Object> map);
-}

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

@@ -1,26 +0,0 @@
-package com.steerinfo.dil.mapper;
-
-import com.steerinfo.dil.model.OmstruckOrder;
-import com.steerinfo.dil.model.OmstruckOrderMaterial;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
-
-import java.math.BigDecimal;
-
-@Mapper
-public interface OmstruckOrderMaterialMapper extends IBaseMapper<OmstruckOrderMaterial, BigDecimal> {
-    //新增运单子表
-    int insertSelective(OmstruckOrderMaterial omstruckOrderMaterial);
-
-    //修改运输订单子表
-    int updateByPrimaryKeySelective(OmstruckOrder omstruckOrder);
-
-    //查询最大主键Id
-    @Select("select seq_omstruck_order_material.nextval from dual")
-    BigDecimal selectMaxId();
-
-    //通过订单Id
-    BigDecimal getOrderMaterialIdByOrderId(BigDecimal orderId);
-
-}

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

@@ -11,8 +11,12 @@ import java.util.Map;
 
 @Mapper
 public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfactoryResult, Short> {
-    //获取所有进厂实绩
-    List<Map<String, Object>> getAllEnFactoryResult(Map<String, Object> map);
+    //获取采购进口矿进厂实绩
+    List<Map<String, Object>> getCGJKEnFactoryResult(Map<String, Object> map);
+
+
+    //查询所有内转进厂实绩
+    List<Map<String, Object>> getAllInwardTurnEnFactoryResult(Map<String, Object> map);
 
     //查询最大主键Id
     @Select("select seq_tmstruck_enfactory_result.nextval from dual")
@@ -24,7 +28,7 @@ public interface TmstruckEnfactoryResultMapper extends IBaseMapper<TmstruckEnfac
     //通过门岗名称查询门岗Id
     Integer selectGatepostIdByGatepostName(String gatepostName);
 
-    //根据orderNumber获取实绩id
+    //根据orderNumber获取实绩id  总实绩Id 订单id  订单类型 orderTypee
     Map<String, Object> selectEnFactoryResultId(String orderNumber);
 
     //查找排队序号

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

@@ -12,10 +12,7 @@ import java.util.Map;
 @Mapper
 public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult, BigDecimal> {
     //查询所有的装车实绩
-    List<Map<String, Object>> getAllLoadResult(Map<String, Object> map);
-
-    //新增装车实绩
-    int insertSelective(TmstruckLoadResult tmstruckLoadResult);
+    List<Map<String, Object>> getCGJKLoadResult(Map<String, Object> map);
 
     //查询最大ID值
     @Select("select seq_tmstruck_load_result.nextval from dual")
@@ -49,5 +46,5 @@ public interface TmstruckLoadResultMapper extends IBaseMapper<TmstruckLoadResult
     List<Map<String,Object>> selectLoadResultForSale(Map<String,Object> map);
 
     //根据运输订单号查找物资id
-    List<Map<String,Object>> selectMaterialIdByOrderNumber(String orderNumber);
+    List<Map<String,Object>> selectMaterialIdByOrderNumber(Map<String, Object> map);
 }

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

@@ -19,4 +19,10 @@ public interface TmstruckMeasureCommissionMapper extends IBaseMapper<TmstruckMea
     @Select("select seq_measure_commission.nextval from dual")
     BigDecimal selectMaxId();
 
+    //查询采购计量委托
+    Map<String, Object> getCGMeasureCommission(Map<String, Object> map);
+
+    //查询销售计量委托
+    Map<String, Object> getXSMeasureCommission(Map<String, Object> map);
+
 }

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

@@ -21,6 +21,6 @@ public interface TmstruckReceiptResultMapper extends IBaseMapper<TmstruckReceipt
     //计皮完成后 通过总实绩ID 更新状态 为 1
     int updateByTotalResultId(TmstruckReceiptResult tmstruckReceiptResult);
 
-    //查询所有签收实绩
-    List<Map<String, Object>> getReceiveResult(Map<String, Object> map);
+    //查询所有收货实绩
+    List<Map<String, Object>> getReceiptResult(Map<String, Object> map);
 }

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

@@ -1,7 +1,5 @@
 package com.steerinfo.dil.mapper;
 
-import com.steerinfo.dil.model.OmstruckOrder;
-import com.steerinfo.dil.model.OmstruckOrderMaterial;
 import com.steerinfo.dil.model.TmstruckReturnResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import org.apache.ibatis.annotations.Mapper;
@@ -22,8 +20,11 @@ public interface TmstruckReturnResultMapper extends IBaseMapper<TmstruckReturnRe
     Map<String, Object> getResultTotalIdByOrderNumber(String orderNumber);
 
     //通过运输订单ID查询上一个订单的信息
-    OmstruckOrder getOldOrderMesById(BigDecimal orderId);
+    Map<String, Object> getOldOrderMesById(BigDecimal orderId);
 
     //通过运输订单Id查询查询上一个订单子表的信息
-    List<OmstruckOrderMaterial> getOldOrderMaterialMesByOrderId(BigDecimal orderId);
+    List<Map<String, Object>> getOldOrderMaterialMesByOrderId(BigDecimal orderId);
+
+    //通过运输订单号查询预设路径的作业点ID  及 总实绩ID
+    Map<String, Object> getPointIdByOrderNum(Map<String, Object> map);
 }

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

@@ -0,0 +1,34 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmstruckTimeTaskResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TmstruckTimeTaskResultMapper extends IBaseMapper<TmstruckTimeTaskResult, BigDecimal> {
+
+    //查询最大ID
+    @Select("select seq_time_task.nextval from dual")
+    BigDecimal selectMaxId();
+
+    //通过运输订单号 查询总实绩ID
+    Map<String, Object> getResultTotalIdByOrderNum(String orderNumber);
+
+    //查询上一次用车单位确认暂停结束时间
+    Map<String, Object> getLastTimeout(BigDecimal resultTotalId);
+
+    //查询用车单位确认开始时间
+    Map<String, Object> getStartTime(BigDecimal resultTotalId);
+
+    //查询所有确认暂停结束时间
+    List<Map<String, Object>> getAllTimeout(BigDecimal resultTotalId);
+
+    //查询计时作业
+    List<Map<String, Object>> getAllTimeTaskResult(Map<String, Object> map);
+
+}

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

@@ -30,4 +30,8 @@ public interface TmstruckWeightResultMapper extends IBaseMapper<TmstruckWeightRe
 
     //查询订单下所有的物资件数和物资理重
     List<Map<String, Object>> getMaterialMes(Integer orderId);
+
+    //通过物资ID查询应该在哪个汽车衡计量
+    List<Integer> getCalculateIdByMaterial(BigDecimal material);
+
 }

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

@@ -0,0 +1,34 @@
+package com.steerinfo.dil.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/26 14:27
+ */
+
+@Mapper
+public interface UtilsMapper {
+
+    //查询运输订单最大主键Id
+    @Select("select seq_omstruck_order.nextval from dual")
+    BigDecimal selectOrderMaxId();
+
+    //查询运输订单子表主键ID
+    @Select("select seq_omstruck_order_material.nextval from dual")
+    BigDecimal selectOrderMaterialMaxId();
+
+    //通过订单Id修改订单状态
+    int updateOrderStatusByOrderIdOrNum(Map<String, Object> map);
+
+    //通过运输Id 或者运输订单号修改 路段顺序号
+    int updateLineSeqByOrderIdOrNum(Map<String, Object> map);
+
+    //通过运力ID 或车牌号 修改运力状态
+    int updateCapacityByCarIdOrNum(Map<String, Object> map);
+
+}

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

@@ -1,290 +0,0 @@
-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 AmsSaleOrderMaterial implements IBasePO<Short> {
-    /**
-     * 主键ID(SALE_ORDER_MATERIAL_ID,DECIMAL,0)
-     */
-    @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal saleOrderMaterialId;
-
-    /**
-     * 销售订单ID(SALE_ORDER_ID,DECIMAL,0)
-     */
-    @ApiModelProperty(value="销售订单ID",required=true)
-    private BigDecimal saleOrderId;
-
-    /**
-     * 车序号(SALE_ORDER_MATERIAL_TRUCK_NO,DECIMAL,0)
-     */
-    @ApiModelProperty(value="车序号",required=false)
-    private BigDecimal saleOrderMaterialTruckNo;
-
-    /**
-     * 物资ID(MATERIAL_ID,DECIMAL,0)
-     */
-    @ApiModelProperty(value="物资ID",required=false)
-    private BigDecimal materialId;
-
-    /**
-     * 物资件数(SALE_ORDER_MATERIAL_NUMBER,DECIMAL,0)
-     */
-    @ApiModelProperty(value="物资件数",required=false)
-    private BigDecimal saleOrderMaterialNumber;
-
-    /**
-     * 物资理论重量(MATERIAL_THEORETICAL_WEIGHT,DECIMAL,0)
-     */
-    @ApiModelProperty(value="物资理论重量",required=false)
-    private BigDecimal materialTheoreticalWeight;
-
-    /**
-     * 收货地址ID(SALE_SHIPPING_ADDRESS_ID,DECIMAL,0)
-     */
-    @ApiModelProperty(value="收货地址ID",required=false)
-    private BigDecimal saleShippingAddressId;
-
-    /**
-     * 收货日期(SALE_DATE_OF_RECEIPT,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="收货日期",required=false)
-    private Date saleDateOfReceipt;
-
-    /**
-     * 收货方姓名(SALE_ORDER_CONSIGNEE,VARCHAR,20)
-     */
-    @ApiModelProperty(value="收货方姓名",required=false)
-    private String saleOrderConsignee;
-
-    /**
-     * 收货方电话(SALE_ORDER_CONSIGNEE_TEL,VARCHAR,20)
-     */
-    @ApiModelProperty(value="收货方电话",required=false)
-    private String saleOrderConsigneeTel;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
-    private String insertUpdateRemark;
-
-    /**
-     * 是否删除（0：否，1：是）(DELETED,DECIMAL,0)
-     */
-    @ApiModelProperty(value="是否删除（0：否，1：是）",required=false)
-    private BigDecimal deleted;
-
-    /**
-     * 是否为历史记录（0：否，1：是）(UPDATED,DECIMAL,0)
-     */
-    @ApiModelProperty(value="是否为历史记录（0：否，1：是）",required=false)
-    private BigDecimal updated;
-
-    private static final long serialVersionUID = 1L;
-
-    public BigDecimal getSaleOrderMaterialId() {
-        return saleOrderMaterialId;
-    }
-
-    public void setSaleOrderMaterialId(BigDecimal saleOrderMaterialId) {
-        this.saleOrderMaterialId = saleOrderMaterialId;
-    }
-
-    public BigDecimal getSaleOrderId() {
-        return saleOrderId;
-    }
-
-    public void setSaleOrderId(BigDecimal saleOrderId) {
-        this.saleOrderId = saleOrderId;
-    }
-
-    public BigDecimal getSaleOrderMaterialTruckNo() {
-        return saleOrderMaterialTruckNo;
-    }
-
-    public void setSaleOrderMaterialTruckNo(BigDecimal saleOrderMaterialTruckNo) {
-        this.saleOrderMaterialTruckNo = saleOrderMaterialTruckNo;
-    }
-
-    public BigDecimal getMaterialId() {
-        return materialId;
-    }
-
-    public void setMaterialId(BigDecimal materialId) {
-        this.materialId = materialId;
-    }
-
-    public BigDecimal getSaleOrderMaterialNumber() {
-        return saleOrderMaterialNumber;
-    }
-
-    public void setSaleOrderMaterialNumber(BigDecimal saleOrderMaterialNumber) {
-        this.saleOrderMaterialNumber = saleOrderMaterialNumber;
-    }
-
-    public BigDecimal getMaterialTheoreticalWeight() {
-        return materialTheoreticalWeight;
-    }
-
-    public void setMaterialTheoreticalWeight(BigDecimal materialTheoreticalWeight) {
-        this.materialTheoreticalWeight = materialTheoreticalWeight;
-    }
-
-    public BigDecimal getSaleShippingAddressId() {
-        return saleShippingAddressId;
-    }
-
-    public void setSaleShippingAddressId(BigDecimal saleShippingAddressId) {
-        this.saleShippingAddressId = saleShippingAddressId;
-    }
-
-    public Date getSaleDateOfReceipt() {
-        return saleDateOfReceipt;
-    }
-
-    public void setSaleDateOfReceipt(Date saleDateOfReceipt) {
-        this.saleDateOfReceipt = saleDateOfReceipt;
-    }
-
-    public String getSaleOrderConsignee() {
-        return saleOrderConsignee;
-    }
-
-    public void setSaleOrderConsignee(String saleOrderConsignee) {
-        this.saleOrderConsignee = saleOrderConsignee == null ? null : saleOrderConsignee.trim();
-    }
-
-    public String getSaleOrderConsigneeTel() {
-        return saleOrderConsigneeTel;
-    }
-
-    public void setSaleOrderConsigneeTel(String saleOrderConsigneeTel) {
-        this.saleOrderConsigneeTel = saleOrderConsigneeTel == null ? null : saleOrderConsigneeTel.trim();
-    }
-
-    public String getInsertUsername() {
-        return insertUsername;
-    }
-
-    public void setInsertUsername(String insertUsername) {
-        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
-    }
-
-    public Date getInsertTime() {
-        return insertTime;
-    }
-
-    public void setInsertTime(Date insertTime) {
-        this.insertTime = insertTime;
-    }
-
-    public String getUpdateUsername() {
-        return updateUsername;
-    }
-
-    public void setUpdateUsername(String updateUsername) {
-        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public 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 getUpdated() {
-        return updated;
-    }
-
-    public void setUpdated(BigDecimal updated) {
-        this.updated = updated;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", saleOrderMaterialId=").append(saleOrderMaterialId);
-        sb.append(", saleOrderId=").append(saleOrderId);
-        sb.append(", saleOrderMaterialTruckNo=").append(saleOrderMaterialTruckNo);
-        sb.append(", materialId=").append(materialId);
-        sb.append(", saleOrderMaterialNumber=").append(saleOrderMaterialNumber);
-        sb.append(", materialTheoreticalWeight=").append(materialTheoreticalWeight);
-        sb.append(", saleShippingAddressId=").append(saleShippingAddressId);
-        sb.append(", saleDateOfReceipt=").append(saleDateOfReceipt);
-        sb.append(", saleOrderConsignee=").append(saleOrderConsignee);
-        sb.append(", saleOrderConsigneeTel=").append(saleOrderConsigneeTel);
-        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(", updated=").append(updated);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-
-    @Override
-    public Short getId() {
-        return null;
-    }
-
-    @Override
-    public void setId(Short aShort) {
-
-    }
-}

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

@@ -1,259 +0,0 @@
-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 AmstruckPurplan implements IBasePO<BigDecimal> {
-    /**
-     * 主键ID(PLAN_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal planId;
-
-    /**
-     * 批次ID(BATCH_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="批次ID",required=false)
-    private BigDecimal batchId;
-
-    /**
-     * 运输计划号(PLAN_NO,VARCHAR,25)
-     */
-    @ApiModelProperty(value="运输计划号",required=false)
-    private String planNo;
-
-    /**
-     * 承运商ID(CARRIER_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="承运商ID",required=false)
-    private BigDecimal carrierId;
-
-    /**
-     * 车数(PLAN_TRUCK_NUMBER,DECIMAL,38)
-     */
-    @ApiModelProperty(value="车数",required=false)
-    private BigDecimal planTruckNumber;
-
-    /**
-     * 车型ID(CAPACITY_TYPE_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="车型ID",required=false)
-    private BigDecimal capacityTypeId;
-
-    /**
-     * 用车时间(PLAN_TRUCK_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="用车时间",required=false)
-    private Date planTruckTime;
-
-    /**
-     * 计划状态：0：未下发；1：已下发；2：已接收(PLAN_STATUS,DECIMAL,38)
-     */
-    @ApiModelProperty(value="计划状态：0：未下发；1：已下发；2：已接收",required=false)
-    private BigDecimal planStatus;
-
-    /**
-     * 物资总重量(MATERIAL_TOTAL_WEIGHT,DECIMAL,0)
-     */
-    @ApiModelProperty(value="物资总重量",required=false)
-    private BigDecimal materialTotalWeight;
-
-    /**
-     * 预计进厂时间(PLAN_INCOMING_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="预计进厂时间",required=false)
-    private Date planIncomingTime;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
-    private String insertUpdateRemark;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.planId;
-    }
-
-    @Override
-    public void setId(BigDecimal planId) {
-        this.planId = planId;
-    }
-
-    public BigDecimal getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(BigDecimal planId) {
-        this.planId = planId;
-    }
-
-    public BigDecimal getBatchId() {
-        return batchId;
-    }
-
-    public void setBatchId(BigDecimal batchId) {
-        this.batchId = batchId;
-    }
-
-    public String getPlanNo() {
-        return planNo;
-    }
-
-    public void setPlanNo(String planNo) {
-        this.planNo = planNo == null ? null : planNo.trim();
-    }
-
-    public BigDecimal getCarrierId() {
-        return carrierId;
-    }
-
-    public void setCarrierId(BigDecimal carrierId) {
-        this.carrierId = carrierId;
-    }
-
-    public BigDecimal getPlanTruckNumber() {
-        return planTruckNumber;
-    }
-
-    public void setPlanTruckNumber(BigDecimal planTruckNumber) {
-        this.planTruckNumber = planTruckNumber;
-    }
-
-    public BigDecimal getCapacityTypeId() {
-        return capacityTypeId;
-    }
-
-    public void setCapacityTypeId(BigDecimal capacityTypeId) {
-        this.capacityTypeId = capacityTypeId;
-    }
-
-    public Date getPlanTruckTime() {
-        return planTruckTime;
-    }
-
-    public void setPlanTruckTime(Date planTruckTime) {
-        this.planTruckTime = planTruckTime;
-    }
-
-    public BigDecimal getPlanStatus() {
-        return planStatus;
-    }
-
-    public void setPlanStatus(BigDecimal planStatus) {
-        this.planStatus = planStatus;
-    }
-
-    public BigDecimal getMaterialTotalWeight() {
-        return materialTotalWeight;
-    }
-
-    public void setMaterialTotalWeight(BigDecimal materialTotalWeight) {
-        this.materialTotalWeight = materialTotalWeight;
-    }
-
-    public Date getPlanIncomingTime() {
-        return planIncomingTime;
-    }
-
-    public void setPlanIncomingTime(Date planIncomingTime) {
-        this.planIncomingTime = planIncomingTime;
-    }
-
-    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();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", planId=").append(planId);
-        sb.append(", batchId=").append(batchId);
-        sb.append(", planNo=").append(planNo);
-        sb.append(", carrierId=").append(carrierId);
-        sb.append(", planTruckNumber=").append(planTruckNumber);
-        sb.append(", capacityTypeId=").append(capacityTypeId);
-        sb.append(", planTruckTime=").append(planTruckTime);
-        sb.append(", planStatus=").append(planStatus);
-        sb.append(", materialTotalWeight=").append(materialTotalWeight);
-        sb.append(", planIncomingTime=").append(planIncomingTime);
-        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(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

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

@@ -1,199 +0,0 @@
-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 AmstruckPurplanMaterial implements IBasePO<BigDecimal> {
-    /**
-     * 主键ID(PURPLAN_PLAN_MATERIAL_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal purplanPlanMaterialId;
-
-    /**
-     * 计划ID(PLAN_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="计划ID",required=false)
-    private BigDecimal planId;
-
-    /**
-     * 物资ID(MATERIAL_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="物资ID",required=false)
-    private BigDecimal materialId;
-
-    /**
-     * 物资数量(PURPLAN_MATERIAL_NUMBER,DECIMAL,0)
-     */
-    @ApiModelProperty(value="物资数量",required=false)
-    private BigDecimal purplanMaterialNumber;
-
-    /**
-     * 已分配重量(MATERIAL_ALLOCATED_WEIGHT,DECIMAL,0)
-     */
-    @ApiModelProperty(value="已分配重量",required=false)
-    private BigDecimal materialAllocatedWeight;
-
-    /**
-     * 未分配重量(MATERIAL_UNALLOCATED_WEIGHT,DECIMAL,0)
-     */
-    @ApiModelProperty(value="未分配重量",required=false)
-    private BigDecimal materialUnallocatedWeight;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
-    private String insertUpdateRemark;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.purplanPlanMaterialId;
-    }
-
-    @Override
-    public void setId(BigDecimal purplanPlanMaterialId) {
-        this.purplanPlanMaterialId = purplanPlanMaterialId;
-    }
-
-    public BigDecimal getPurplanPlanMaterialId() {
-        return purplanPlanMaterialId;
-    }
-
-    public void setPurplanPlanMaterialId(BigDecimal purplanPlanMaterialId) {
-        this.purplanPlanMaterialId = purplanPlanMaterialId;
-    }
-
-    public BigDecimal getPlanId() {
-        return planId;
-    }
-
-    public void setPlanId(BigDecimal planId) {
-        this.planId = planId;
-    }
-
-    public BigDecimal getMaterialId() {
-        return materialId;
-    }
-
-    public void setMaterialId(BigDecimal materialId) {
-        this.materialId = materialId;
-    }
-
-    public BigDecimal getPurplanMaterialNumber() {
-        return purplanMaterialNumber;
-    }
-
-    public void setPurplanMaterialNumber(BigDecimal purplanMaterialNumber) {
-        this.purplanMaterialNumber = purplanMaterialNumber;
-    }
-
-    public BigDecimal getMaterialAllocatedWeight() {
-        return materialAllocatedWeight;
-    }
-
-    public void setMaterialAllocatedWeight(BigDecimal materialAllocatedWeight) {
-        this.materialAllocatedWeight = materialAllocatedWeight;
-    }
-
-    public BigDecimal getMaterialUnallocatedWeight() {
-        return materialUnallocatedWeight;
-    }
-
-    public void setMaterialUnallocatedWeight(BigDecimal materialUnallocatedWeight) {
-        this.materialUnallocatedWeight = materialUnallocatedWeight;
-    }
-
-    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();
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", purplanPlanMaterialId=").append(purplanPlanMaterialId);
-        sb.append(", planId=").append(planId);
-        sb.append(", materialId=").append(materialId);
-        sb.append(", purplanMaterialNumber=").append(purplanMaterialNumber);
-        sb.append(", materialAllocatedWeight=").append(materialAllocatedWeight);
-        sb.append(", materialUnallocatedWeight=").append(materialUnallocatedWeight);
-        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(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

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

@@ -1,334 +0,0 @@
-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,38)
-     */
-    @ApiModelProperty(value="运输订单id",required=true)
-    private BigDecimal orderId;
-
-    /**
-     * 销售订单和物资的中间表ID/发运计划ID/采购订单ID/内转物流计划ID(ORDER_PLAN_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="销售订单和物资的中间表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,38)
-     */
-    @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,38)
-     */
-    @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：逻辑删除(ORDER_STATUS,DECIMAL,38)
-     */
-    @ApiModelProperty(value="运单状态 ：0：待运输，1：执行中，2：已结束，3：未下发，4：已下发，5：已接收，6：未接收，7：逻辑删除",required=false)
-    private BigDecimal orderStatus;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(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：内转物流计划）(ORDER_TYPE,DECIMAL,0)
-     */
-    @ApiModelProperty(value="订单类型（1：销售订单；2：发运计划；3：采购订单；4：内转物流计划）",required=false)
-    private BigDecimal orderType;
-
-    /**
-     * 路段顺序号(ORDER_LINE_SEQUENCE,DECIMAL,38)
-     */
-    @ApiModelProperty(value="路段顺序号",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(DRIVER_CAPACITY_ID,DECIMAL,0)
-     */
-    @ApiModelProperty(value="司机排班id",required=false)
-    private BigDecimal driverCapacityId;
-
-    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 getDriverCapacityId() {
-        return driverCapacityId;
-    }
-
-    public void setDriverCapacityId(BigDecimal driverCapacityId) {
-        this.driverCapacityId = driverCapacityId;
-    }
-
-    @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(", driverCapacityId=").append(driverCapacityId);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

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

@@ -1,199 +0,0 @@
-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 OmstruckOrderMaterial implements IBasePO<BigDecimal> {
-    /**
-     * 主键ID(ORDER_MATERIAL_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="主键ID",required=true)
-    private BigDecimal orderMaterialId;
-
-    /**
-     * 订单id(ORDER_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="订单id",required=false)
-    private BigDecimal orderId;
-
-    /**
-     * 钢材物资ID(MATERIAL_ID,DECIMAL,38)
-     */
-    @ApiModelProperty(value="钢材物资ID",required=false)
-    private BigDecimal materialId;
-
-    /**
-     * 物资件数(ORDER_MATERIAL_NUMBER,DECIMAL,38)
-     */
-    @ApiModelProperty(value="物资件数",required=false)
-    private BigDecimal orderMaterialNumber;
-
-    /**
-     * 物资重量(ORDER_MATERIAL_WEIGHT,DECIMAL,0)
-     */
-    @ApiModelProperty(value="物资重量",required=false)
-    private BigDecimal orderMaterialWeight;
-
-    /**
-     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录创建人",required=false)
-    private String insertUsername;
-
-    /**
-     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录创建时间",required=false)
-    private Date insertTime;
-
-    /**
-     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
-     */
-    @ApiModelProperty(value="记录修改人",required=false)
-    private String updateUsername;
-
-    /**
-     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
-     */
-    @ApiModelProperty(value="记录修改时间",required=false)
-    private Date updateTime;
-
-    /**
-     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
-     */
-    @ApiModelProperty(value="记录创建或修改备注",required=false)
-    private String insertUpdateRemark;
-
-    /**
-     * 物资指向：0：物资主表（原料用）；1：物资子表（钢材用）(MATERIAL_DIRECTION,DECIMAL,0)
-     */
-    @ApiModelProperty(value="物资指向：0：物资主表（原料用）；1：物资子表（钢材用）",required=false)
-    private BigDecimal materialDirection;
-
-    private static final long serialVersionUID = 1L;
-
-    @Override
-    public BigDecimal getId() {
-        return this.orderMaterialId;
-    }
-
-    @Override
-    public void setId(BigDecimal orderMaterialId) {
-        this.orderMaterialId = orderMaterialId;
-    }
-
-    public BigDecimal getOrderMaterialId() {
-        return orderMaterialId;
-    }
-
-    public void setOrderMaterialId(BigDecimal orderMaterialId) {
-        this.orderMaterialId = orderMaterialId;
-    }
-
-    public BigDecimal getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(BigDecimal orderId) {
-        this.orderId = orderId;
-    }
-
-    public BigDecimal getMaterialId() {
-        return materialId;
-    }
-
-    public void setMaterialId(BigDecimal materialId) {
-        this.materialId = materialId;
-    }
-
-    public BigDecimal getOrderMaterialNumber() {
-        return orderMaterialNumber;
-    }
-
-    public void setOrderMaterialNumber(BigDecimal orderMaterialNumber) {
-        this.orderMaterialNumber = orderMaterialNumber;
-    }
-
-    public BigDecimal getOrderMaterialWeight() {
-        return orderMaterialWeight;
-    }
-
-    public void setOrderMaterialWeight(BigDecimal orderMaterialWeight) {
-        this.orderMaterialWeight = orderMaterialWeight;
-    }
-
-    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 getMaterialDirection() {
-        return materialDirection;
-    }
-
-    public void setMaterialDirection(BigDecimal materialDirection) {
-        this.materialDirection = materialDirection;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", orderMaterialId=").append(orderMaterialId);
-        sb.append(", orderId=").append(orderId);
-        sb.append(", materialId=").append(materialId);
-        sb.append(", orderMaterialNumber=").append(orderMaterialNumber);
-        sb.append(", orderMaterialWeight=").append(orderMaterialWeight);
-        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(", materialDirection=").append(materialDirection);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}

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

@@ -0,0 +1,334 @@
+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 TmstruckTimeTaskResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键id(TIME_TASK_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键id",required=true)
+    private BigDecimal timeTaskResultId;
+
+    /**
+     * 总实绩ID(RESULT_TOTAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="总实绩ID",required=false)
+    private BigDecimal resultTotalId;
+
+    /**
+     * 作业时长(RESULT_VALUE,DECIMAL,10)
+     */
+    @ApiModelProperty(value="作业时长",required=false)
+    private BigDecimal resultValue;
+
+    /**
+     * 度量单位ID(RESULT_UOM_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="度量单位ID",required=false)
+    private BigDecimal resultUomId;
+
+    /**
+     * 记录时间类型：（0：计时开始申请时间；1：计时开始确认时间；2：计时结束申请时间；3：计时结束确认时间；4：暂停开始申请时间；5：暂停开始确认时间；6：暂停结束申请时间；7：暂停结束确认时间）(RESULT_TIME_TYPE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="记录时间类型：（0：计时开始申请时间；1：计时开始确认时间；2：计时结束申请时间；3：计时结束确认时间；4：暂停开始申请时间；5：暂停开始确认时间；6：暂停结束申请时间；7：暂停结束确认时间）",required=false)
+    private BigDecimal resultTimeType;
+
+    /**
+     * 计时时间(RESULT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计时时间",required=false)
+    private Date resultTime;
+
+    /**
+     * 扫码开始作业点ID(RESULT_START_NODE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="扫码开始作业点ID",required=false)
+    private BigDecimal resultStartNodeId;
+
+    /**
+     * 扫码开始经度(RESULT_START_LONGITUDE_VAL,VARCHAR,20)
+     */
+    @ApiModelProperty(value="扫码开始经度",required=false)
+    private String resultStartLongitudeVal;
+
+    /**
+     * 扫码开始纬度(RESULT_START_LATITUDE_VAL,VARCHAR,20)
+     */
+    @ApiModelProperty(value="扫码开始纬度",required=false)
+    private String resultStartLatitudeVal;
+
+    /**
+     * 扫码结束作业点ID(RESULT_END_NODE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="扫码结束作业点ID",required=false)
+    private BigDecimal resultEndNodeId;
+
+    /**
+     * 扫码结束经度(RESULT_END_LONGITUDE_VAL,VARCHAR,20)
+     */
+    @ApiModelProperty(value="扫码结束经度",required=false)
+    private String resultEndLongitudeVal;
+
+    /**
+     * 扫码结束纬度(RESULT_END_LATITUDE_VAL,VARCHAR,20)
+     */
+    @ApiModelProperty(value="扫码结束纬度",required=false)
+    private String resultEndLatitudeVal;
+
+    /**
+     * 备注(RESULT_MEMO,VARCHAR,200)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String resultMemo;
+
+    /**
+     * 记录创建人(INSERT_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录创建人",required=false)
+    private String insertUsername;
+
+    /**
+     * 记录创建时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录创建时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录修改人(UPDATE_USERNAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="记录修改人",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="记录修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,100)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 废除人(DELETE_NAME,VARCHAR,20)
+     */
+    @ApiModelProperty(value="废除人",required=false)
+    private String deleteName;
+
+    /**
+     * 废除时间(DELETE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="废除时间",required=false)
+    private Date deleteTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.timeTaskResultId;
+    }
+
+    @Override
+    public void setId(BigDecimal timeTaskResultId) {
+        this.timeTaskResultId = timeTaskResultId;
+    }
+
+    public BigDecimal getTimeTaskResultId() {
+        return timeTaskResultId;
+    }
+
+    public void setTimeTaskResultId(BigDecimal timeTaskResultId) {
+        this.timeTaskResultId = timeTaskResultId;
+    }
+
+    public BigDecimal getResultTotalId() {
+        return resultTotalId;
+    }
+
+    public void setResultTotalId(BigDecimal resultTotalId) {
+        this.resultTotalId = resultTotalId;
+    }
+
+    public BigDecimal getResultValue() {
+        return resultValue;
+    }
+
+    public void setResultValue(BigDecimal resultValue) {
+        this.resultValue = resultValue;
+    }
+
+    public BigDecimal getResultUomId() {
+        return resultUomId;
+    }
+
+    public void setResultUomId(BigDecimal resultUomId) {
+        this.resultUomId = resultUomId;
+    }
+
+    public BigDecimal getResultTimeType() {
+        return resultTimeType;
+    }
+
+    public void setResultTimeType(BigDecimal resultTimeType) {
+        this.resultTimeType = resultTimeType;
+    }
+
+    public Date getResultTime() {
+        return resultTime;
+    }
+
+    public void setResultTime(Date resultTime) {
+        this.resultTime = resultTime;
+    }
+
+    public BigDecimal getResultStartNodeId() {
+        return resultStartNodeId;
+    }
+
+    public void setResultStartNodeId(BigDecimal resultStartNodeId) {
+        this.resultStartNodeId = resultStartNodeId;
+    }
+
+    public String getResultStartLongitudeVal() {
+        return resultStartLongitudeVal;
+    }
+
+    public void setResultStartLongitudeVal(String resultStartLongitudeVal) {
+        this.resultStartLongitudeVal = resultStartLongitudeVal == null ? null : resultStartLongitudeVal.trim();
+    }
+
+    public String getResultStartLatitudeVal() {
+        return resultStartLatitudeVal;
+    }
+
+    public void setResultStartLatitudeVal(String resultStartLatitudeVal) {
+        this.resultStartLatitudeVal = resultStartLatitudeVal == null ? null : resultStartLatitudeVal.trim();
+    }
+
+    public BigDecimal getResultEndNodeId() {
+        return resultEndNodeId;
+    }
+
+    public void setResultEndNodeId(BigDecimal resultEndNodeId) {
+        this.resultEndNodeId = resultEndNodeId;
+    }
+
+    public String getResultEndLongitudeVal() {
+        return resultEndLongitudeVal;
+    }
+
+    public void setResultEndLongitudeVal(String resultEndLongitudeVal) {
+        this.resultEndLongitudeVal = resultEndLongitudeVal == null ? null : resultEndLongitudeVal.trim();
+    }
+
+    public String getResultEndLatitudeVal() {
+        return resultEndLatitudeVal;
+    }
+
+    public void setResultEndLatitudeVal(String resultEndLatitudeVal) {
+        this.resultEndLatitudeVal = resultEndLatitudeVal == null ? null : resultEndLatitudeVal.trim();
+    }
+
+    public String getResultMemo() {
+        return resultMemo;
+    }
+
+    public void setResultMemo(String resultMemo) {
+        this.resultMemo = resultMemo == null ? null : resultMemo.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getDeleteName() {
+        return deleteName;
+    }
+
+    public void setDeleteName(String deleteName) {
+        this.deleteName = deleteName == null ? null : deleteName.trim();
+    }
+
+    public Date getDeleteTime() {
+        return deleteTime;
+    }
+
+    public void setDeleteTime(Date deleteTime) {
+        this.deleteTime = deleteTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", timeTaskResultId=").append(timeTaskResultId);
+        sb.append(", resultTotalId=").append(resultTotalId);
+        sb.append(", resultValue=").append(resultValue);
+        sb.append(", resultUomId=").append(resultUomId);
+        sb.append(", resultTimeType=").append(resultTimeType);
+        sb.append(", resultTime=").append(resultTime);
+        sb.append(", resultStartNodeId=").append(resultStartNodeId);
+        sb.append(", resultStartLongitudeVal=").append(resultStartLongitudeVal);
+        sb.append(", resultStartLatitudeVal=").append(resultStartLatitudeVal);
+        sb.append(", resultEndNodeId=").append(resultEndNodeId);
+        sb.append(", resultEndLongitudeVal=").append(resultEndLongitudeVal);
+        sb.append(", resultEndLatitudeVal=").append(resultEndLatitudeVal);
+        sb.append(", resultMemo=").append(resultMemo);
+        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(", deleteName=").append(deleteName);
+        sb.append(", deleteTime=").append(deleteTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/steerinfo/dil/service/IAmstruckPurplanMaterialService.java

@@ -1,26 +0,0 @@
-package com.steerinfo.dil.service;
-
-import com.steerinfo.dil.model.AmstruckPurplanMaterial;
-import com.steerinfo.framework.service.IBaseService;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AmstruckPurplanMaterial服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-03 02:15
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：AmstruckPurplanMaterial服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAmstruckPurplanMaterialService{
-    //查询所有已分解计划
-    List<Map<String, Object>> getDecomposedPlan(Map<String, Object> map);
-}

src/main/java/com/steerinfo/dil/service/IAmstruckPurplanService.java

@@ -1,45 +0,0 @@
-package com.steerinfo.dil.service;
-
-import com.steerinfo.dil.model.AmstruckPurplan;
-import com.steerinfo.framework.service.IBaseService;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AmstruckPurplan服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-02 10:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-02
- * 作者：generator
- * 参考：
- * 描述：AmstruckPurplan服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IAmstruckPurplanService{
-    //查询所有运输计划
-    List<Map<String, Object>> getAllPurPlan(Map<String, Object> map);
-
-    //通过ID查询运输计划
-    List<Map<String, Object>> getPurPlanById(@Param("planId") Integer planId);
-
-    //新增运输计划
-    int addPurPlan(AmstruckPurplan amstruckPurplan);
-
-    //修改运输计划
-    int updatePurPlan(AmstruckPurplan amstruckPurplan);
-
-    //逻辑删除运输计划
-    int deletePurPlan(AmstruckPurplan amstruckPurplan);
-
-    //下发运输计划
-    int sendPurPlan(AmstruckPurplan amstruckPurplan);
-
-    //下发运输计划
-    int receptionPurPlan(AmstruckPurplan amstruckPurplan);
-}

src/main/java/com/steerinfo/dil/service/IOmstruckOrderMaterialService.java

@@ -1,23 +0,0 @@
-package com.steerinfo.dil.service;
-
-import com.steerinfo.dil.model.OmstruckOrderMaterial;
-import com.steerinfo.framework.service.IBaseService;
-
-import java.math.BigDecimal;
-
-/**
- * OmstruckOrderMaterial服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-03 04:55
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：OmstruckOrderMaterial服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IOmstruckOrderMaterialService{
-
-}

src/main/java/com/steerinfo/dil/service/IOmstruckOrderService.java

@@ -1,71 +0,0 @@
-package com.steerinfo.dil.service;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * OmstruckOrder服务接口：
- * @author generator
- * @version 1.0-SNAPSHORT 2021-09-03 03:47
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：OmstruckOrder服务接口
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-public interface IOmstruckOrderService{
-
-    //查询所有运输订单信息 状态：3
-    //查询所有已经下发的运输订单 用于查询司机车牌 websocket  状态：4
-    List<Map<String, Object>> getAllTruckOrder(Map<String, Object> map);
-
-    //新增采购进口矿 运输订单
-    int addPurOrder(Map<String, Object> map);
-
-    //查询所有运力信息
-    List<Map<String, Object>> getAllCapacity(Map<String, Object> map);
-
-    //修改运输订单 和 运输订单子表
-    int updateOrder(Map<String, Object> map);
-
-    //分派运单给司机
-    int dispatchOrder(Integer id);
-
-    //逻辑删除未下发运单
-    int deleteOrder(Map<String, Object> map);
-
-    //司机接单\拒绝
-    int driverReceiveOrRefuse(Map<String, Object> map);
-
-    //查询所有接单或拒绝接单的订单
-    List<Map<String, Object>> getReceiveRefuseOrder(Map<String, Object> map);
-
-    //司机接单调用接口推送数据 接收车牌号
-    List<Map<String, Object>> sendMesToDriver(Map<String, Object> map);
-
-    //通过运单号查询所有信息
-    List<Map<String, Object>> getOrderMesByOrderNum(Map<String, Object> map);
-
-    //查询司机所有已拒绝过的订单
-    List<Map<String, Object>> getReceiveRefuseOrderByCapacityId(Map<String, Object> map);
-
-    // 查询实绩地点和时间
-    List<Map<String, Object>> selectPlaceAndTime(BigDecimal orderId);
-
-    //通过运单Id获取运单相关信息
-    List<Map<String, Object>> getOrderByOrderId(BigDecimal orderId);
-
-    //运输派单
-    List<Map<String, Object>> getTransportDispatch(Map<String, Object> map);
-
-    //新增销售订单
-    int addOrderForSale(Map<String,Object> map);
-
-    //查找司机排班表信息
-    List<Map<String,Object>> selectCapacityAndDriver(Map<String,Object> map);
-}

src/main/java/com/steerinfo/dil/service/ITmstruckEnfactoryResultService.java

@@ -20,18 +20,18 @@ import java.util.Map;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface ITmstruckEnfactoryResultService{
-    //获取所有进厂实绩
+    //通过订单类型获取进厂实绩
     List<Map<String, Object>> getAllEnFactoryResult(Map<String, Object> map);
 
-    //采从门岗系统采集信息后 新增进厂作业
+    //新增进厂作业
     int addEnFactoryResult(Map<String, Object> map);
 
-    //使用PDA方式进厂更新实绩
-    int updateEnFactoryByPDA(Map<String,Object> map);
-
-    //使用门禁系统进厂更新实绩
-    int updateEnFactoryByMenJin(Map<String,Object> map);
-
     //查找排队序号
     Integer selectNodeNumber(String orderNumber);
+
+    //进厂实绩
+    int enFactoryResultByPDA(Map<String, Object> map);
+
+    //
+    int enFactoryResultByMJ(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/ITmstruckLeaveFactoryResultService.java

@@ -20,28 +20,17 @@ import java.util.Map;
  * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
  */
 public interface ITmstruckLeaveFactoryResultService {
-    //新增出厂作业实绩
-    int addLeaveFactoryResult(Map<String, Object> map);
 
     //查询所有的出厂实绩
     List<Map<String, Object>> getLeaveFactoryResult(Map<String, Object> map);
 
+    //更新出厂实绩 通过运输订单号
+    int leaveFactoryByPDA(Map<String, Object> map);
+
     //查询运输路线是否为可出厂 路段顺序号为 4：已计皮完成
     Integer selectTransportRoute(String orderNumber);
 
-    //查询车牌号与门岗名称
-    Map<String,Object> selectLeaveFactory(String orderNumber);
 
     //新增进厂实绩 派单时新增
     int addLeaveFactory(Map<String,Object> mapValue);
-
-    //更新出厂实绩
-    int updateLeaveFactoryByPDA(Map<String,Object> mapValue);
-
-    //根据门禁系统采集获取
-    int updateLeaveFactoryByMenGang(Map<String,Object> mapValue);
-
-    //销售物流查询所有的出厂实绩
-    List<Map<String,Object>> selectAllLeaveFacatoryForSale(Map<String,Object> map);
-
 }

src/main/java/com/steerinfo/dil/service/ITmstruckLoadResultService.java

@@ -26,6 +26,9 @@ public interface ITmstruckLoadResultService{
     //新增装车实绩
     int addLoadResult(Map<String, Object> map);
 
+    //新增虚拟装车实绩
+    int addSaleLoadResult(Map<String, Object> map);
+
     //修改装车作业
     int updateLoadResult(TmstruckLoadResult tmstruckLoadResult);
 

src/main/java/com/steerinfo/dil/service/ITmstruckMeasureCommissionService.java

@@ -26,4 +26,10 @@ public interface ITmstruckMeasureCommissionService{
 
     //新增计量委托实绩 当进厂作业完成后
     int addMeasureCommission(BigDecimal totalId, Integer type);
+
+    //添加计毛委托
+    int addMaoMeasureCommission(Map<String, Object> map);
+
+    //添加计皮委托
+    int addPiMeasureCommission(Map<String, Object> map);
 }

src/main/java/com/steerinfo/dil/service/ITmstruckReceiptResultService.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public interface ITmstruckReceiptResultService{
 
-    //查询所有签收实绩
+    //查询所有收货实绩
     List<Map<String, Object>> getReceiveResult(Map<String, Object> map);
 
 }

src/main/java/com/steerinfo/dil/service/ITmstruckTimeTaskResultService.java

@@ -0,0 +1,47 @@
+package com.steerinfo.dil.service;
+
+import com.steerinfo.dil.model.TmstruckTimeTaskResult;
+import com.steerinfo.framework.service.IBaseService;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * TmstruckTimeTskResult服务接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 07:28
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-22
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckTimeTskResult服务接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+public interface ITmstruckTimeTaskResultService {
+
+    //司机申请开始装车
+    int applyStartTime(Map<String, Object> map);
+
+    //用车单位确认开始装车
+    int unitSureStartTime(Map<String, Object> map);
+
+    //司机申请暂停
+    int applyStartTimeout(Map<String, Object> map);
+
+    //用车单位确认暂停
+    int unitSureStartTimeout(Map<String, Object> map);
+
+    //司机申请暂停结束
+    int applyEndTimeout(Map<String, Object> map);
+
+    //用车单位确认暂停结束
+    int unitSureEndTimeout(Map<String, Object> map);
+
+    //司机申请结束
+    int applyEndTime(Map<String, Object> map);
+
+    //用车单位确认结束
+    int unitSureEndTime(Map<String, Object> map);
+}

src/main/java/com/steerinfo/dil/service/ITmstruckTotalResultService.java

@@ -0,0 +1,13 @@
+package com.steerinfo.dil.service;
+
+import java.math.BigDecimal;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/27 10:17
+ */
+
+public interface ITmstruckTotalResultService {
+
+    public int addTotalResult(BigDecimal orderId);
+}

src/main/java/com/steerinfo/dil/service/ITmstruckWeightResultService.java

@@ -1,5 +1,6 @@
 package com.steerinfo.dil.service;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -31,4 +32,7 @@ public interface ITmstruckWeightResultService{
 
     //新增计皮计毛实绩
     int addWeightResult(Map<String, Object> map);
+
+    //通过物资ID查询应该在哪个汽车衡计量
+    int getCalculateIdByMaterial(BigDecimal materialId);
 }

src/main/java/com/steerinfo/dil/service/IUtilsService.java

@@ -0,0 +1,24 @@
+package com.steerinfo.dil.service;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/26 14:42
+ */
+
+public interface IUtilsService {
+
+    //添加运单Id
+    BigDecimal selectOrderMaxId();
+
+    //查询运输订单子表主键ID
+    BigDecimal selectOrderMaterialMaxId();
+
+    //通过运力ID 修改运力状态
+    int updateCapacityStatus(Map<String, Object> map, Integer status);
+
+    //修改运输订单状态
+    int updateOrderStatus(Map<String, Object> map, Integer status);
+}

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

@@ -1,36 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.AmstruckPurplanMaterialMapper;
-import com.steerinfo.dil.service.IAmstruckPurplanMaterialService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AmstruckPurplanMaterial服务实现：
- * @author TXF
- * @version 1.0-SNAPSHORT 2021-09-03 02:15
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：AmstruckPurplanMaterial服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "amstruckPurplanMaterialService")
-public class AmstruckPurplanMaterialServiceImpl implements IAmstruckPurplanMaterialService {
-
-    @Autowired
-    private AmstruckPurplanMaterialMapper amstruckPurplanMaterialMapper;
-
-
-    @Override
-    public List<Map<String, Object>> getDecomposedPlan(Map<String, Object> map) {
-        return amstruckPurplanMaterialMapper.getDecomposedPlan(map);
-    }
-}

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

@@ -1,149 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.AmstruckPurplanMapper;
-import com.steerinfo.dil.mapper.AmstruckPurplanMaterialMapper;
-import com.steerinfo.dil.model.AmstruckPurplan;
-import com.steerinfo.dil.model.AmstruckPurplanMaterial;
-import com.steerinfo.dil.service.IAmstruckPurplanService;
-import com.steerinfo.dil.util.DataChange;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-/**
- * AmstruckPurplan服务实现：
- * @author TXF
- * @version 1.0-SNAPSHORT 2021-09-02 10:38
- * 类描述
- * 修订历史：
- * 日期：2021-09-02
- * 作者：generator
- * 参考：
- * 描述：AmstruckPurplan服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "amstruckPurplanService")
-public class AmstruckPurplanServiceImpl implements IAmstruckPurplanService {
-
-    @Autowired
-    private AmstruckPurplanMapper amstruckPurplanMapper;
-
-    @Autowired
-    private AmstruckPurplanMaterialMapper amstruckPurplanMaterialMapper;
-
-    /**
-     * 查询所有运输计划
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllPurPlan(Map<String, Object> map) {
-        return amstruckPurplanMapper.getAllPurPlan(map);
-    }
-
-    /**
-     * 通过主键Id查询运输计划
-     * @param planId
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getPurPlanById(Integer planId) {
-        return amstruckPurplanMapper.getPurPlanById(planId);
-    }
-
-    /**
-     * 新增运输计划
-     * @param amstruckPurplan
-     * @return
-     */
-    @Override
-    @Transactional
-    public int addPurPlan(AmstruckPurplan amstruckPurplan) {
-        //生成主键Id
-        BigDecimal maxId = amstruckPurplanMapper.selectMaxId();
-        amstruckPurplan.setPlanId(maxId);
-        //生成运输计划号
-        int id = maxId.intValue();
-        String planNumber = DataChange.generateEightDigitsNumber("WYSJF", id);
-        amstruckPurplan.setPlanNo(planNumber);
-        //新增状态为未下发：0
-        amstruckPurplan.setPlanStatus(new BigDecimal(0));
-        //记录创建人
-        amstruckPurplan.setInsertUsername("admin");
-        //生成子表数据
-        AmstruckPurplanMaterial amstruckPurplanMaterial = new AmstruckPurplanMaterial();
-        //生成主键
-        amstruckPurplanMaterial.setPurplanPlanMaterialId(amstruckPurplanMaterialMapper.selectMaxId());
-        //设置父表主键
-        amstruckPurplanMaterial.setPlanId(maxId);
-        //设置子表未分配数量重量 = 总重量
-        amstruckPurplanMaterial.setMaterialUnallocatedWeight(amstruckPurplan.getMaterialTotalWeight());
-        //设置已分配重量 初始为 0
-        amstruckPurplanMaterial.setMaterialAllocatedWeight(new BigDecimal(0));
-        int i = amstruckPurplanMaterialMapper.insertSelective(amstruckPurplanMaterial);
-        int i1 = amstruckPurplanMapper.insertSelective(amstruckPurplan);
-        return i + i1;
-    }
-
-    /**
-     * 修改运输计划
-     * @param amstruckPurplan
-     * @return
-     */
-    @Override
-    @Transactional
-    public int updatePurPlan(AmstruckPurplan amstruckPurplan) {
-        int i = amstruckPurplanMapper.updateByPrimaryKeySelective(amstruckPurplan);
-        //通过计划ID查询子表主键ID
-        BigDecimal childId = amstruckPurplanMaterialMapper.getChildIdByPlanId(amstruckPurplan.getPlanId());
-        //修改子表数据未分配物资重量
-        AmstruckPurplanMaterial amstruckPurplanMaterial = new AmstruckPurplanMaterial();
-        amstruckPurplanMaterial.setId(childId);
-        amstruckPurplanMaterial.setMaterialUnallocatedWeight(amstruckPurplan.getMaterialTotalWeight());
-        int i1 = amstruckPurplanMaterialMapper.updateByPrimaryKeySelective(amstruckPurplanMaterial);
-        return i + i1;
-    }
-
-    /**
-     * 逻辑删除运输计划 3
-     * @param amstruckPurplan
-     * @return
-     */
-    @Override
-    public int deletePurPlan(AmstruckPurplan amstruckPurplan) {
-
-        return amstruckPurplanMapper.updateByPrimaryKeySelective(amstruckPurplan);
-    }
-
-    /**
-     * 下发运输计划
-     * @param amstruckPurplan
-     * @return
-     */
-    @Override
-    public int sendPurPlan(AmstruckPurplan amstruckPurplan) {
-        //记录下发计划时间
-        amstruckPurplan.setInsertTime(new Date());
-        return amstruckPurplanMapper.updateByPrimaryKeySelective(amstruckPurplan);
-    }
-
-    /**
-     * 接收运输计划
-     * @param amstruckPurplan
-     * @return
-     */
-    @Override
-    public int receptionPurPlan(AmstruckPurplan amstruckPurplan) {
-        //记录接收计划时间
-        amstruckPurplan.setUpdateTime((new Date()));
-        return amstruckPurplanMapper.updateByPrimaryKeySelective(amstruckPurplan);
-    }
-
-}

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

@@ -1,32 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
-import com.steerinfo.dil.model.OmstruckOrderMaterial;
-import com.steerinfo.dil.service.IOmstruckOrderMaterialService;
-import com.steerinfo.framework.mapper.IBaseMapper;
-import com.steerinfo.framework.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-
-/**
- * OmstruckOrderMaterial服务实现：
- * @author TXF
- * @version 1.0-SNAPSHORT 2021-09-03 04:55
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：OmstruckOrderMaterial服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "omstruckOrderMaterialService")
-public class OmstruckOrderMaterialServiceImpl implements IOmstruckOrderMaterialService {
-
-    @Autowired
-    private OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
-
-  }

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

@@ -1,579 +0,0 @@
-package com.steerinfo.dil.service.impl;
-
-import com.steerinfo.dil.mapper.AmstruckPurplanMaterialMapper;
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
-import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
-import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
-import com.steerinfo.dil.model.*;
-import com.steerinfo.dil.service.IOmstruckOrderService;
-import com.steerinfo.dil.util.DataChange;
-import org.apache.commons.collections4.Put;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.math.BigDecimal;
-import java.security.PublicKey;
-import java.util.*;
-
-/**
- * OmstruckOrder服务实现：
- * @author TXF
- * @version 1.0-SNAPSHORT 2021-09-03 03:47
- * 类描述
- * 修订历史：
- * 日期：2021-09-03
- * 作者：generator
- * 参考：
- * 描述：OmstruckOrder服务实现
- * @see null
- * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
- */
-@Service(value = "omstruckOrderService")
-public class OmstruckOrderServiceImpl implements IOmstruckOrderService {
-
-    @Autowired
-    private OmstruckOrderMapper omstruckOrderMapper;
-
-    @Autowired
-    private AmstruckPurplanMaterialMapper amstruckPurplanMaterialMapper;
-
-    @Autowired
-    private OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
-
-    @Autowired
-    private TmstruckTotalResultMapper tmstruckTotalResultMapper;
-
-    @Autowired
-    private TmstruckEnfactoryResultServiceImpl tmstruckEnfactoryResultService;
-    @Autowired
-    private TmstruckLeaveFactoryResultServiceImpl tmstruckLeaveFactoryResultService;
-    @Autowired
-    private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
-    @Autowired
-    private TmstruckUnloadResultServiceImpl tmstruckUnloadResultService;
-    @Autowired
-    private TmstruckLoadResultServiceImpl tmstruckLoadResultService;
-    /**
-     * 查询所有运输订单
-     * 获取已下发的运输订单 用于websocket
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllTruckOrder(Map<String, Object> map) {
-        return omstruckOrderMapper.getAllTruckOrder(map);
-    }
-
-    /**
-     * 生成运输订单实体类
-     */
-    public OmstruckOrder generateOmsTruckOrder(Map<String, Object> map){
-        Integer personnelId=(Integer) map.get("personnelId");
-        String personnelName=omstruckOrderMapper.selectPersonNameByPersonnelId(personnelId);
-        Integer orderType=Integer.parseInt(map.get("orderType").toString());
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        //生成订单主键Id
-        BigDecimal maxId = omstruckOrderMapper.selectMaxId();
-        omstruckOrder.setOrderId(maxId);
-        //生成运输订单号
-        int id = maxId.intValue();
-        String orderNumber = DataChange.generateEightDigitsNumber("WYSDD", id);
-        omstruckOrder.setOrderNumber(orderNumber);
-        //运单状态 刚分配默认为未下发
-        omstruckOrder.setOrderStatus(new BigDecimal(3));
-        //判断运输订单类型
-        if (orderType == 3) {
-            //添加采购订单ID
-            omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("purchaseOrderId")));
-            //添加订单类型 3
-            omstruckOrder.setOrderType(new BigDecimal(3));
-        }else if (orderType == 1){
-            //添加销售订单与物资对应中间表ID
-            omstruckOrder.setOrderPlanId(DataChange.dataToBigDecimal(map.get("saleOrdermaterialId")));
-            //添加订单类型 1为销售订单
-            omstruckOrder.setOrderType(new BigDecimal(1));
-        }
-        //添加运力Id
-        BigDecimal capacityId = DataChange.dataToBigDecimal(map.get("capacityId"));
-        omstruckOrder.setCapacityId(capacityId);
-        omstruckOrder.setInsertUsername(personnelName);
-        omstruckOrder.setInsertTime(new Date());
-        return omstruckOrder;
-    }
-
-    /**
-     * 新增采购 运输订单
-     * @param map
-     * @return
-     */
-    @Override
-    @Transactional
-    public int addPurOrder(Map<String, Object> map) {
-        //生成运输订单号和主键
-        OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
-        //设置线路  遗留问题
-        omstruckOrder.setLineId(new BigDecimal(1));
-        Object orderEntryTime = map.get("orderEntryTime");
-        if(orderEntryTime != null){
-            omstruckOrder.setOrderEntryTime(new Date((long) orderEntryTime)); //新增预计进厂时间
-        }
-        if(map.get("orderMaterialWeight") != null){
-            updateMaterial(map); //更改运输计划子表 增加已分配重量 减少未分配重量
-        }
-        //新增运输订单
-        omstruckOrderMapper.insertSelective(omstruckOrder);
-        //更新运力状态为待运输：2
-        map.put("capacityStatus", 2);
-        omstruckOrderMapper.updateCapacityByCarIdOrNum(map);
-        //新增运输订单子表
-        addOrderMaterial(map, omstruckOrder.getOrderId());
-        //新增实绩总表关联订单
-        addTotalResult(omstruckOrder.getOrderId());
-        return 5;
-    }
-
-    /**
-     * 新增销售订单
-     * @param map
-     * @return
-     */
-    @Override
-    @Transactional
-    public int addOrderForSale(Map<String, Object> map) {
-        //生成运输订单号和主键
-        OmstruckOrder omstruckOrder = generateOmsTruckOrder(map);
-        //设置线路  遗留问题,设置为进门门岗
-        omstruckOrder.setLineId(new BigDecimal(1));
-        //新增运输订单
-        omstruckOrderMapper.insertSelective(omstruckOrder);
-        //更新运力状态为待运输：2
-        map.put("capacityStatus", 2);
-        omstruckOrderMapper.updateCapacityByCarIdOrNum(map);
-        //新增运输订单子表
-        addOrderMaterial(map, omstruckOrder.getOrderId());
-        //新增实绩总表关联订单
-        addTotalResult(omstruckOrder.getOrderId());
-        return 5;
-    }
-
-    /**
-     * 查找司机排班表信息
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> selectCapacityAndDriver(Map<String, Object> map) {
-        return omstruckOrderMapper.selectCapacityAndDriver(map);
-    }
-
-
-    /**
-     * 新增实绩总表
-     * 运输订单ID
-     * @param orderId
-     * @return
-     */
-    public int addTotalResult(BigDecimal orderId){
-        TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
-        tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectMaxId());
-        tmstruckTotalResult.setOrderId(orderId);
-        tmstruckTotalResult.setInsertTime(new Date());
-        tmstruckTotalResult.setInsertUsername("admin");
-        return tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
-    }
-
-    /**
-     * 新增订单子表
-     * @param map
-     * @param
-     */
-    public void addOrderMaterial(Map<String, Object> map, BigDecimal orderId){
-        Integer orderType=(Integer)map.get("orderType");
-        Integer personnelId=(Integer) map.get("personnelId");
-        String personnelName=omstruckOrderMapper.selectPersonNameByPersonnelId(personnelId);
-        //新增运输订单子表
-        OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
-        //生成子表主键
-        omstruckOrderMaterial.setOrderMaterialId(omstruckOrderMaterialMapper.selectMaxId());
-        omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
-        omstruckOrderMaterial.setOrderId(orderId);
-        if (orderType==3) {
-            Object orderMaterialWeight = map.get("orderMaterialWeight"); // 采购辅料没有物资重量
-            if (orderMaterialWeight != null) {
-                omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(orderMaterialWeight));
-            }
-        }else if (orderType==1){
-            //获取中间表id
-            Integer saleOrdermaterialId=(Integer)map.get("saleOrdermaterialId");
-            //通过车序号id查找物资件数和物资重量
-            Map<String,Object> map1=omstruckOrderMapper.selectTheoreticalWeightAndMaterialNumber(saleOrdermaterialId);
-            BigDecimal  materialNumber =(BigDecimal) map1.get("materialNumber");
-            BigDecimal weight=(BigDecimal) map1.get("weight");
-            //设置物资理重和物资件数
-            omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(weight));
-            omstruckOrderMaterial.setOrderMaterialNumber(DataChange.dataToBigDecimal(materialNumber));
-            //通过销售订单车序号id查找物资id
-            List<Map<String,Object>> materialList=omstruckOrderMapper.selectMaterialIdBysaleOrderMaterialId(saleOrdermaterialId);
-            for (int i=0;i<materialList.size();i++) {
-                Map<String,Object> map2=materialList.get(i);
-                BigDecimal materialId=(BigDecimal) map2.get("materialId");
-                omstruckOrderMaterial.setMaterialId(materialId);
-            }
-            //自动下发订单
-            OmstruckOrder omstruckOrder=new OmstruckOrder();
-            omstruckOrder.setOrderId(orderId);
-            //设置状态为已下发：4
-            //生成订单下发时间 修改订单表
-            omstruckOrder.setOrderIssueTime(new Date());
-            omstruckOrder.setOrderStatus(new BigDecimal(4));
-            omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-            //通过运输订单ID查询运输订单号 （使用的都是运输订单号）
-            // String orderNumber = omstruckOrderMapper.getOrderNumberByOrderId(orderId);
-            //通过运输订单号 查询各个作业点ID 及 总实绩ID
-            Map<String, Object> numMap = new HashMap<>();
-            numMap.put("orderId", orderId);
-            Map<String, Object> map4 = omstruckOrderMapper.getPointIdByOrderNum(numMap);
-            tmstruckEnfactoryResultService.addEnFactoryResult(map4);
-            tmstruckWeightResultService.addWeightResult(map4);
-            tmstruckLeaveFactoryResultService.addLeaveFactory(map4);
-            if((Integer) map.get("orderType") == 3){
-                tmstruckUnloadResultService.addUnloadResult(map4);
-            }
-            //将下发的销售订单中间表逻辑删除
-            AmsSaleOrderMaterial amsSaleOrderMaterial=new AmsSaleOrderMaterial();
-            amsSaleOrderMaterial.setSaleOrderMaterialId(new BigDecimal(saleOrdermaterialId));
-            amsSaleOrderMaterial.setDeleted(new BigDecimal(0));
-
-        }
-        omstruckOrderMaterial.setInsertUsername(personnelName);
-        omstruckOrderMaterial.setInsertTime(new Date());
-        omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
-    }
-
-    /**
-     * 用于更改计划子表方法
-     * @param map
-     */
-    public void updateMaterial(Map<String, Object> map){
-        Object omw = map.get("orderMaterialWeight");
-        double weight;
-        if(omw instanceof Double){
-            weight = (Double) omw;
-        }else if(omw instanceof Integer){
-            weight = (Integer) omw;
-        }else {
-            weight = Double.parseDouble(omw.toString());
-        }
-        Integer planId = DataChange.dataToBigDecimal(map.get("planId")).intValue();
-        List<Map<String, Object>> weightList = amstruckPurplanMaterialMapper.getWeight(planId);
-        Map<String, Object> weightMap = weightList.get(0);
-        double materialAllocatedWeight = DataChange.dataToBigDecimal(weightMap.get("materialAllocatedWeight")).floatValue();
-        double materialUnallocatedWeight = DataChange.dataToBigDecimal(weightMap.get("materialUnallocatedWeight")).floatValue();
-        //float allWeight = materialAllocatedWeight + materialUnallocatedWeight;
-        //前端判断数据分配重量是否大于未分配重量 此处不做判断
-
-        //通过前端是否传来旧的重量 判断 是否是在原有已分解过的计划上修改 未分配 已分配重量
-        if(map.get("weight") != null){
-            BigDecimal oldWeight = DataChange.dataToBigDecimal(map.get("weight"));
-            double difference = weight - oldWeight.doubleValue();
-            materialAllocatedWeight += difference;
-            materialUnallocatedWeight -= difference;
-        }else {
-            materialAllocatedWeight += weight;
-            materialUnallocatedWeight -= weight;
-        }
-        AmstruckPurplanMaterial amstruckPurplanMaterial = new AmstruckPurplanMaterial();
-        //通过计划Id查询子表主键
-        amstruckPurplanMaterial.setPurplanPlanMaterialId(amstruckPurplanMaterialMapper.getChildIdByPlanId(new BigDecimal(planId)));
-        amstruckPurplanMaterial.setMaterialAllocatedWeight(new BigDecimal(materialAllocatedWeight));
-        amstruckPurplanMaterial.setMaterialUnallocatedWeight(new BigDecimal(materialUnallocatedWeight));
-        amstruckPurplanMaterialMapper.updateByPrimaryKeySelective(amstruckPurplanMaterial);
-    }
-
-    /**
-     * 查询所有运力信息
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllCapacity(Map<String, Object> map) {
-        return omstruckOrderMapper.getAllCapacity(map);
-    }
-
-    /**
-     * 修改运输订单 和订单子表
-     * @param map
-     * @return
-     */
-    @Override
-    @Transactional
-    public int updateOrder(Map<String, Object> map) {
-        //修改运输订单运力ID
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-        omstruckOrder.setOrderId(orderId);
-        if(map.get("capacityId") != null){
-            omstruckOrder.setCapacityId(DataChange.dataToBigDecimal(map.get("capacityId")));
-        }
-        if(map.get("orderEntryTime") != null){
-            omstruckOrder.setOrderEntryTime(new Date((long) map.get("orderEntryTime")));
-        }
-        omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-
-        //修改运输订单子表物资重量
-        OmstruckOrderMaterial omstruckOrderMaterial = new OmstruckOrderMaterial();
-        //添加子表主键 通过订单ID查询出子表主键
-        BigDecimal orderMaterialId = omstruckOrderMaterialMapper.getOrderMaterialIdByOrderId(orderId);
-        omstruckOrderMaterial.setOrderMaterialId(orderMaterialId);
-        if(map.get("orderMaterialWeight") != null){
-            omstruckOrderMaterial.setOrderMaterialWeight(DataChange.dataToBigDecimal(map.get("orderMaterialWeight")));
-            //修改运输计划子表 已分配未分配重量
-            updateMaterial(map);
-        }
-        if(map.get("materialId") != null){
-            omstruckOrderMaterial.setMaterialId(DataChange.dataToBigDecimal(map.get("materialId")));
-        }
-        omstruckOrderMaterialMapper.updateByPrimaryKeySelective(omstruckOrderMaterial);
-
-        return 1;
-    }
-
-    /**
-     * 运单派发
-     *  运单ID
-     * 生成进厂实绩、计量实绩、卸货实绩、出厂实绩
-     * @param orderId
-     * @return
-     */
-    @Override
-    @Transactional
-    public int dispatchOrder(Integer orderId) {
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        omstruckOrder.setOrderId(new BigDecimal(orderId));
-        //设置状态为已下发：4
-        //生成订单下发时间 修改订单表
-        omstruckOrder.setOrderIssueTime(new Date());
-        omstruckOrder.setOrderStatus(new BigDecimal(4));
-        omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-        //通过运输订单ID查询运输订单号 （使用的都是运输订单号）
-//        String orderNumber = omstruckOrderMapper.getOrderNumberByOrderId(orderId);
-        //通过运输订单号 查询各个作业点ID 及 总实绩ID
-        Map<String, Object> numMap = new HashMap<>();
-        numMap.put("orderId", orderId);
-        Map<String, Object> map = omstruckOrderMapper.getPointIdByOrderNum(numMap);
-        tmstruckEnfactoryResultService.addEnFactoryResult(map);
-        tmstruckWeightResultService.addWeightResult(map);
-        tmstruckLeaveFactoryResultService.addLeaveFactory(map);
-        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderType"));
-        if(orderType.intValue() == 3){
-            tmstruckUnloadResultService.addUnloadResult(map);
-        }
-        if(orderType.intValue() == 3){
-            tmstruckLoadResultService.addSaleLoadResult(map);
-        }
-        return 1;
-    }
-
-    /**
-     * 逻辑删除未下发订单
-     * @param map
-     * @return
-     */
-    @Override
-    @Transactional
-    public int deleteOrder(Map<String, Object> map) {
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        omstruckOrder.setOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-        //设置状态为逻辑删除：7
-        omstruckOrder.setOrderStatus(new BigDecimal(7));
-        int i = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-        //若是传来物资重量则修改已分配未分配重量
-        if(map.get("orderMaterialWeight") != null){
-            updateMaterial(map);
-        }
-        //通过车牌号修改运输状态为空闲中 0
-        String capacityNumber = (String) map.get("capacityNumber");
-        HashMap<String, Object> changeStatusMap = new HashMap<>();
-        changeStatusMap.put("capacityNumber", capacityNumber);
-        changeStatusMap.put("capacityStatus", 0);
-        int i1 = omstruckOrderMapper.updateCapacityByCarIdOrNum(changeStatusMap);
-        return i + i1;
-    }
-
-    /**
-     * 司机接单、拒绝 0：拒绝   1：接收
-     * 需要接收参数 主键Id 与 接收拒绝操作码
-     * @param map
-     * @return
-     */
-    @Override
-    public int driverReceiveOrRefuse(Map<String, Object> map) {
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        if((Integer) map.get("orderReceiveStatus") == 1){
-            omstruckOrder.setOrderReceiveStatus(new BigDecimal(1));
-            omstruckOrder.setOrderStatus(new BigDecimal(5)); //5 ：已接收
-        }else { //其他状态都视为 拒绝接单
-            omstruckOrder.setOrderReceiveStatus(new BigDecimal(0));
-            omstruckOrder.setOrderStatus(new BigDecimal(6));// 6：未接收
-            //将司机运力置为空闲 通过运输订单Id 查询运力ID
-            BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByOrderOrNum(map);
-            map.put("capacityId", capacityId);
-            map.put("capacityStatus", 0);
-            //修改运力表
-            omstruckOrderMapper.updateCapacityByCarIdOrNum(map);
-        }
-        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-        omstruckOrder.setOrderId(orderId);
-        //生成接收/拒绝时间
-        Date receiveTime = new Date();
-        omstruckOrder.setOrderReceiveRefuseTime(receiveTime);
-        //计算司机从派单到操作时长
-        Date issueTime = omstruckOrderMapper.getInsertTimeById(orderId.intValue());
-        long time = receiveTime.getTime() - issueTime.getTime();
-        long min = time / (1000 * 60);
-        omstruckOrder.setOrderCommunicationDuration(new BigDecimal(min));
-
-        return  omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-    }
-
-    /**
-     * 用于后台展示司机接单未接单数据
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getReceiveRefuseOrder(Map<String, Object> map) {
-        return omstruckOrderMapper.getTruckOrderByCapacityNum(map);
-    }
-
-    /**
-     * 司机接单推送数据
-     * 车牌号
-     * @param
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> sendMesToDriver(Map<String, Object> map) {
-
-        //通过车牌号匹配运力ID
-        BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByCapacityNum((String) map.get("capacityNumber"));
-        map.put("capacityId", capacityId);
-        if(capacityId == null)
-        return null;
-        //通过运力Id匹配 已下发的运输订单
-        List<Map<String, Object>> truckOrderByCapacityNum = omstruckOrderMapper.getTruckOrderByCapacityNum(map);
-        return truckOrderByCapacityNum;
-    }
-
-    /**
-     * 通过运输订单号查询运单所有信息 包含作业路径名称
-     *
-     * @param map 传运输订单号
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getOrderMesByOrderNum(Map<String, Object> map) {
-        return omstruckOrderMapper.getTruckOrderByCapacityNum(map);
-    }
-
-    /**
-     * 查询所有司机已拒绝的订单
-     * 车牌号
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getReceiveRefuseOrderByCapacityId(Map<String, Object> map) {
-        //通过车牌号查询运力Id
-        BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByCapacityNum((String) map.get("capacityNumber"));
-        map.put("capacityId", capacityId);
-
-        return  omstruckOrderMapper.getReceiveRefuseOrderByCapacityId(map);
-    }
-
-    /**
-     * 得到作业时间和地点
-     * @param orderId
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> selectPlaceAndTime(BigDecimal orderId) {
-        List<Map<String, Object>> mapList = omstruckOrderMapper.selectPlaceAndTime(orderId);
-        Map<String, Object> map = mapList.get(0);
-        String entryGatepost = (String) map.get("entryGatepost");
-        Date entryTime = (Date) map.get("entryTime");
-        String entryResult = entryGatepost + "/" + entryTime;
-        String grossCalculate = (String) map.get("grossCalculate");
-        Date grossTime = (Date) map.get("grossTime");
-        String grossResult = grossCalculate + "/" + grossTime;
-        String unloadWarhouse = (String) map.get("unloadWarhouse");
-        Date unloadTime = (Date) map.get("unloadTime");
-        String unloadResult = unloadWarhouse + "/" + unloadTime;
-        String tareCalculate = (String) map.get("tareCalculate");
-        Date tareTime = (Date) map.get("tareTime");
-        String tareResult = tareCalculate + "/" + tareTime;
-        String leaveGatepost = (String) map.get("leaveGatepost");
-        Date outTime = (Date) map.get("outTime");
-        String leaveResult = leaveGatepost + "/" + outTime;
-        List<Map<String, Object>> resultList = new ArrayList<>();
-        Map<String, Object> map1 = new HashMap<>();
-        map1.put("title","进厂门岗/时间");
-        map1.put("desc",entryResult);
-        resultList.add(map1);
-        Map<String, Object> map2 = new HashMap<>();
-        map2.put("title","毛重衡器/时间");
-        map2.put("desc",grossResult);
-        resultList.add(map2);
-        Map<String, Object> map3 = new HashMap<>();
-        map3.put("title","卸货地点/时间");
-        map3.put("desc",unloadResult);
-        resultList.add(map3);
-        Map<String, Object> map4 = new HashMap<>();
-        map4.put("title","皮重衡器/时间");
-        map4.put("desc",tareResult);
-        resultList.add(map4);
-        Map<String, Object> map5 = new HashMap<>();
-        map5.put("title","出厂门岗/时间");
-        map5.put("desc",leaveResult);
-        resultList.add(map5);
-        Map<String, Object> map6 = new HashMap<>();
-        BigDecimal orderLineSequence = (BigDecimal) map.get("orderLineSequence");
-        map6.put("orderLineSequence",orderLineSequence);
-        resultList.add(map6);
-        return resultList;
-    }
-
-    /**
-     * 通过运单号查询订单详情
-     * 运输订单号
-     * @param
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getOrderByOrderId(BigDecimal orderId) {
-
-        return omstruckOrderMapper.getOrderByOrderId(orderId);
-    }
-
-    /**
-     * 查看运输派单
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getTransportDispatch(Map<String, Object> map) {
-        return omstruckOrderMapper.getTransportDispatch(map);
-    }
-
-    /**
-     * 用于更新路段顺序号
-     * @param map  orderId
-     * @return
-     */
-    public int updateOrderLineSequence(Map<String, Object> map, Integer lineSequence){
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        omstruckOrder.setOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
-        omstruckOrder.setOrderLineSequence(new BigDecimal(lineSequence));
-        return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-    }
-}

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

@@ -1,15 +1,11 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
-import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.TmstruckEnfactoryResult;
 import com.steerinfo.dil.service.ITmstruckEnfactoryResultService;
 import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.Date;
@@ -18,7 +14,7 @@ import java.util.Map;
 
 /**
  * TmstruckEnfactoryResult服务实现：
- * @author generator
+ * @author TXF
  * @version 1.0-SNAPSHORT 2021-09-08 06:23
  * 类描述
  * 修订历史：
@@ -36,20 +32,12 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
     @Autowired
-    private OmstruckOrderServiceImpl omstruckOrderService;
+    private TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
 
     @Autowired
-    private TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
+    private UtilsServiceImpl utilsService;
+
 
-    /**
-     * 获取所有的进厂实绩
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllEnFactoryResult(Map<String, Object> map) {
-        return tmstruckEnfactoryResultMapper.getAllEnFactoryResult(map);
-    }
 
     /**
      * 派单时新增进厂实绩
@@ -71,103 +59,179 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
     }
 
     /**
-     * 使用PDA方式进厂
-     * 运输订单号
-     * (操作人员主键ID)
-     * @param map
+     * 通过运输订单号查找排队顺序号
+     * @param orderNumber
      * @return
      */
     @Override
-    @Transactional
-    public int updateEnFactoryByPDA(Map<String, Object> map) {
-        TmstruckEnfactoryResult tmstruckEnfactoryResult = new TmstruckEnfactoryResult();
-        String orderNumber = map.get("orderNumber").toString();
-        //获取进厂实绩id
-        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber));
-        tmstruckEnfactoryResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
-        //添加进厂时间
-        tmstruckEnfactoryResult.setResultEntryGateTime(new Date());
-        tmstruckEnfactoryResult.setInsertTime(new Date());
-        tmstruckEnfactoryResult.setResultEntryMode("手动抬杠");
-        tmstruckEnfactoryResult.setInsertUsername("admin");
-        int i = tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
-        int i1 = addMeasureCommission(map);
-        return i + i1;
+    public Integer selectNodeNumber(String orderNumber) {
+        return tmstruckEnfactoryResultMapper.selectNodeNumber(orderNumber);
     }
 
     /**
-     * 使用门禁系统进厂
-     * 运输订单号 orderNumber，车牌号capacityNumber，
-     * 门岗名称 gatepostName，进厂时间 resultEntryGateTime，（进厂方式）
+     * 获取进厂实绩
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      * @param map
      * @return
      */
     @Override
-    public int updateEnFactoryByMenJin(Map<String, Object> map) {
-        TmstruckEnfactoryResult tmstruckEnfactoryResult=new TmstruckEnfactoryResult();
-        String orderNumber = map.get("orderNumber").toString();
-        //获取进厂实绩id 总实绩ID 订单Id
-        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber));
-        tmstruckEnfactoryResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
-        //进门方式
-        tmstruckEnfactoryResult.setResultEntryMode("自动抬杆");
-        //添加进厂时间
-        tmstruckEnfactoryResult.setResultEntryGateTime(new Date((long) map.get("resultEntryGateTime")));
-        //添加门岗名称
-        String gatepostName = (String) map.get("gatepostName");
-        Integer gatepostNameId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName(gatepostName);
-        tmstruckEnfactoryResult.setGatepostId(new BigDecimal(gatepostNameId));
-        tmstruckEnfactoryResult.setInsertTime(new Date());
-        tmstruckEnfactoryResult.setInsertUsername("admin");
-        int i = tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
-        int i1 = addMeasureCommission(map);
-        //通过判断订单类型 进厂后是走计皮还是计毛
+    public List<Map<String, Object>> getAllEnFactoryResult(Map<String, Object> map) {
         Integer orderType = (Integer) map.get("orderTypee");
         switch (orderType){
             case 1:
-                map.put("type", 0);
-                break;
+                return tmstruckEnfactoryResultMapper.getCGJKEnFactoryResult(map);
             case 2:
+
                 break;
             case 3:
-                map.put("type", 1);
+
+                break;
+            case 4:
+
+                break;
+            case 5:
+
+                break;
+            case 6:
+
+                break;
+            case 7:
+
+                break;
+            case 8:
+                return tmstruckEnfactoryResultMapper.getCGJKEnFactoryResult(map);
+            case 9:
+
+                break;
+            case 10:
+
+                break;
+            case 11:
+
+
         }
-        //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 计毛 还是 计皮 resultTotalId： 总实绩Id
-        tmstruckMeasureCommissionService.sendMeasureCommissionMes(map);
-        return i + i1;
+        return null;
     }
 
+
+
     /**
-     * 添加计量委托
+     * 通过PDA进厂
+     * orderNumber 运输订单号 gatepostName 门岗名称
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      * @param map
      * @return
      */
-    public int addMeasureCommission(Map<String, Object> map){
-        //更新路段顺序号 1：进厂
-        int i1 = omstruckOrderService.updateOrderLineSequence(map, 1);
-        int i2 = 0;
-        // 通过判断订单类型是发送计毛委托还是计皮委托
-        Integer orderType = (Integer) map.get("orderTypee");
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
-        switch (orderType){
-            case 3:
-                //采购订单进厂完成后新增一条计毛委托 类型 1
-                i2 = tmstruckMeasureCommissionService.addMeasureCommission(resultTotalId, 1);
+    public int enFactoryResultByPDA(Map<String, Object> map){
+        int i = 0;
+        //通过运输订单号查询订单类型
+        String orderNumber = (String) map.get("orderNumber");
+        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber));
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        switch (orderType.intValue()){
+            case 1:
+            case 4:
+            case 11:
+                i += updateEnFactoryResultByPDA(map); //添加进厂实绩
+                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
+                i += utilsService.updateOrderLineSequence(map, 4);//修改路段顺序号 4：计皮
+                break;
+            case 2:
                 break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+                i += updateEnFactoryResultByPDA(map); //添加进厂实绩
+                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
+                i += utilsService.updateOrderLineSequence(map, 2);//修改路段顺序号 2：计毛
+                break;
+            case 10: // 采购内转（老区-厂内）
+                break;
+        }
+        return i;
+    }
+
+    /**
+     * 通过门禁进厂
+     * 运输订单号 orderNumber，车牌号capacityNumber，
+     * 门岗名称 gatepostName，进厂时间 resultEntryGateTime，（进厂方式）
+     * @param map
+     * @return
+     */
+    public int enFactoryResultByMJ(Map<String, Object> map){
+        int i = 0;
+        //通过运输订单号查询订单类型
+        String orderNumber = (String) map.get("orderNumber");
+        map.putAll(tmstruckEnfactoryResultMapper.selectEnFactoryResultId(orderNumber));
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        switch (orderType.intValue()){
             case 1:
-                //销售订单进厂完成后新增一条计皮委托 类型 0
-                i2 = tmstruckMeasureCommissionService.addMeasureCommission(resultTotalId, 0);
+            case 4:
+            case 11:
+                i += updateEnFactoryResultByMJ(map); //添加进厂实绩
+                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //添加计皮委托
+                i += utilsService.updateOrderLineSequence(map, 4);//修改路段顺序号 4：计皮
+                break;
+            case 2:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+            case 9:
+                i += updateEnFactoryResultByMJ(map); //添加进厂实绩
+                i += tmstruckMeasureCommissionService.addMaoMeasureCommission(map); //添加计毛委托 并发送计毛委托
+                i += utilsService.updateOrderLineSequence(map, 2);//修改路段顺序号 2：计毛
+                break;
+            case 10: // 采购内转（老区-厂内）
+                break;
         }
-        return i1 + i2;
+        return i;
     }
 
     /**
-     * 通过运输订单号查找排队顺序号
-     * @param orderNumber
+     * 通过PDA添加进厂实绩方法
+     * @param map
      * @return
      */
-    @Override
-    public Integer selectNodeNumber(String orderNumber) {
-        return tmstruckEnfactoryResultMapper.selectNodeNumber(orderNumber);
+    public int updateEnFactoryResultByPDA(Map<String, Object> map){
+        TmstruckEnfactoryResult tmstruckEnfactoryResult = new TmstruckEnfactoryResult();
+        //获取进厂实绩id
+        tmstruckEnfactoryResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
+        //添加门岗
+        String gatepostName = (String) map.get("gatepostName");
+        Integer gatepostId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName(gatepostName);
+        tmstruckEnfactoryResult.setGatepostId(new BigDecimal(gatepostId));
+        //添加进厂时间
+        tmstruckEnfactoryResult.setResultEntryGateTime(new Date());
+        tmstruckEnfactoryResult.setInsertTime(new Date());
+        tmstruckEnfactoryResult.setResultEntryMode("手动抬杠");
+        tmstruckEnfactoryResult.setInsertUsername("admin");
+        return tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
+    }
+
+    /**
+     * 通过门禁系统添加进厂实绩方法
+     * @param map
+     * @return
+     */
+    public int updateEnFactoryResultByMJ(Map<String, Object> map){
+        TmstruckEnfactoryResult tmstruckEnfactoryResult=new TmstruckEnfactoryResult();
+        //进门方式
+        tmstruckEnfactoryResult.setResultEntryMode("自动抬杆");
+        //添加进厂时间
+        tmstruckEnfactoryResult.setResultEntryGateTime(new Date((long) map.get("resultEntryGateTime")));
+        //添加门岗
+        String gatepostName = (String) map.get("gatepostName");
+        Integer gatepostNameId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName(gatepostName);
+        tmstruckEnfactoryResult.setGatepostId(new BigDecimal(gatepostNameId));
+
+        tmstruckEnfactoryResult.setInsertTime(new Date());
+        tmstruckEnfactoryResult.setInsertUsername("admin");
+        return tmstruckEnfactoryResultMapper.updateByPrimaryKeySelective(tmstruckEnfactoryResult);
     }
 }

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

@@ -2,12 +2,11 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.BmsShipFeign;
 import com.steerinfo.dil.feign.BmsTruckFeign;
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.TmstruckLeaveFactoryResult;
 import com.steerinfo.dil.service.ITmstruckLeaveFactoryResultService;
+import com.steerinfo.dil.service.IUtilsService;
 import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,67 +41,13 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
     @Autowired
-    private OmstruckOrderServiceImpl omstruckOrderService;
-
-    @Autowired
-    private OmstruckOrderMapper omstruckOrderMapper;
+    private IUtilsService utilsService;
 
     @Autowired
     private BmsShipFeign bmsShipFeign;
 
     @Autowired
     private BmsTruckFeign bmsTruckFeign;
-    /**
-     * 新增出厂实绩  需要采集的数据
-     *  运输订单号
-     *  车牌号
-     *  门岗名称
-     *  出厂时间
-     *  出厂方式
-     *  车厢抓拍图片
-     * @param map
-     * @return
-     */
-    @Override
-    public int addLeaveFactoryResult(Map<String, Object> map) {
-        TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
-        //查询最大主键ID
-        tmstruckLeaveFactoryResult.setId(tmstruckLeaveFactoryResultMapper.selectMaxId());
-        //获取运输订单号
-        String orderNumber = (String) map.get("orderNumber");
-        //获取车牌号
-        String capacityNumber = (String) map.get("capacityNumber");
-        HashMap<String, Object> map1 = new HashMap<>();
-        map1.put("orderNumber", orderNumber);
-        map1.put("capacityNumber", capacityNumber);
-        //通过运输订单号、车牌号查询 总实绩ID
-        Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map1);
-        tmstruckLeaveFactoryResult.setResultTotalId(new BigDecimal(totalId));
-        //获取门岗名称
-        String gatepostName = (String) map.get("gatepostName");
-        Integer gatepostId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName(gatepostName);
-        tmstruckLeaveFactoryResult.setGatepostId(new BigDecimal(gatepostId));
-        //获取出厂时间
-        long resultOutGateTime = (long)map.get("resultOutGateTime");
-        tmstruckLeaveFactoryResult.setResultOutGateTime(new Date(resultOutGateTime));
-        //获取出厂方式
-        String resultOutMode = (String) map.get("resultOutMode");
-        tmstruckLeaveFactoryResult.setResultOutMode(resultOutMode);
-
-        tmstruckLeaveFactoryResult.setInsertTime(new Date());
-        tmstruckLeaveFactoryResult.setInsertUsername("admin");
-        return tmstruckLeaveFactoryResultMapper.insertSelective(tmstruckLeaveFactoryResult);
-    }
-
-    /**
-     * 查询所有的出厂实绩
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getLeaveFactoryResult(Map<String, Object> map) {
-        return tmstruckLeaveFactoryResultMapper.getLeaveFactoryResult(map);
-    }
 
     /**
      * 查看运输线路是否为出厂
@@ -114,15 +59,6 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         return tmstruckLeaveFactoryResultMapper.selectTransportRoute(orderNumber);
     }
 
-    /**
-     * 通过运输订单号获取 车牌号 和 门岗
-     * @param orderNumber
-     * @return
-     */
-    @Override
-    public Map<String, Object> selectLeaveFactory(String orderNumber) {
-        return tmstruckLeaveFactoryResultMapper.selectCnAndGnByOrderNumber(orderNumber);
-    }
 
     /**
      * 派单后新增出厂实绩
@@ -142,86 +78,118 @@ public class TmstruckLeaveFactoryResultServiceImpl implements ITmstruckLeaveFact
         return tmstruckLeaveFactoryResultMapper.insertSelective(tmstruckLeaveFactoryResult);
     }
 
+
+
     /**
-     * 销售物流和采购物流
-     * 通过PDA进行更新实绩
-     * 运输订单号
-     * @param mapValue
+     * 查询所有的出厂实绩
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
+     * @param map
      * @return
      */
     @Override
-    @Transactional
-    public int updateLeaveFactoryByPDA(Map<String, Object> mapValue){
-        //获取订单号
-        String orderNumber = mapValue.get("orderNumber").toString();
-        //根据订单号获取实绩id
-        mapValue.putAll(tmstruckLeaveFactoryResultMapper.selectResultId(orderNumber));
-        TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
-        tmstruckLeaveFactoryResult.setResultId(DataChange.dataToBigDecimal(mapValue.get("resultId")));
-        //设置常规字段
-        tmstruckLeaveFactoryResult.setResultOutGateTime(new Date());
-        tmstruckLeaveFactoryResult.setResultOutMode("手动抬杠");
-        tmstruckLeaveFactoryResult.setInsertUsername("admin");
-        tmstruckLeaveFactoryResult.setInsertTime(new Date());
-        int i = tmstruckLeaveFactoryResultMapper.updateByPrimaryKeySelective(tmstruckLeaveFactoryResult);
-        //更改路段顺序号为 5 ：出厂
-        int i1 = omstruckOrderService.updateOrderLineSequence(mapValue, 5);
-        //将运力置为空闲状态
-        mapValue.put("capacityStatus", 0);
-        int i3 = omstruckOrderMapper.updateCapacityByCarIdOrNum(mapValue);
-        //将订单状态改为已结束 2
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        BigDecimal orderId = DataChange.dataToBigDecimal(mapValue.get("orderId"));
-        omstruckOrder.setOrderId(orderId);
-        omstruckOrder.setOrderStatus(new BigDecimal(2));
-        int i2=0;
-        BigDecimal orderType = DataChange.dataToBigDecimal(mapValue.get("orderType"));
-        if (orderType.intValue() ==3) {
-            omstruckOrder.setOrderStatus(new BigDecimal(2));
-            i2 = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-            //通过feign调用新增详单
-            try {
-                bmsShipFeign.addDetailsOrder(tmstruckLeaveFactoryResult.getResultId()); // 出厂实绩Id
-                bmsTruckFeign.addDetailsOrder(orderId);  // 运单ID
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+    public List<Map<String, Object>> getLeaveFactoryResult(Map<String, Object> map) {
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+            case 5:
+                break;
+            case 6:
+                break;
+            case 7:
+                break;
+            case 8:
+                return tmstruckLeaveFactoryResultMapper.getLeaveFactoryResult(map);
+            case 9:
+                break;
+            case 10:
+                break;
+            case 11:
         }
-        return i + i1 + i2 + i3;
+        return null;
     }
 
+
     /**
-     * 通过门岗系统进行更新实绩
-     * @param mapValue
+     * 通过 PDA 出厂
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
+     * @param map
      * @return
      */
-    @Override
-    public int updateLeaveFactoryByMenGang(Map<String, Object> mapValue) {
-        //获取订单号
-        String orderNumber=mapValue.get("orderNumber").toString();
-        //根据订单号获取实绩id
-        mapValue.putAll(tmstruckLeaveFactoryResultMapper.selectResultId(orderNumber));
+    public int leaveFactoryByPDA(Map<String, Object> map){
+        int i = 0;
+        String orderNumber = (String) map.get("orderNumber");
+        map.putAll(tmstruckLeaveFactoryResultMapper.selectResultId(orderNumber));
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        switch (orderType.intValue()){
+            case 1:
+
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                i += updateLeaveResultByPDA(map); //更新出厂实绩
+                i += utilsService.updateOrderStatus(map, 2); // 修改运输订单状态 2：已结束
+                i += utilsService.updateCapacityStatus(map, 0); //修改运力状态 0：空闲中
+                //采购出厂 通过feign调用新增详单
+                try {
+                    bmsShipFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("resultId"))); // 出厂实绩Id
+                    bmsTruckFeign.addDetailsOrder(DataChange.dataToBigDecimal(map.get("orderId")));  // 运单ID
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                break;
+            case 9:
+
+                break;
+            case 10:
+
+                break;
+            case 11:
+        }
+        return i;
+    }
+
+    /**
+     * 更新出厂实绩
+     * @param mapValue {运输订单号:orderNumber 门岗名称:gatepostName}
+     * @return
+     */
+    public int updateLeaveResultByPDA(Map<String, Object> mapValue){
         TmstruckLeaveFactoryResult tmstruckLeaveFactoryResult = new TmstruckLeaveFactoryResult();
         tmstruckLeaveFactoryResult.setResultId(DataChange.dataToBigDecimal(mapValue.get("resultId")));
+        //通过门岗名称获取门岗ID
+        Integer gatepostId = tmstruckEnfactoryResultMapper.selectGatepostIdByGatepostName((String) mapValue.get("gatepostName"));
+        if(gatepostId != null){
+            tmstruckLeaveFactoryResult.setGatepostId(new BigDecimal(gatepostId));
+        }
         //设置常规字段
         tmstruckLeaveFactoryResult.setResultOutGateTime(new Date());
-        String  ResultLeaveModel=mapValue.get("ResultLeaveModel").toString();
-        tmstruckLeaveFactoryResult.setResultOutMode(ResultLeaveModel);
+        tmstruckLeaveFactoryResult.setResultOutMode("手动抬杠");
         tmstruckLeaveFactoryResult.setInsertUsername("admin");
         tmstruckLeaveFactoryResult.setInsertTime(new Date());
-        int i = tmstruckLeaveFactoryResultMapper.updateByPrimaryKeySelective(tmstruckLeaveFactoryResult);
-        //更改路段顺序号为 5 ：出厂
-        int i1 = omstruckOrderService.updateOrderLineSequence(mapValue, 5);
-        return i + i1;
-    }
-
-    /**
-     * 查询销售订单的所有出厂实绩
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> selectAllLeaveFacatoryForSale(Map<String, Object> map) {
-        return tmstruckLeaveFactoryResultMapper.selectAllLeaveFacatoryForSale(map);
+        return tmstruckLeaveFactoryResultMapper.updateByPrimaryKeySelective(tmstruckLeaveFactoryResult);
     }
 }

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

@@ -2,10 +2,8 @@ package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.feign.WMSFeign;
 import com.steerinfo.dil.feign.WmshBoundFeign;
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.TmstruckEnfactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckLoadResultMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.TmstruckLoadResult;
 import com.steerinfo.dil.service.ITmstruckLoadResultService;
 import com.steerinfo.dil.util.DataChange;
@@ -38,8 +36,9 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private TmstruckEnfactoryResultMapper tmstruckEnfactoryResultMapper;
 
+
     @Autowired
-    private OmstruckOrderMapper omstruckOrderMapper;
+    private UtilsServiceImpl utilsService;
 
     @Autowired
     private WmshBoundFeign wmshBoundFeign;
@@ -47,15 +46,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
     @Autowired
     private WMSFeign wmsFeign;
 
-    /**
-     * 查询所有装车实绩
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllLoadResult(Map<String, Object> map) {
-        return tmstruckLoadResultMapper.getAllLoadResult(map);
-    }
+
 
     /**
      * 新增装车实绩
@@ -67,9 +58,8 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
      * @param map
      * @return
      */
-    @Override
     @Transactional
-    public int addLoadResult(Map<String, Object> map) {
+    public int addLoadResult11(Map<String, Object> map) {
         //通过运输订单号 或 运单Id 查询实绩总表ID  此方法在 进厂作业mapper中
         Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
         // 新增装车实绩
@@ -88,23 +78,15 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         int i = tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
 
         //修改订单状态为执行中 1
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-        omstruckOrder.setOrderId(orderId);
-        omstruckOrder.setOrderStatus(new BigDecimal(1));
-        int i1 = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-
-        //修改运力状态为执行中
-        BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByOrderOrNum(map);
-        HashMap<String, Object> changeMap = new HashMap<>();
-        changeMap.put("capacityId", capacityId);
-        changeMap.put("capacityStatus", 0);
-        int i2 = omstruckOrderMapper.updateCapacityByCarIdOrNum(changeMap);
+        int i1 = utilsService.updateOrderStatus(map, 1);
+
+        //修改运力状态为执行中 1
+        int i2 = utilsService.updateCapacityStatus(map, 1);
 
         //新增港存库出库实绩 并修改实时库存
         BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
         if(portId != null){
-            BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(orderId);
+            BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
             if(batchId != null){
                 Map<String, Object> hashMap = new HashMap<>();
                 hashMap.put("batchId", batchId);
@@ -117,40 +99,27 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         return i + i1 + i2;
     }
 
-
     /**
-     * 新增销售装车实绩(虚拟)
-     *
-     * @param map {orderNumber 运输订单号}
+     * 添加装货实绩
+     * @param map
      * @return
      */
-    public int addSaleLoadResult(Map<String, Object> map){
-        String orderNumber = (String) map.get("orderNumber");
-        List<Map<String, Object>> materialList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(orderNumber);
-        int i = 0;
-        for (Map<String, Object> materialMap : materialList) {
-            TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
-            //添加物资ID
-            tmstruckLoadResult.setMaterialId(DataChange.dataToBigDecimal(materialMap.get("materialId")));
-            //添加总实绩ID
-            Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
-            //添加主键
-            tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
-            i += tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
-        }
-        return i;
+    public int addLoadResult(Map<String, Object> map){
+        return 0;
     }
 
 
+
+
     /**
      * 遗留问题  （销售装车）
      * @param map
      * @return
      */
     public int addLoadResult1(Map<String, Object> map) {
-        String orderNumber = map.get("orderNumber").toString();
+//        String orderNumber = map.get("orderNumber").toString();
         //通过运输订单号查找物资
-        List<Map<String, Object>> materialList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(orderNumber);
+        List<Map<String, Object>> materialList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(map);
         for (int i = 0; i < materialList.size(); i++) {
             Map<String, Object> map3 = materialList.get(i);
             BigDecimal materialId = (BigDecimal) map3.get("materialId");
@@ -168,28 +137,20 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
             String resultIsclear = (String) (map.get("resultIsclear"));
             tmstruckLoadResult.setResultIsclear(resultIsclear);
             //根据运输订单号查找运输订单类型
-            Integer orderType = tmstruckLoadResultMapper.selectOrderTypeByOrderNumber(orderNumber);
+            Integer orderType = tmstruckLoadResultMapper.selectOrderTypeByOrderNumber((String) map.get("orderNumber"));
             int i2 = 0;
             int i1 = 0;
             switch (orderType) {
                 case 3:
                     tmstruckLoadResult.setResultLoadStartTime(new Date((long) map.get("resultLoadStartTime")));
                     //修改订单状态为执行中 1
-                    OmstruckOrder omstruckOrder = new OmstruckOrder();
-                    BigDecimal orderId = DataChange.dataToBigDecimal(map.get("orderId"));
-                    omstruckOrder.setOrderId(orderId);
-                    omstruckOrder.setOrderStatus(new BigDecimal(1));
-                    i1 = omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-                    //修改运力状态为执行中
-                    BigDecimal capacityId = omstruckOrderMapper.getCapacityIdByOrderOrNum(map);
-                    HashMap<String, Object> changeMap = new HashMap<>();
-                    changeMap.put("capacityId", capacityId);
-                    changeMap.put("capacityStatus", 0);
-                    i2 = omstruckOrderMapper.updateCapacityByCarIdOrNum(changeMap);
+                    i1 = utilsService.updateOrderStatus(map, 1);
+                    //修改运力状态为执行中 1
+                    i2 = utilsService.updateCapacityStatus(map, 1);
                     //新增出库实绩 并修改实时库存
                     BigDecimal portId = tmstruckLoadResultMapper.getPortIdBySendStationId(DataChange.dataToBigDecimal(map.get("loadingId")));
                     if (portId != null) {
-                        BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(orderId);
+                        BigDecimal batchId = tmstruckLoadResultMapper.getBatchIdByOrderId(DataChange.dataToBigDecimal(map.get("orderId")));
                         if (batchId != null) {
                             HashMap<String, Object> hashMap = new HashMap<>();
                             hashMap.put("batchId", batchId);
@@ -200,7 +161,7 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
                         }
                     }
                 case 1:
-                    List list = tmstruckLoadResultMapper.selectResultIdByOrderNumber(orderNumber);
+                    List list = tmstruckLoadResultMapper.selectResultIdByOrderNumber((String) map.get("orderNumber"));
                     //查询最大id和最小id
                     Integer maxResultId = (Integer) Collections.max(list);
                     Integer minResultId = (Integer) Collections.min(list);
@@ -297,6 +258,73 @@ public class TmstruckLoadResultServiceImpl implements ITmstruckLoadResultService
         return tmstruckLoadResultMapper.selectLoadResultForSale(map);
     }
 
+    /**
+     * 新增销售装车实绩(虚拟)
+     *
+     * @param map {orderId 运输订单Id}
+     * @return
+     */
+    public int addSaleLoadResult(Map<String, Object> map){
+//        String orderNumber = (String) map.get("orderNumber");
+        List<Map<String, Object>> materialList = tmstruckLoadResultMapper.selectMaterialIdByOrderNumber(map);
+        int i = 0;
+        for (Map<String, Object> materialMap : materialList) {
+            TmstruckLoadResult tmstruckLoadResult = new TmstruckLoadResult();
+            //添加物资ID
+            tmstruckLoadResult.setMaterialId(DataChange.dataToBigDecimal(materialMap.get("materialId")));
+            //添加总实绩ID
+            Integer totalId = tmstruckEnfactoryResultMapper.selectOrderIdByCpAndOn(map);
+            tmstruckLoadResult.setResultTotalId(new BigDecimal(totalId));
+            //添加主键
+            tmstruckLoadResult.setResultId(tmstruckLoadResultMapper.selectMaxId());
+            i += tmstruckLoadResultMapper.insertSelective(tmstruckLoadResult);
+        }
+        return i;
+    }
+
+    /**
+     * 查询所有装车实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllLoadResult(Map<String, Object> map) {
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+            case 5:
+
+                break;
+            case 6:
+
+                break;
+            case 7:
+
+                break;
+            case 8:
+                return tmstruckLoadResultMapper.getCGJKLoadResult(map);
+            case 9:
+
+                break;
+            case 10:
+
+                break;
+            case 11:
+        }
+        return null;
+    }
+
 
 
 }

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

@@ -3,6 +3,7 @@ package com.steerinfo.dil.service.impl;
 import com.steerinfo.dil.mapper.TmstruckMeasureCommissionMapper;
 import com.steerinfo.dil.model.TmstruckMeasureCommission;
 import com.steerinfo.dil.service.ITmstruckMeasureCommissionService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -30,18 +31,75 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
     @Autowired
     private TmstruckMeasureCommissionMapper tmstruckMeasureCommissionMapper;
 
-    /**
+   /**
      * 查询计量委托 0 ：计皮     1：计毛
      * @param map orderTypee 订单类型   type 是计皮还是计毛
      * @return
      */
     @Override
     public List<Map<String, Object>> getAllMeasureCommission(Map<String, Object> map) {
-        return tmstruckMeasureCommissionMapper.getMeasureCommission(map);
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+            case 5:
+                break;
+            case 6:
+                break;
+            case 7:
+                break;
+            case 8:
+                return tmstruckMeasureCommissionMapper.getMeasureCommission(map);
+            case 9:
+                break;
+            case 10:
+                break;
+            case 11:
+        }
+        return null;
     }
 
     /**
-     * 进厂作业完成后 系统自动新增计毛、计皮委托
+     * 添加计皮委托 并发送计皮委托
+     * @param map {orderTypee: 订单类型  resultTotalId：总实绩ID}
+     * @return
+     */
+    public int addMaoMeasureCommission(Map<String, Object> map){
+        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
+        int i = addMeasureCommission(resultTotalId, 1); // 添加计毛委托
+        //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 1：计毛 |0：计皮 resultTotalId： 总实绩Id
+        map.put("type", 1);
+        sendMeasureCommissionMes(map);
+        return i;
+    }
+
+    /**
+     * 添加计皮委托 并发送计皮委托
+     * @param map {orderTypee: 订单类型  resultTotalId：总实绩ID}
+     * @return
+     */
+    public int addPiMeasureCommission(Map<String, Object> map){
+        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
+        int i = addMeasureCommission(resultTotalId, 0); // 添加计皮委托
+        //发送数据给计量系统 必要数据 orderTypee：订单类型  type： 1：计毛 |0：计皮 resultTotalId： 总实绩Id
+        map.put("type", 0);
+        sendMeasureCommissionMes(map);
+        return i;
+    }
+
+
+    /**
+     * 新增计毛、计皮委托
      * @return
      */
     @Override
@@ -64,9 +122,34 @@ public class TmstruckMeasureCommissionServiceImpl implements ITmstruckMeasureCom
      * @param map orderTypee 订单类型  type 计皮还是计毛类型  resultTotalId  总实绩ID
      */
     public void sendMeasureCommissionMes(Map<String, Object> map){
+        List<Map<String, Object>> measureCommission = null;
         //查询计量委托
-        List<Map<String, Object>> allMeasureCommission = tmstruckMeasureCommissionMapper.getMeasureCommission(map);
-        Map<String, Object> mes = allMeasureCommission.get(0);
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        switch (orderType.intValue()){
+            case 1:
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
+            case 4:
+                break;
+            case 5:
+                break;
+            case 6:
+                break;
+            case 7:
+                break;
+            case 8:
+                break;
+            case 9:
+                break;
+            case 10:
+                break;
+            case 11:
+        }
+
+//        Map<String, Object> mes = measureCommission.get(0);
         /*访问接口发送数据*/
         /********************************************/
     }

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

@@ -1,11 +1,14 @@
 package com.steerinfo.dil.service.impl;
 
 import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
+import com.steerinfo.dil.model.TmstruckReceiptResult;
 import com.steerinfo.dil.service.ITmstruckReceiptResultService;
+import com.steerinfo.dil.util.DataChange;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -29,12 +32,73 @@ public class TmstruckReceiptResultServiceImpl implements ITmstruckReceiptResultS
     private TmstruckReceiptResultMapper tmstruckReceiptResultMapper;
 
     /**
-     * 查询所有签收实绩
+     * 查询所有收货实绩
      * @param map
      * @return
      */
     @Override
     public List<Map<String, Object>> getReceiveResult(Map<String, Object> map) {
-        return tmstruckReceiptResultMapper.getReceiveResult(map);
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+            case 5:
+
+                break;
+            case 6:
+
+                break;
+            case 7:
+
+                break;
+            case 8:
+                return tmstruckReceiptResultMapper.getReceiptResult(map);
+            case 9:
+                break;
+            case 10:
+
+                break;
+            case 11:
+
+        }
+        return null;
+    }
+
+    /**
+     * 新增一条虚拟收货实绩
+     * @param map {resultTotalId：总实绩ID}
+     * @return
+     */
+    public int addReceiptResult(Map<String, Object> map){
+        //新增完卸车实绩后新增一条收货实绩
+        TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
+        tmstruckReceiptResult.setId(tmstruckReceiptResultMapper.selectMaxId());//添加主键
+        tmstruckReceiptResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));//添加总实绩Id
+        tmstruckReceiptResult.setStatus(new BigDecimal(0)); // 卸货完成后添加的为虚拟收货实绩
+        return tmstruckReceiptResultMapper.insertSelective(tmstruckReceiptResult);
+    }
+
+    /**
+     * 确认收货（修改收货实绩为真实收货实绩）
+     * @param map {resultTotalId：总实绩ID}
+     * @return
+     */
+    public int updateReceiptResult(Map<String, Object> map){
+        TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
+        tmstruckReceiptResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        tmstruckReceiptResult.setStatus(new BigDecimal(1));
+        tmstruckReceiptResult.setInsertUsername("admin");
+        tmstruckReceiptResult.setInsertTime(new Date());
+        return tmstruckReceiptResultMapper.updateByTotalResultId(tmstruckReceiptResult);
     }
 }

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

@@ -1,13 +1,8 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
-import com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper;
-
+import com.steerinfo.dil.feign.OmsFeign;
 import com.steerinfo.dil.mapper.TmstruckReturnResultMapper;
 import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
-import com.steerinfo.dil.model.OmstruckOrderMaterial;
-
 import com.steerinfo.dil.model.TmstruckReturnResult;
 import com.steerinfo.dil.model.TmstruckTotalResult;
 
@@ -43,10 +38,10 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
     private TmstruckReturnResultMapper tmstruckReturnResultMapper;
 
     @Autowired
-    private OmstruckOrderMapper omstruckOrderMapper;
+    private UtilsServiceImpl utilsService;
 
     @Autowired
-    private OmstruckOrderMaterialMapper omstruckOrderMaterialMapper;
+    private OmsFeign omsFeign;
 
     @Autowired
     private TmstruckTotalResultMapper tmstruckTotalResultMapper;
@@ -57,8 +52,6 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
     private TmstruckLeaveFactoryResultServiceImpl tmstruckLeaveFactoryResultService;
     @Autowired
     private TmstruckWeightResultServiceImpl tmstruckWeightResultService;
-    @Autowired
-    private TmstruckUnloadResultServiceImpl tmstruckUnloadResultService;
 
     /**
      * 添加常规字段
@@ -89,23 +82,12 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
         //新增退货实绩
         int i = tmstruckReturnResultMapper.insertSelective(tmstruckReturnResult);
         //逻辑删除运单
-        int i1 = deleteOrder(orderId);
+        int i1 = utilsService.updateOrderStatus(map, 7);
         //重新新增销售运输订单
         int i2 = addNewOrder(orderId);
         return i + i1 + i2;
     }
 
-    /**
-     * 退货实绩添加完成后逻辑删除本次运单
-     * @param orderId 通过运单主键对其进行逻辑删除 （主键走索引）
-     * @return
-     */
-    public int deleteOrder(BigDecimal orderId){
-        OmstruckOrder omstruckOrder = new OmstruckOrder();
-        omstruckOrder.setOrderId(orderId);
-        omstruckOrder.setOrderStatus(new BigDecimal(7));
-        return omstruckOrderMapper.updateByPrimaryKeySelective(omstruckOrder);
-    }
 
     /**
      * 重新新增销售运输订单
@@ -114,26 +96,26 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
      */
     public int addNewOrder(BigDecimal orderId){
         //通过运输订单ID查询上一个运输订单的相关信息
-        OmstruckOrder omstruckOrder = tmstruckReturnResultMapper.getOldOrderMesById(orderId);
+        Map<String, Object> omstruckOrder = tmstruckReturnResultMapper.getOldOrderMesById(orderId);
         //生成主键
-        BigDecimal maxId = omstruckOrderMapper.selectMaxId();
-        omstruckOrder.setOrderId(maxId);
+        BigDecimal maxId = utilsService.selectOrderMaxId();
+        omstruckOrder.put("orderId", maxId);
         //生成运输订单号
-        omstruckOrder.setOrderNumber(DataChange.generateEightDigitsNumber("WYSDD", maxId.intValue()));
+        omstruckOrder.put("orderNumber", DataChange.generateEightDigitsNumber("WYSDD", maxId.intValue()));
         //添加订单状态 1:执行中
-        omstruckOrder.setOrderStatus(new BigDecimal(4));
+        omstruckOrder.put("orderStatus", new BigDecimal(4));
         //添加常规字段
-        omstruckOrder.setInsertTime(new Date());
-        omstruckOrder.setInsertUsername("admin");
+        omstruckOrder.put("insertTime",new Date());
+        omstruckOrder.put("insertUsername","admin");
         //新增新的运输订单
-        int i = omstruckOrderMapper.insertSelective(omstruckOrder);
+        omsFeign.insertSelectiveOrder(omstruckOrder);
         //新增新的运输订单子表
         int i1 = addNewOrderMaterial(orderId, maxId);
         //新增总实绩 maxId为新订单ID
         int i2 = addTotalResult(maxId);
         //新增进厂、计重、出厂实绩
         int i3 = addAllResult(maxId);
-        return i + i1 + i2 + i3;
+        return i1 + i2 + i3;
     }
 
     /**
@@ -159,7 +141,7 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
         //通过运输订单号 查询各个作业点ID 及 总实绩ID
         Map<String, Object> idMap = new HashMap<>();
         idMap.put("orderId", orderId);
-        Map<String, Object> map = omstruckOrderMapper.getPointIdByOrderNum(idMap);
+        Map<String, Object> map = tmstruckReturnResultMapper.getPointIdByOrderNum(idMap);
         int i = tmstruckEnfactoryResultService.addEnFactoryResult(map);
         int i1 = tmstruckWeightResultService.addWeightResult(map);
         int i2 = tmstruckLeaveFactoryResultService.addLeaveFactory(map);
@@ -173,17 +155,18 @@ public class TmstruckReturnResultServiceImpl implements ITmstruckReturnResultSer
      */
     public int addNewOrderMaterial(BigDecimal oldOrderId, BigDecimal newOrderId){
         //通过运输订单查询上一个运输订单子表相关的信息 可能会有多个物资信息
-        List<OmstruckOrderMaterial> oldOrderMaterialList = tmstruckReturnResultMapper.getOldOrderMaterialMesByOrderId(oldOrderId);
+        List<Map<String, Object>> oldOrderMaterialList = tmstruckReturnResultMapper.getOldOrderMaterialMesByOrderId(oldOrderId);
         int count = 0;
-        for (OmstruckOrderMaterial omstruckOrderMaterial : oldOrderMaterialList) {
+        for (Map<String, Object> omstruckOrderMaterial : oldOrderMaterialList) {
             //获取主键
-            omstruckOrderMaterial.setMaterialId(omstruckOrderMaterialMapper.selectMaxId());
+            omstruckOrderMaterial.put("orderMaterialId", utilsService.selectOrderMaterialMaxId());
             //设置新订单Id
-            omstruckOrderMaterial.setOrderId(newOrderId);
+            omstruckOrderMaterial.put("orderId", newOrderId);
             //添加常规字段
-            omstruckOrderMaterial.setInsertTime(new Date());
-            omstruckOrderMaterial.setInsertUsername("admin");
-            count += omstruckOrderMaterialMapper.insertSelective(omstruckOrderMaterial);
+            omstruckOrderMaterial.put("insertTime",new Date());
+            omstruckOrderMaterial.put("insertUsername","admin");
+            omsFeign.insertSelectiveOrderMaterial(omstruckOrderMaterial);
+            count++;
         }
         return count;
     }

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

@@ -1,6 +1,5 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.TmstruckLeaveFactoryResultMapper;
 import com.steerinfo.dil.mapper.TmstruckSmsRusultMapper;
 import com.steerinfo.dil.model.TmstruckSmsRusult;
@@ -35,8 +34,8 @@ public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRus
     private TmstruckSmsRusultMapper tmstruckSmsRusultMapper;
     @Autowired
     private TmstruckLeaveFactoryResultMapper tmstruckLeaveFactoryResultMapper;
-    @Autowired
-    private OmstruckOrderMapper omstruckOrderMapper;
+//    @Autowired
+//    private OmstruckOrderMapper omstruckOrderMapper;
 
     @Override
     protected IBaseMapper<TmstruckSmsRusult, BigDecimal> getMapper() {
@@ -51,8 +50,8 @@ public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRus
     @Override
     public int addSmsResult(Map<String,Object> map) {
         //获取用户名
-        Integer personnelId=(Integer) map.get("personnelId");
-        String personnelName=omstruckOrderMapper.selectPersonNameByPersonnelId(personnelId);
+//        Integer personnelId=(Integer) map.get("personnelId");
+//        String personnelName=omstruckOrderMapper.selectPersonNameByPersonnelId(personnelId);
         //获取订单号
         String orderNumber = map.get("orderNumber").toString();
         //新增短信实绩
@@ -71,7 +70,7 @@ public class TmstruckSmsRusultServiceImpl extends BaseServiceImpl<TmstruckSmsRus
         tmstruckSmsRusult.setResultSmsContent("您好!您在达钢购买的钢材已发车，司机电话"+driverPhone+"欲知详情，请前往xxxxx地址，下载APP 达钢物流");
         //新增短信实绩
         tmstruckSmsRusult.setInsertTime(new Date());
-        tmstruckSmsRusult.setInsertUsername(personnelName);
+//        tmstruckSmsRusult.setInsertUsername(personnelName);
         int i=tmstruckSmsRusultMapper.insertSelective(tmstruckSmsRusult);
         return i;
     }

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

@@ -0,0 +1,180 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.TmstruckTimeTaskResultMapper;
+import com.steerinfo.dil.model.TmstruckTimeTaskResult;
+import com.steerinfo.dil.service.ITmstruckTimeTaskResultService;
+
+import com.steerinfo.dil.util.DataChange;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmstruckTimeTskResult服务实现：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2021-10-22 07:28
+ * 类描述
+ * 修订历史：
+ * 日期：2021-10-22
+ * 作者：generator
+ * 参考：
+ * 描述：TmstruckTimeTskResult服务实现
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@Service(value = "tmstruckTimeTaskResultService")
+public class TmstruckTimeTaskResultServiceImpl implements ITmstruckTimeTaskResultService {
+
+    @Autowired
+    private TmstruckTimeTaskResultMapper tmstruckTimeTaskResultMapper;
+
+
+    /**
+     * 通用生成实例数据
+     * @param map
+     * @return
+     */
+    public TmstruckTimeTaskResult generateTimeTaskResult(Map<String, Object> map, Integer timeType){
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = new TmstruckTimeTaskResult();
+        //获取主键ID
+        tmstruckTimeTaskResult.setId(tmstruckTimeTaskResultMapper.selectMaxId());
+        String orderNumber = (String) map.get("orderNumber");
+        //通过运输订单号查询总实绩ID等数据
+        map.putAll(tmstruckTimeTaskResultMapper.getResultTotalIdByOrderNum(orderNumber));
+        tmstruckTimeTaskResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
+        //生成时间
+        tmstruckTimeTaskResult.setResultTime(new Date());
+        //设置时间类型
+        tmstruckTimeTaskResult.setResultTimeType(new BigDecimal(timeType));
+        return tmstruckTimeTaskResult;
+    }
+
+    /**
+     * 司机申请开始
+     * @param map
+     * @return
+     */
+    @Override
+    public int applyStartTime(Map<String, Object> map) {
+        //设置时间类型 0
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 0);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 用车单位确认开始
+     * @param map
+     * @return
+     */
+    @Override
+    public int unitSureStartTime(Map<String, Object> map) {
+        //设置时间类型 1
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 1);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 司机申请暂停
+     * @param map
+     * @return
+     */
+    @Override
+    public int applyStartTimeout(Map<String, Object> map) {
+        //设置时间类型 4
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 4);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 用车单位确认
+     * @param map
+     * @return
+     */
+    @Override
+    public int unitSureStartTimeout(Map<String, Object> map) {
+        //设置时间类型 5
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 5);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 司机申请暂停结束
+     * @param map
+     * @return
+     */
+    @Override
+    public int applyEndTimeout(Map<String, Object> map) {
+        //设置时间类型 6
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 6);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 用车单位确认暂停结束
+     * @param map
+     * @return
+     */
+    @Override
+    public int unitSureEndTimeout(Map<String, Object> map) {
+        //设置时间类型 7
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 7);
+        //查询上一次结束的时间
+        Map<String, Object> timeMap = tmstruckTimeTaskResultMapper.getLastTimeout(tmstruckTimeTaskResult.getResultTotalId());
+        Object resultTime = timeMap.get("resultTime");
+        if(resultTime != null){
+            Date lastTimeout = (Date) resultTime;
+            //计算相差时间戳 存入当前实绩中  更精确
+            long differenceTime = new Date().getTime() - lastTimeout.getTime();
+            tmstruckTimeTaskResult.setResultValue(new BigDecimal(differenceTime));
+        }
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 司机申请结束
+     * @param map
+     * @return
+     */
+    @Override
+    public int applyEndTime(Map<String, Object> map) {
+        //设置时间类型 2
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 2);
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+    /**
+     * 用车单位确认结束
+     * @param map
+     * @return
+     */
+    @Override
+    public int unitSureEndTime(Map<String, Object> map) {
+        //设置时间类型 3
+        TmstruckTimeTaskResult tmstruckTimeTaskResult = generateTimeTaskResult(map, 3);
+        //查询当前车辆排队开始时间 计算出总时长
+        Map<String, Object> startTimeMap = tmstruckTimeTaskResultMapper.getStartTime(tmstruckTimeTaskResult.getResultTotalId());
+        Date endTime = new Date();
+        //计算当前时间与确认开始时间相差的毫秒数（时间戳）
+        Date startTime = (Date) startTimeMap.get("resultTime");
+        long allTime = endTime.getTime() - startTime.getTime();
+        //查询所有确认暂停结束的时长时间戳
+        List<Map<String, Object>> allTimeout = tmstruckTimeTaskResultMapper.getAllTimeout(tmstruckTimeTaskResult.getResultTotalId());
+        long allTimeoutTime = 0;
+        //计算所有暂停时间时长时间戳总和
+        for (Map<String, Object> timeoutMap : allTimeout) {
+            BigDecimal resultTime = DataChange.dataToBigDecimal(timeoutMap.get("resultValue"));
+            allTimeoutTime += resultTime.longValue();
+        }
+        long realTime = allTime - allTimeoutTime;
+        //计算总工作时长（分钟）
+        realTime = realTime / (1000 * 60);
+        tmstruckTimeTaskResult.setResultValue(new BigDecimal(realTime));
+        return tmstruckTimeTaskResultMapper.insertSelective(tmstruckTimeTaskResult);
+    }
+
+
+}

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

@@ -0,0 +1,38 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.TmstruckTotalResultMapper;
+import com.steerinfo.dil.model.TmstruckTotalResult;
+import com.steerinfo.dil.service.ITmstruckTotalResultService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/27 10:18
+ */
+
+@Service(value = "tmstruckTotalResultService")
+public class TmstruckTotalResultServiceImpl implements ITmstruckTotalResultService {
+
+    @Autowired
+    private TmstruckTotalResultMapper tmstruckTotalResultMapper;
+
+    /**
+     * 新增实绩总表
+     * 运输订单ID
+     * @param orderId
+     * @return
+     */
+    public int addTotalResult(BigDecimal orderId){
+        TmstruckTotalResult tmstruckTotalResult = new TmstruckTotalResult();
+        tmstruckTotalResult.setResultTotalId(tmstruckTotalResultMapper.selectMaxId());
+        tmstruckTotalResult.setOrderId(orderId);
+        tmstruckTotalResult.setInsertTime(new Date());
+        tmstruckTotalResult.setInsertUsername("admin");
+        return tmstruckTotalResultMapper.insertSelective(tmstruckTotalResult);
+    }
+
+}

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

@@ -37,24 +37,16 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
     private TmstruckUnloadResultMapper tmstruckUnloadResultMapper;
 
     @Autowired
-    private TmstruckReceiptResultMapper tmstruckReceiptResultMapper;
+    private TmstruckReceiptResultServiceImpl tmstruckReceiptResultService;
+
 
     @Autowired
-    private OmstruckOrderServiceImpl omstruckOrderService;
+    private UtilsServiceImpl utilsService;
 
     @Autowired
     private TmstruckMeasureCommissionServiceImpl tmstruckMeasureCommissionService;
 
 
-    /**
-     * 查询所有卸货实绩
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getUnloadResult(Map<String, Object> map) {
-        return tmstruckUnloadResultMapper.getUnloadResult(map);
-    }
 
     /**
      * 新增卸货实绩
@@ -68,38 +60,109 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         //生成主键ID
         BigDecimal maxId = tmstruckUnloadResultMapper.selectMaxId();
         tmstruckUnloadResult.setId(maxId);
-        //生成卸货实绩编号
-        int id = maxId.intValue();
-        StringBuilder resultNumber = new StringBuilder("DW");
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-        String timeFormat = sdf.format(new Date());
-        resultNumber.append(timeFormat);
-        resultNumber.append(id < 10 ? "0000" + id : id < 100 ? "000" + id : id < 1000 ? "00" +id : id < 10000 ? "0" + id : String.valueOf(id));
-        tmstruckUnloadResult.setResultNumber(resultNumber.toString());
         //插入实绩总表ID
         tmstruckUnloadResult.setResultTotalId(DataChange.dataToBigDecimal(map.get("resultTotalId")));
         //插入卸货点
         tmstruckUnloadResult.setResultUnloadPlaceId(DataChange.dataToBigDecimal(map.get("resultUnloadPlaceId")));
         //新增卸车实绩
-        int i = tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
-        return i;
+        return tmstruckUnloadResultMapper.insertSelective(tmstruckUnloadResult);
+    }
+
+    /**
+     * 查询所有卸货实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getUnloadResult(Map<String, Object> map) {
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+            case 5:
+
+                break;
+            case 6:
+
+                break;
+            case 7:
+
+                break;
+            case 8:
+                return tmstruckUnloadResultMapper.getUnloadResult(map);
+            case 9:
+                break;
+            case 10:
+
+                break;
+            case 11:
+
+        }
+        return null;
     }
 
+
     /**
      * 更新卸货实绩内容 扫码人员扫码后获取信息传输数据给接口
-     *  运输订单号
-     *  卸货时间
-     *  卸货地点
+     * 1：销售订单；2：焦炭发运计划；3：水渣发运计划；4：内转到异地库；5：采购辅料订单；6：采购老区燃料订单；
+     * 7：采购新区燃料订单；8：采购进口矿(万州-厂内)；9：采购内转(达州-厂内)；10：采购内转(老区-厂内)； 11：厂内内转
      * @param map
      * @return
      */
     @Override
     @Transactional
     public int updateUnloadResult(Map<String, Object> map) {
-        TmstruckUnloadResult tmstruckUnloadResult = new TmstruckUnloadResult();
-        //通过获取的运输订单号查询实绩总表id
+        int i = 0;
         map.putAll(tmstruckUnloadResultMapper.selectTotalIdByOrderNo((String) map.get("orderNumber")));
-        //得到实绩id
+        BigDecimal orderType = DataChange.dataToBigDecimal(map.get("orderTypee"));
+        switch (orderType.intValue()){
+            case 1:
+                break;
+            case 2:
+                break;
+            case 3:
+                break;
+            case 4:
+                break;
+            case 5:
+            case 6:
+            case 7:
+            case 8:
+                i += updateUnloadResultBy(map); //更新卸货实绩
+                i += tmstruckMeasureCommissionService.addPiMeasureCommission(map); //卸货完成后新增一条计皮委托 并发送计皮委托
+                i += tmstruckReceiptResultService.addReceiptResult(map); //新增完卸车实绩后新增一条收货实绩
+                i += utilsService.updateOrderLineSequence(map, 4);//修改路段顺序号 4：计皮
+                break;
+            case 9:
+                break;
+            case 10:
+                break;
+            case 11:
+
+        }
+        return i;
+    }
+
+    /**
+     * 扫码确认卸货 更新卸货实绩
+     *  运输订单号
+     *  卸货时间
+     *  卸货地点
+     * @param map
+     * @return
+     */
+    public int updateUnloadResultBy(Map<String, Object> map){
+        TmstruckUnloadResult tmstruckUnloadResult = new TmstruckUnloadResult();
         tmstruckUnloadResult.setResultId(DataChange.dataToBigDecimal(map.get("resultId")));
         //通过卸货地点（仓库）查询仓库ID
         BigDecimal resultUnloadPlaceId = tmstruckUnloadResultMapper.getWarehouseIdByWName((String) map.get("warehouseName"));
@@ -107,27 +170,14 @@ public class TmstruckUnloadResultServiceImpl implements ITmstruckUnloadResultSer
         if(resultUnloadPlaceId != null){
             tmstruckUnloadResult.setResultUnloadPlaceId(resultUnloadPlaceId);
         }
-        //获得卸货开始时间
+        //获得卸货时间
         tmstruckUnloadResult.setResultStartTime(new Date((long) map.get("unloadTime")));
         //扫码后确认卸货所以卸货状态码为  1 同意
         tmstruckUnloadResult.setUnloadStatus(new BigDecimal(1));
         tmstruckUnloadResult.setInsertTime(new Date());
         tmstruckUnloadResult.setInsertUsername("admin");
         //新增卸车实绩内容
-        int i = tmstruckUnloadResultMapper.updateByPrimaryKeySelective(tmstruckUnloadResult);
-        //卸货完成后新增一条计皮委托 类型 0
-        BigDecimal resultTotalId = DataChange.dataToBigDecimal(map.get("resultTotalId"));
-        int i1 = tmstruckMeasureCommissionService.addMeasureCommission(resultTotalId, 0);
-
-        //新增完卸车实绩后新增一条收货实绩
-        TmstruckReceiptResult tmstruckReceiptResult = new TmstruckReceiptResult();
-        tmstruckReceiptResult.setId(tmstruckReceiptResultMapper.selectMaxId());//添加主键
-        tmstruckReceiptResult.setResultTotalId(resultTotalId);//添加总实绩Id
-        tmstruckReceiptResult.setStatus(new BigDecimal(0)); // 卸货完成后添加的为虚拟收货实绩
-        int i2 = tmstruckReceiptResultMapper.insertSelective(tmstruckReceiptResult);
-
-        //更新订单路段顺序号
-        int i3 = omstruckOrderService.updateOrderLineSequence(map, 3);
-        return i + i1 + i2 +i3;
+        return tmstruckUnloadResultMapper.updateByPrimaryKeySelective(tmstruckUnloadResult);
     }
+
 }

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

@@ -1,9 +1,7 @@
 package com.steerinfo.dil.service.impl;
 
-import com.steerinfo.dil.mapper.OmstruckOrderMapper;
 import com.steerinfo.dil.mapper.TmstruckReceiptResultMapper;
 import com.steerinfo.dil.mapper.TmstruckWeightResultMapper;
-import com.steerinfo.dil.model.OmstruckOrder;
 import com.steerinfo.dil.model.TmstruckReceiptResult;
 import com.steerinfo.dil.model.TmstruckWeightResult;
 import com.steerinfo.dil.service.ITmstruckWeightResultService;
@@ -41,7 +39,94 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     private TmstruckReceiptResultMapper tmstruckReceiptResultMapper;
 
     @Autowired
-    private OmstruckOrderServiceImpl omstruckOrderService;
+    private UtilsServiceImpl utilsService;
+
+    /**
+     * 查询所有计毛实绩
+     * @param map
+     * @return
+     */
+
+    @Override
+    public List<Map<String, Object>> getAllJiMaoResult(Map<String, Object> map) {
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+            case 5:
+
+                break;
+            case 6:
+
+                break;
+            case 7:
+
+                break;
+            case 8:
+                return tmstruckWeightResultMapper.getAllJiMaoResult(map);
+            case 9:
+                break;
+            case 10:
+
+                break;
+            case 11:
+
+        }
+        return null;
+    }
+
+    /**
+     * 查询所有计皮实绩
+     * @param map
+     * @return
+     */
+    @Override
+    public List<Map<String, Object>> getAllJiPiResult(Map<String, Object> map) {
+        Integer orderType = (Integer) map.get("orderTypee");
+        switch (orderType){
+            case 1:
+
+                break;
+            case 2:
+
+                break;
+            case 3:
+
+                break;
+            case 4:
+
+                break;
+            case 5:
+
+                break;
+            case 6:
+
+                break;
+            case 7:
+
+                break;
+            case 8:
+                return tmstruckWeightResultMapper.getAllJiPiResult(map);
+            case 9:
+                break;
+            case 10:
+
+                break;
+            case 11:
+
+        }
+        return null;
+    }
 
     /**
      * 派单时新增计重实绩
@@ -60,6 +145,17 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         return tmstruckWeightResultMapper.insertSelective(tmstruckWeightResult);
     }
 
+    /**
+     * 通过物资ID获取对应汽车衡 如果有多个汽车衡中随机选择
+     * @param materialId
+     * @return
+     */
+    @Override
+    public int getCalculateIdByMaterial(BigDecimal materialId) {
+        List<Integer> calculateIdList = tmstruckWeightResultMapper.getCalculateIdByMaterial(materialId);
+        return calculateIdList.get((int)(Math.random()*calculateIdList.size()));
+    }
+
     /**
      * 更新计毛实绩 采集需要的数据
      *  运输订单号
@@ -114,50 +210,11 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
 
         int i = tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
         //更新订单路段顺序号
-        int i2 = omstruckOrderService.updateOrderLineSequence(map, lineSequence);
+        int i2 = utilsService.updateOrderLineSequence(map, lineSequence);
         return i +i2;
     }
 
-    /**
-     * 稽核销售计毛净重 与 物资理重是否相同
-     * @param map
-     * @return
-     */
-    public double checkWeight(Map<String, Object> map){
-        Integer orderId = (Integer) map.get("orderId");
-        double totalWeight = 0;
-        //通过订单Id查找该订单下所有物资的理重及件数
-        List<Map<String, Object>> materialMesList = tmstruckWeightResultMapper.getMaterialMes(orderId);
-        for (Map<String, Object> materialMes : materialMesList) {
-            //获取物资件数
-            int orderMaterialNumber = (Integer) materialMes.get("orderMaterialNumber");
-            //获取物资理重
-            Double materialTheoreticalWeight = (Double) materialMes.get("materialTheoreticalWeight");
-            totalWeight += orderMaterialNumber * materialTheoreticalWeight;
-        }
-        return totalWeight;
-    }
-
-    /**
-     * 查询所有计毛实绩
-     * @param map
-     * @return
-     */
 
-    @Override
-    public List<Map<String, Object>> getAllJiMaoResult(Map<String, Object> map) {
-        return tmstruckWeightResultMapper.getAllJiMaoResult(map);
-    }
-
-    /**
-     * 查询所有计皮实绩
-     * @param map
-     * @return
-     */
-    @Override
-    public List<Map<String, Object>> getAllJiPiResult(Map<String, Object> map) {
-        return tmstruckWeightResultMapper.getAllJiPiResult(map);
-    }
 
     /**
      * 更新计皮实绩  需要采集的数据
@@ -165,7 +222,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
      * 汽车衡编号 truckCalculateNumber
      * 皮重 resultTareWeight
      * 皮重时间 resultTareWeightTime
-     *
+     * 净重
      * @param map
      * @return
      */
@@ -216,7 +273,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
         }
         int i = tmstruckWeightResultMapper.updateByPrimaryKeySelective(tmstruckWeightResult);
         //更新订单路段顺序号
-        int i2 = omstruckOrderService.updateOrderLineSequence(map, 4);
+        int i2 = utilsService.updateOrderLineSequence(map, 4);
         return i + i1 + i2;
     }
 

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

@@ -0,0 +1,73 @@
+package com.steerinfo.dil.service.impl;
+
+import com.steerinfo.dil.mapper.UtilsMapper;
+import com.steerinfo.dil.service.IUtilsService;
+import com.steerinfo.dil.util.DataChange;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/10/26 14:42
+ */
+
+@Service(value = "utilsService")
+public class UtilsServiceImpl implements IUtilsService {
+    @Autowired
+    private UtilsMapper utilsMapper;
+
+    /**
+     * 查询运输订单ID主键
+     * @return
+     */
+    @Override
+    public BigDecimal selectOrderMaxId() {
+        return utilsMapper.selectOrderMaxId();
+    }
+
+    /**
+     * 查询运输订单子表主键ID
+     * @return
+     */
+    @Override
+    public BigDecimal selectOrderMaterialMaxId() {
+        return utilsMapper.selectOrderMaterialMaxId();
+    }
+
+    /**
+     * 修改运力状态
+     * @param map {必要参数：capacityId 运力ID  或者 capacityNumber 车牌号}
+     * @param status 类型
+     * @return
+     */
+    public int updateCapacityStatus(Map<String, Object> map, Integer status){
+        map.put("capacityStatus", status);
+        return  utilsMapper.updateCapacityByCarIdOrNum(map);
+    }
+
+
+    /**
+     * 修改订单状态为结束
+     * @param map {orderId 订单Id
+     * @return
+     */
+    public int updateOrderStatus(Map<String, Object> map, Integer status){
+        map.put("orderStatus", status);
+        return utilsMapper.updateOrderStatusByOrderIdOrNum(map);
+    }
+
+    /**
+     * 用于更新路段顺序号
+     * @param map  orderId 运输订单号
+     * @return
+     */
+    public int updateOrderLineSequence(Map<String, Object> map, Integer lineSequence){
+        map.put("orderLineSequence", lineSequence);
+        return utilsMapper.updateLineSeqByOrderIdOrNum(map);
+    }
+
+}

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

@@ -42,7 +42,8 @@ public class DataChange {
      * @param data
      * @return
      */
-    public static BigDecimal dataToBigDecimal(Object data){
+    public static BigDecimal
+    dataToBigDecimal(Object data){
         if (data != null){
             if(data instanceof String){
                 String data1 = (String) data;

src/main/java/com/steerinfo/dil/websocket/WebSocketController.java

@@ -1,43 +0,0 @@
-package com.steerinfo.dil.websocket;
-
-import com.steerinfo.dil.service.IOmstruckOrderService;
-import com.steerinfo.dil.util.DataChange;
-import com.steerinfo.framework.controller.BaseRESTfulController;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.messaging.simp.SimpMessagingTemplate;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Controller;
-
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Controller
-public class WebSocketController extends BaseRESTfulController {
-
-    @Autowired
-    private SimpMessagingTemplate simpMessagingTemplate; //消息(发送)推送模板
-
-    @Autowired
-    private IOmstruckOrderService omstruckOrderService;
-
-
-    @Scheduled(fixedDelay = 3000000)
-    public void sendMessage() {
-        Map<String, Object> map = new HashMap<>();
-        //推送给状态为已下发为4 的所有订单
-        map.put("orderStatus", 4);
-
-        //订单推送
-        List<Map<String, Object>> allTruckOrder = omstruckOrderService.getAllTruckOrder(map);
-        for (Map<String, Object> maps : allTruckOrder) {
-            //从map中获取车牌号
-            BigDecimal capacityId = DataChange.dataToBigDecimal(maps.get("capacityId"));
-            System.out.println(capacityId);
-            //推送到队列
-            simpMessagingTemplate.convertAndSend(("/topic/getResponse/" + capacityId).trim(), capacityId);
-        }
-    }
-}

src/main/resources/bootstrap.yml

@@ -25,6 +25,8 @@ openfeign:
     url: ${WMSHBOUNDFEIGN_URL:localhost:8070}
   WMSFeign:
     url: ${WMSHBOUNDFEIGN_URL:localhost:8093}
+  OmsFeign:
+    url: ${OMSFEIGN_URL:localhost:8095}
 
 
 #eureka设置
@@ -32,6 +34,10 @@ eureka:
   client:
     service-url:
       defaultZone: http://root:root@${EUREKA_HOST:dev-discovery.steerinfo.com}:${EUREKA_PORT:80}/eureka/
+    registerWithEureka:
+      false
+    fetchRegistry:
+      false
 
 genxml:
   pth: com/a

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

@@ -1,588 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.steerinfo.dil.mapper.AmstruckPurplanMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmstruckPurplan">
-        <id column="PLAN_ID" jdbcType="DECIMAL" property="planId" />
-        <result column="BATCH_ID" jdbcType="DECIMAL" property="batchId" />
-        <result column="PLAN_NO" jdbcType="VARCHAR" property="planNo" />
-        <result column="CARRIER_ID" jdbcType="DECIMAL" property="carrierId" />
-        <result column="PLAN_TRUCK_NUMBER" jdbcType="DECIMAL" property="planTruckNumber" />
-        <result column="CAPACITY_TYPE_ID" jdbcType="DECIMAL" property="capacityTypeId" />
-        <result column="PLAN_TRUCK_TIME" jdbcType="TIMESTAMP" property="planTruckTime" />
-        <result column="PLAN_STATUS" jdbcType="DECIMAL" property="planStatus" />
-        <result column="MATERIAL_TOTAL_WEIGHT" jdbcType="DECIMAL" property="materialTotalWeight" />
-        <result column="PLAN_INCOMING_TIME" jdbcType="TIMESTAMP" property="planIncomingTime" />
-        <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" />
-    </resultMap>
-    <sql id="columns">
-        PLAN_ID, BATCH_ID, PLAN_NO, CARRIER_ID, PLAN_TRUCK_NUMBER, CAPACITY_TYPE_ID, PLAN_TRUCK_TIME,
-    PLAN_STATUS, MATERIAL_TOTAL_WEIGHT, PLAN_INCOMING_TIME, INSERT_USERNAME, INSERT_TIME,
-    UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-    </sql>
-    <sql id="columns_alias">
-        t.PLAN_ID, t.BATCH_ID, t.PLAN_NO, t.CARRIER_ID, t.PLAN_TRUCK_NUMBER, t.CAPACITY_TYPE_ID,
-    t.PLAN_TRUCK_TIME, t.PLAN_STATUS, t.MATERIAL_TOTAL_WEIGHT, t.PLAN_INCOMING_TIME,
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-    </sql>
-    <sql id="select">
-        SELECT <include refid="columns" /> FROM AMSTRUCK_PURPLAN
-    </sql>
-    <sql id="select_alias">
-        SELECT <include refid="columns_alias" /> FROM AMSTRUCK_PURPLAN t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="planId != null">
-                and PLAN_ID = #{planId}
-            </if>
-            <if test="batchId != null">
-                and BATCH_ID = #{batchId}
-            </if>
-            <if test="planNo != null and planNo != ''">
-                and PLAN_NO = #{planNo}
-            </if>
-            <if test="carrierId != null">
-                and CARRIER_ID = #{carrierId}
-            </if>
-            <if test="planTruckNumber != null">
-                and PLAN_TRUCK_NUMBER = #{planTruckNumber}
-            </if>
-            <if test="capacityTypeId != null">
-                and CAPACITY_TYPE_ID = #{capacityTypeId}
-            </if>
-            <if test="planTruckTime != null">
-                and TO_CHAR(PLAN_TRUCK_TIME,'yyyy-MM-dd') = #{planTruckTime}
-            </if>
-            <if test="planStatus != null">
-                and PLAN_STATUS = #{planStatus}
-            </if>
-            <if test="materialTotalWeight != null">
-                and MATERIAL_TOTAL_WEIGHT = #{materialTotalWeight}
-            </if>
-            <if test="planIncomingTime != null">
-                and TO_CHAR(PLAN_INCOMING_TIME,'yyyy-MM-dd') = #{planIncomingTime}
-            </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>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="planId != null">
-                and PLAN_ID = #{planId}
-            </if>
-            <if test="batchId != null">
-                and BATCH_ID = #{batchId}
-            </if>
-            <if test="planNo != null and planNo != ''">
-                and PLAN_NO LIKE '%${planNo}%'
-            </if>
-            <if test="carrierId != null">
-                and CARRIER_ID = #{carrierId}
-            </if>
-            <if test="planTruckNumber != null">
-                and PLAN_TRUCK_NUMBER = #{planTruckNumber}
-            </if>
-            <if test="capacityTypeId != null">
-                and CAPACITY_TYPE_ID = #{capacityTypeId}
-            </if>
-            <if test="planTruckTime != null">
-                and TO_CHAR(PLAN_TRUCK_TIME,'yyyy-MM-dd') = #{planTruckTime}
-            </if>
-            <if test="planStatus != null">
-                and PLAN_STATUS = #{planStatus}
-            </if>
-            <if test="materialTotalWeight != null">
-                and MATERIAL_TOTAL_WEIGHT = #{materialTotalWeight}
-            </if>
-            <if test="planIncomingTime != null">
-                and TO_CHAR(PLAN_INCOMING_TIME,'yyyy-MM-dd') = #{planIncomingTime}
-            </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>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete from AMSTRUCK_PURPLAN
-        where PLAN_ID = #{planId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from AMSTRUCK_PURPLAN
-        where 1!=1
-        <if test="batchId != null">
-            or BATCH_ID = #{batchId}
-        </if>
-        <if test="planNo != null and planNo != ''">
-            or PLAN_NO = #{planNo}
-        </if>
-        <if test="carrierId != null">
-            or CARRIER_ID = #{carrierId}
-        </if>
-        <if test="planTruckNumber != null">
-            or PLAN_TRUCK_NUMBER = #{planTruckNumber}
-        </if>
-        <if test="capacityTypeId != null">
-            or CAPACITY_TYPE_ID = #{capacityTypeId}
-        </if>
-        <if test="planTruckTime != null">
-            or TO_CHAR(PLAN_TRUCK_TIME,'yyyy-MM-dd') = '#{planTruckTime}'
-        </if>
-        <if test="planStatus != null">
-            or PLAN_STATUS = #{planStatus}
-        </if>
-        <if test="materialTotalWeight != null">
-            or MATERIAL_TOTAL_WEIGHT = #{materialTotalWeight}
-        </if>
-        <if test="planIncomingTime != null">
-            or TO_CHAR(PLAN_INCOMING_TIME,'yyyy-MM-dd') = '#{planIncomingTime}'
-        </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>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckPurplan">
-        insert into AMSTRUCK_PURPLAN (PLAN_ID, BATCH_ID, PLAN_NO,
-                                      CARRIER_ID, PLAN_TRUCK_NUMBER, CAPACITY_TYPE_ID,
-                                      PLAN_TRUCK_TIME, PLAN_STATUS, MATERIAL_TOTAL_WEIGHT,
-                                      PLAN_INCOMING_TIME, INSERT_USERNAME, INSERT_TIME,
-                                      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK
-        )
-        values (#{planId,jdbcType=DECIMAL}, #{batchId,jdbcType=DECIMAL}, #{planNo,jdbcType=VARCHAR},
-                #{carrierId,jdbcType=DECIMAL}, #{planTruckNumber,jdbcType=DECIMAL}, #{capacityTypeId,jdbcType=DECIMAL},
-                #{planTruckTime,jdbcType=TIMESTAMP}, #{planStatus,jdbcType=DECIMAL}, #{materialTotalWeight,jdbcType=DECIMAL},
-                #{planIncomingTime,jdbcType=TIMESTAMP}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP},
-                #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}
-               )
-    </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckPurplan">
-        insert into AMSTRUCK_PURPLAN
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="planId != null">
-                PLAN_ID,
-            </if>
-            <if test="batchId != null">
-                BATCH_ID,
-            </if>
-            <if test="planNo != null">
-                PLAN_NO,
-            </if>
-            <if test="carrierId != null">
-                CARRIER_ID,
-            </if>
-            <if test="planTruckNumber != null">
-                PLAN_TRUCK_NUMBER,
-            </if>
-            <if test="capacityTypeId != null">
-                CAPACITY_TYPE_ID,
-            </if>
-            <if test="planTruckTime != null">
-                PLAN_TRUCK_TIME,
-            </if>
-            <if test="planStatus != null">
-                PLAN_STATUS,
-            </if>
-            <if test="materialTotalWeight != null">
-                MATERIAL_TOTAL_WEIGHT,
-            </if>
-            <if test="planIncomingTime != null">
-                PLAN_INCOMING_TIME,
-            </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>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="planId != null">
-                #{planId,jdbcType=DECIMAL},
-            </if>
-            <if test="batchId != null">
-                #{batchId,jdbcType=DECIMAL},
-            </if>
-            <if test="planNo != null">
-                #{planNo,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierId != null">
-                #{carrierId,jdbcType=DECIMAL},
-            </if>
-            <if test="planTruckNumber != null">
-                #{planTruckNumber,jdbcType=DECIMAL},
-            </if>
-            <if test="capacityTypeId != null">
-                #{capacityTypeId,jdbcType=DECIMAL},
-            </if>
-            <if test="planTruckTime != null">
-                #{planTruckTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="planStatus != null">
-                #{planStatus,jdbcType=DECIMAL},
-            </if>
-            <if test="materialTotalWeight != null">
-                #{materialTotalWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="planIncomingTime != null">
-                #{planIncomingTime,jdbcType=TIMESTAMP},
-            </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>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckPurplan">
-        update AMSTRUCK_PURPLAN
-        set BATCH_ID = #{batchId,jdbcType=DECIMAL},
-            PLAN_NO = #{planNo,jdbcType=VARCHAR},
-            CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-            PLAN_TRUCK_NUMBER = #{planTruckNumber,jdbcType=DECIMAL},
-            CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
-            PLAN_TRUCK_TIME = #{planTruckTime,jdbcType=TIMESTAMP},
-            PLAN_STATUS = #{planStatus,jdbcType=DECIMAL},
-            MATERIAL_TOTAL_WEIGHT = #{materialTotalWeight,jdbcType=DECIMAL},
-            PLAN_INCOMING_TIME = #{planIncomingTime,jdbcType=TIMESTAMP},
-            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}
-        where PLAN_ID = #{planId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckPurplan">
-        update AMSTRUCK_PURPLAN
-        <set>
-            <if test="batchId != null">
-                BATCH_ID = #{batchId,jdbcType=DECIMAL},
-            </if>
-            <if test="planNo != null">
-                PLAN_NO = #{planNo,jdbcType=VARCHAR},
-            </if>
-            <if test="carrierId != null">
-                CARRIER_ID = #{carrierId,jdbcType=DECIMAL},
-            </if>
-            <if test="planTruckNumber != null">
-                PLAN_TRUCK_NUMBER = #{planTruckNumber,jdbcType=DECIMAL},
-            </if>
-            <if test="capacityTypeId != null">
-                CAPACITY_TYPE_ID = #{capacityTypeId,jdbcType=DECIMAL},
-            </if>
-            <if test="planTruckTime != null">
-                PLAN_TRUCK_TIME = #{planTruckTime,jdbcType=TIMESTAMP},
-            </if>
-            <if test="planStatus != null">
-                PLAN_STATUS = #{planStatus,jdbcType=DECIMAL},
-            </if>
-            <if test="materialTotalWeight != null">
-                MATERIAL_TOTAL_WEIGHT = #{materialTotalWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="planIncomingTime != null">
-                PLAN_INCOMING_TIME = #{planIncomingTime,jdbcType=TIMESTAMP},
-            </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>
-        </set>
-        where PLAN_ID = #{planId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select" />
-        where PLAN_ID = #{planId,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 AMSTRUCK_PURPLAN
-        (PLAN_ID,
-        BATCH_ID, PLAN_NO, CARRIER_ID,
-        PLAN_TRUCK_NUMBER, CAPACITY_TYPE_ID,
-        PLAN_TRUCK_TIME, PLAN_STATUS,
-        MATERIAL_TOTAL_WEIGHT, PLAN_INCOMING_TIME,
-        INSERT_USERNAME, INSERT_TIME,
-        UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.planId,jdbcType=DECIMAL},
-        #{item.batchId,jdbcType=DECIMAL}, #{item.planNo,jdbcType=VARCHAR}, #{item.carrierId,jdbcType=DECIMAL},
-        #{item.planTruckNumber,jdbcType=DECIMAL}, #{item.capacityTypeId,jdbcType=DECIMAL},
-        #{item.planTruckTime,jdbcType=TIMESTAMP}, #{item.planStatus,jdbcType=DECIMAL},
-        #{item.materialTotalWeight,jdbcType=DECIMAL}, #{item.planIncomingTime,jdbcType=TIMESTAMP},
-        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
-        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update AMSTRUCK_PURPLAN
-        set
-        PLAN_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.planId,jdbcType=DECIMAL}
-        </foreach>
-        ,BATCH_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.batchId,jdbcType=DECIMAL}
-        </foreach>
-        ,PLAN_NO=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.planNo,jdbcType=VARCHAR}
-        </foreach>
-        ,CARRIER_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.carrierId,jdbcType=DECIMAL}
-        </foreach>
-        ,PLAN_TRUCK_NUMBER=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.planTruckNumber,jdbcType=DECIMAL}
-        </foreach>
-        ,CAPACITY_TYPE_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.capacityTypeId,jdbcType=DECIMAL}
-        </foreach>
-        ,PLAN_TRUCK_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.planTruckTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,PLAN_STATUS=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.planStatus,jdbcType=DECIMAL}
-        </foreach>
-        ,MATERIAL_TOTAL_WEIGHT=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.materialTotalWeight,jdbcType=DECIMAL}
-        </foreach>
-        ,PLAN_INCOMING_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.planIncomingTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach close="end" collection="list" index="index" item="item" open="case PLAN_ID" separator=" ">
-            when #{item.planId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        where PLAN_ID in
-        <foreach close=")" collection="list" index="index" item="item" open="(" separator=",">
-            #{item.planId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from AMSTRUCK_PURPLAN
-        where PLAN_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>
-
-    <!-- 通过状态 0：未下发 1：已下发 查询运输计划 -->
-    <select id="getAllPurPlan" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-        select
-        *
-        from (
-        select
-            AP.PLAN_ID "planId",
-            APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-            DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-            RM.MATERIAL_NAME "materialName",
-            AP.PLAN_NO "planNo",
-            RC.CARRIER_NAME "carrierName",
-            AP.MATERIAL_TOTAL_WEIGHT "materialTotalWeight",
-            AP.PLAN_TRUCK_TIME "planTruckTime",
-            AP.PLAN_INCOMING_TIME "planIncomingTime"
-        from AMSTRUCK_PURPLAN AP
-        left join AMS_PURCHASE_ORDER APO
-        on AP.BATCH_ID = APO.BATCH_ID
-        left join DIL_BATCH DB
-        on AP.BATCH_ID = DB.BATCH_ID
-        left join RMS_MATERIAL RM
-        on RM.MATERIAL_ID = DB.MATERIAL_ID
-        left join RMS_CARRIER RC
-        on AP.CARRIER_ID = RC.CARRIER_ID
-        where AP.PLAN_STATUS = #{planStatus}
-        )
-        <where>
-            <if test="planId != null">
-                <foreach collection="planId" item="item" open="(" separator="or" close=")">
-                    "planId" 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="resultForeignShipName != null">
-                and
-                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
-                    "resultForeignShipName" 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="planNo != null">
-                and
-                <foreach collection="planNo" item="item" open="(" separator="or" close=")">
-                    "planNo" 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="materialTotalWeight != null">
-                and
-                <foreach collection="materialTotalWeight" item="item" open="(" separator="or" close=")">
-                    "materialTotalWeight" 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>
-        </where>
-        <include refid="orderBy"></include>
-        <if test="orderField == null  ">
-            order by "planIncomingTime" desc
-        </if>
-    </select>
-
-
-    <!--  通过ID查询运输计划 -->
-    <select id="getPurPlanById" parameterType="int" resultType="java.util.Map">
-        select DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-               DB.MATERIAL_ID              "materialId",
-               AP.CARRIER_ID               "carrierId",
-               AP.MATERIAL_TOTAL_WEIGHT    "materialTotalWeight",
-               AP.PLAN_TRUCK_TIME          "planTruckTime",
-               AP.PLAN_INCOMING_TIME "planIncomingTime",
-               AP.BATCH_ID                 "batchId",
-               AP.PLAN_ID                  "planId"
-        from AMSTRUCK_PURPLAN AP
-                 left join DIL_BATCH DB
-                           on AP.BATCH_ID = DB.BATCH_ID
-        where PLAN_ID = #{planId}
-    </select>
-
-
-</mapper>

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

@@ -1,534 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.steerinfo.dil.mapper.AmstruckPurplanMaterialMapper">
-    <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.AmstruckPurplanMaterial">
-        <id column="PURPLAN_PLAN_MATERIAL_ID" jdbcType="DECIMAL" property="purplanPlanMaterialId"/>
-        <result column="PLAN_ID" jdbcType="DECIMAL" property="planId"/>
-        <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId"/>
-        <result column="PURPLAN_MATERIAL_NUMBER" jdbcType="DECIMAL" property="purplanMaterialNumber"/>
-        <result column="MATERIAL_ALLOCATED_WEIGHT" jdbcType="DECIMAL" property="materialAllocatedWeight"/>
-        <result column="MATERIAL_UNALLOCATED_WEIGHT" jdbcType="DECIMAL" property="materialUnallocatedWeight"/>
-        <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"/>
-    </resultMap>
-    <sql id="columns">
-        PURPLAN_PLAN_MATERIAL_ID, PLAN_ID, MATERIAL_ID, PURPLAN_MATERIAL_NUMBER, MATERIAL_ALLOCATED_WEIGHT,
-    MATERIAL_UNALLOCATED_WEIGHT, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, 
-    INSERT_UPDATE_REMARK
-    </sql>
-    <sql id="columns_alias">
-        t.PURPLAN_PLAN_MATERIAL_ID, t.PLAN_ID, t.MATERIAL_ID, t.PURPLAN_MATERIAL_NUMBER,
-    t.MATERIAL_ALLOCATED_WEIGHT, t.MATERIAL_UNALLOCATED_WEIGHT, t.INSERT_USERNAME, t.INSERT_TIME, 
-    t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK
-    </sql>
-    <sql id="select">
-        SELECT
-        <include refid="columns"/>
-        FROM AMSTRUCK_PURPLAN_MATERIAL
-    </sql>
-    <sql id="select_alias">
-        SELECT
-        <include refid="columns_alias"/>
-        FROM AMSTRUCK_PURPLAN_MATERIAL t
-    </sql>
-    <sql id="where">
-        <where>
-            <if test="purplanPlanMaterialId != null">
-                and PURPLAN_PLAN_MATERIAL_ID = #{purplanPlanMaterialId}
-            </if>
-            <if test="planId != null">
-                and PLAN_ID = #{planId}
-            </if>
-            <if test="materialId != null">
-                and MATERIAL_ID = #{materialId}
-            </if>
-            <if test="purplanMaterialNumber != null">
-                and PURPLAN_MATERIAL_NUMBER = #{purplanMaterialNumber}
-            </if>
-            <if test="materialAllocatedWeight != null">
-                and MATERIAL_ALLOCATED_WEIGHT = #{materialAllocatedWeight}
-            </if>
-            <if test="materialUnallocatedWeight != null">
-                and MATERIAL_UNALLOCATED_WEIGHT = #{materialUnallocatedWeight}
-            </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>
-        </where>
-    </sql>
-    <sql id="whereLike">
-        <where>
-            <if test="purplanPlanMaterialId != null">
-                and PURPLAN_PLAN_MATERIAL_ID = #{purplanPlanMaterialId}
-            </if>
-            <if test="planId != null">
-                and PLAN_ID = #{planId}
-            </if>
-            <if test="materialId != null">
-                and MATERIAL_ID = #{materialId}
-            </if>
-            <if test="purplanMaterialNumber != null">
-                and PURPLAN_MATERIAL_NUMBER = #{purplanMaterialNumber}
-            </if>
-            <if test="materialAllocatedWeight != null">
-                and MATERIAL_ALLOCATED_WEIGHT = #{materialAllocatedWeight}
-            </if>
-            <if test="materialUnallocatedWeight != null">
-                and MATERIAL_UNALLOCATED_WEIGHT = #{materialUnallocatedWeight}
-            </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>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        delete
-        from AMSTRUCK_PURPLAN_MATERIAL
-        where PURPLAN_PLAN_MATERIAL_ID = #{purplanPlanMaterialId,jdbcType=DECIMAL}
-    </delete>
-    <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-        delete from AMSTRUCK_PURPLAN_MATERIAL
-        where 1!=1
-        <if test="planId != null">
-            or PLAN_ID = #{planId}
-        </if>
-        <if test="materialId != null">
-            or MATERIAL_ID = #{materialId}
-        </if>
-        <if test="purplanMaterialNumber != null">
-            or PURPLAN_MATERIAL_NUMBER = #{purplanMaterialNumber}
-        </if>
-        <if test="materialAllocatedWeight != null">
-            or MATERIAL_ALLOCATED_WEIGHT = #{materialAllocatedWeight}
-        </if>
-        <if test="materialUnallocatedWeight != null">
-            or MATERIAL_UNALLOCATED_WEIGHT = #{materialUnallocatedWeight}
-        </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>
-    </delete>
-    <insert id="insert" parameterType="com.steerinfo.dil.model.AmstruckPurplanMaterial">
-        insert into AMSTRUCK_PURPLAN_MATERIAL (PURPLAN_PLAN_MATERIAL_ID, PLAN_ID, MATERIAL_ID,
-                                               PURPLAN_MATERIAL_NUMBER, MATERIAL_ALLOCATED_WEIGHT,
-                                               MATERIAL_UNALLOCATED_WEIGHT, INSERT_USERNAME,
-                                               INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME,
-                                               INSERT_UPDATE_REMARK)
-        values (#{purplanPlanMaterialId,jdbcType=DECIMAL}, #{planId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
-                #{purplanMaterialNumber,jdbcType=DECIMAL}, #{materialAllocatedWeight,jdbcType=DECIMAL},
-                #{materialUnallocatedWeight,jdbcType=DECIMAL}, #{insertUsername,jdbcType=VARCHAR},
-                #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP},
-                #{insertUpdateRemark,jdbcType=VARCHAR})
-    </insert>
-    <insert id="insertSelective" parameterType="com.steerinfo.dil.model.AmstruckPurplanMaterial">
-        insert into AMSTRUCK_PURPLAN_MATERIAL
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="purplanPlanMaterialId != null">
-                PURPLAN_PLAN_MATERIAL_ID,
-            </if>
-            <if test="planId != null">
-                PLAN_ID,
-            </if>
-            <if test="materialId != null">
-                MATERIAL_ID,
-            </if>
-            <if test="purplanMaterialNumber != null">
-                PURPLAN_MATERIAL_NUMBER,
-            </if>
-            <if test="materialAllocatedWeight != null">
-                MATERIAL_ALLOCATED_WEIGHT,
-            </if>
-            <if test="materialUnallocatedWeight != null">
-                MATERIAL_UNALLOCATED_WEIGHT,
-            </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>
-        </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="purplanPlanMaterialId != null">
-                #{purplanPlanMaterialId,jdbcType=DECIMAL},
-            </if>
-            <if test="planId != null">
-                #{planId,jdbcType=DECIMAL},
-            </if>
-            <if test="materialId != null">
-                #{materialId,jdbcType=DECIMAL},
-            </if>
-            <if test="purplanMaterialNumber != null">
-                #{purplanMaterialNumber,jdbcType=DECIMAL},
-            </if>
-            <if test="materialAllocatedWeight != null">
-                #{materialAllocatedWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="materialUnallocatedWeight != null">
-                #{materialUnallocatedWeight,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>
-        </trim>
-    </insert>
-    <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.AmstruckPurplanMaterial">
-        update AMSTRUCK_PURPLAN_MATERIAL
-        set PLAN_ID                     = #{planId,jdbcType=DECIMAL},
-            MATERIAL_ID                 = #{materialId,jdbcType=DECIMAL},
-            PURPLAN_MATERIAL_NUMBER     = #{purplanMaterialNumber,jdbcType=DECIMAL},
-            MATERIAL_ALLOCATED_WEIGHT   = #{materialAllocatedWeight,jdbcType=DECIMAL},
-            MATERIAL_UNALLOCATED_WEIGHT = #{materialUnallocatedWeight,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}
-        where PURPLAN_PLAN_MATERIAL_ID = #{purplanPlanMaterialId,jdbcType=DECIMAL}
-    </update>
-    <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.AmstruckPurplanMaterial">
-        update AMSTRUCK_PURPLAN_MATERIAL
-        <set>
-            <if test="planId != null">
-                PLAN_ID = #{planId,jdbcType=DECIMAL},
-            </if>
-            <if test="materialId != null">
-                MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-            </if>
-            <if test="purplanMaterialNumber != null">
-                PURPLAN_MATERIAL_NUMBER = #{purplanMaterialNumber,jdbcType=DECIMAL},
-            </if>
-            <if test="materialAllocatedWeight != null">
-                MATERIAL_ALLOCATED_WEIGHT = #{materialAllocatedWeight,jdbcType=DECIMAL},
-            </if>
-            <if test="materialUnallocatedWeight != null">
-                MATERIAL_UNALLOCATED_WEIGHT = #{materialUnallocatedWeight,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>
-        </set>
-        where PURPLAN_PLAN_MATERIAL_ID = #{purplanPlanMaterialId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-        <include refid="select"/>
-        where PURPLAN_PLAN_MATERIAL_ID = #{purplanPlanMaterialId,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 AMSTRUCK_PURPLAN_MATERIAL
-        (PURPLAN_PLAN_MATERIAL_ID,
-        PLAN_ID, MATERIAL_ID, PURPLAN_MATERIAL_NUMBER,
-        MATERIAL_ALLOCATED_WEIGHT, MATERIAL_UNALLOCATED_WEIGHT,
-        INSERT_USERNAME, INSERT_TIME,
-        UPDATE_USERNAME, UPDATE_TIME,
-        INSERT_UPDATE_REMARK)
-        ( <foreach collection="list" item="item" separator="union all">
-        select
-        #{item.purplanPlanMaterialId,jdbcType=DECIMAL},
-        #{item.planId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL},
-        #{item.purplanMaterialNumber,jdbcType=DECIMAL},
-        #{item.materialAllocatedWeight,jdbcType=DECIMAL}, #{item.materialUnallocatedWeight,jdbcType=DECIMAL},
-        #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP},
-        #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP},
-        #{item.insertUpdateRemark,jdbcType=VARCHAR} from dual
-    </foreach> )
-    </insert>
-    <update id="batchUpdate" parameterType="java.util.List">
-        update AMSTRUCK_PURPLAN_MATERIAL
-        set
-        PURPLAN_PLAN_MATERIAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.purplanPlanMaterialId,jdbcType=DECIMAL}
-        </foreach>
-        ,PLAN_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.planId,jdbcType=DECIMAL}
-        </foreach>
-        ,MATERIAL_ID=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-        </foreach>
-        ,PURPLAN_MATERIAL_NUMBER=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.purplanMaterialNumber,jdbcType=DECIMAL}
-        </foreach>
-        ,MATERIAL_ALLOCATED_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.materialAllocatedWeight,jdbcType=DECIMAL}
-        </foreach>
-        ,MATERIAL_UNALLOCATED_WEIGHT=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.materialUnallocatedWeight,jdbcType=DECIMAL}
-        </foreach>
-        ,INSERT_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,INSERT_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,UPDATE_USERNAME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-        </foreach>
-        ,UPDATE_TIME=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-        </foreach>
-        ,INSERT_UPDATE_REMARK=
-        <foreach collection="list" item="item" index="index" separator=" " open="case PURPLAN_PLAN_MATERIAL_ID"
-                 close="end">
-            when #{item.purplanPlanMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-        </foreach>
-        where PURPLAN_PLAN_MATERIAL_ID in
-        <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-            #{item.purplanPlanMaterialId,jdbcType=DECIMAL}
-        </foreach>
-    </update>
-    <delete id="batchDelete" parameterType="java.util.List">
-        delete from AMSTRUCK_PURPLAN_MATERIAL
-        where PURPLAN_PLAN_MATERIAL_ID in
-        <foreach collection="list" item="id" open="(" close=")" 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>
-        <if test="orderField == null  ">
-            order by "insertTime" desc
-        </if>
-    </sql>
-
-
-    <!--查询分解计划 -->
-    <select id="getDecomposedPlan" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-        select
-        *
-        from (
-        select
-        APO.PURCHASE_ORDER_ID "purchaseOrderId",
-        APM.PURPLAN_PLAN_MATERIAL_ID "purplanPlanMaterialId",
-        APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-        DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName",
-        RM.MATERIAL_NAME "materialName",
-        AP.PLAN_NO "planNo",
-        RC.CARRIER_NAME "carrierName",
-        AP.MATERIAL_TOTAL_WEIGHT "materialTotalWeight",
-        APM.MATERIAL_ALLOCATED_WEIGHT "materialAllocatedWeight",
-        APM.MATERIAL_UNALLOCATED_WEIGHT "materialUnallocatedWeight",
-        AP.PLAN_TRUCK_TIME "planTruckTime",
-        RM.MATERIAL_ID "materialId",
-        AP.PLAN_INCOMING_TIME "planIncomingTime",
-        AP.PLAN_ID "planId",
-        AP.INSERT_TIME "insertTime"
-        from AMSTRUCK_PURPLAN AP
-        left join AMSTRUCK_PURPLAN_MATERIAL APM
-        on AP.PLAN_ID = APM.PLAN_ID
-        left join AMS_PURCHASE_ORDER APO
-        on AP.BATCH_ID = APO.BATCH_ID
-        left join DIL_BATCH DB
-        on AP.BATCH_ID = DB.BATCH_ID
-        left join RMS_MATERIAL RM
-        on RM.MATERIAL_ID = DB.MATERIAL_ID
-        left join RMS_CARRIER RC
-        on AP.CARRIER_ID = RC.CARRIER_ID
-        <where>
-            <if test="planId != null">
-                AP.PLAN_ID = #{planId}
-            </if>
-            <if test="planStatus != null">
-                and AP.PLAN_STATUS = #{planStatus}
-            </if>
-        </where>
-        )
-        <where>
-            <if test="purplanPlanMaterialId != null">
-
-                <foreach collection="purplanPlanMaterialId" item="item" open="(" separator="or" close=")">
-                    "purplanPlanMaterialId" 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="resultForeignShipName != null">
-                and
-                <foreach collection="resultForeignShipName" item="item" open="(" separator="or" close=")">
-                    "resultForeignShipName" 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="planNo != null">
-                and
-                <foreach collection="planNo" item="item" open="(" separator="or" close=")">
-                    "planNo" 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="materialTotalWeight != null">
-                and
-                <foreach collection="materialTotalWeight" item="item" open="(" separator="or" close=")">
-                    "materialTotalWeight" 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="lineDesc != null">
-                and
-                <foreach collection="lineDesc" item="item" open="(" separator="or" close=")">
-                    "lineDesc" 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="materialAllocatedWeight != null">
-                and
-                <foreach collection="materialAllocatedWeight" item="item" open="(" separator="or" close=")">
-                    "materialAllocatedWeight" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="materialUnallocatedWeight != null">
-                and
-                <foreach collection="materialUnallocatedWeight" item="item" open="(" separator="or" close=")">
-                    "materialUnallocatedWeight" like '%${item}%'
-                </foreach>
-            </if>
-        </where>
-        <include refid="orderBy"></include>
-    </select>
-
-    <!--获取未分配重量 已分配重量-->
-    <select id="getWeight" parameterType="int" resultType="java.util.LinkedHashMap">
-        select APM.MATERIAL_ALLOCATED_WEIGHT   "materialAllocatedWeight",
-               APM.MATERIAL_UNALLOCATED_WEIGHT "materialUnallocatedWeight"
-        from AMSTRUCK_PURPLAN_MATERIAL APM
-        where APM.PLAN_ID = #{planId}
-    </select>
-
-<!--  通过计划Id查询子表主键ID -->
-    <select id="getChildIdByPlanId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
-        select PURPLAN_PLAN_MATERIAL_ID
-        from AMSTRUCK_PURPLAN_MATERIAL
-        where PLAN_ID = #{planId}
-    </select>
-</mapper>

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

@@ -1,1333 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.steerinfo.dil.mapper.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="DRIVER_CAPACITY_ID" jdbcType="DECIMAL" property="driverCapacityId" />
-    </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, DRIVER_CAPACITY_ID
-    </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.DRIVER_CAPACITY_ID
-    </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="driverCapacityId != null">
-                and DRIVER_CAPACITY_ID = #{driverCapacityId}
-            </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="driverCapacityId != null">
-                and DRIVER_CAPACITY_ID = #{driverCapacityId}
-            </if>
-        </where>
-    </sql>
-    <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-        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="driverCapacityId != null">
-            or DRIVER_CAPACITY_ID = #{driverCapacityId}
-        </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, DRIVER_CAPACITY_ID
-        )
-        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}, #{driverCapacityId,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="driverCapacityId != null">
-                DRIVER_CAPACITY_ID,
-            </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="driverCapacityId != null">
-                #{driverCapacityId,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},
-            DRIVER_CAPACITY_ID = #{driverCapacityId,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="driverCapacityId != null">
-                DRIVER_CAPACITY_ID = #{driverCapacityId,jdbcType=DECIMAL},
-            </if>
-        </set>
-        where ORDER_ID = #{orderId,jdbcType=DECIMAL}
-    </update>
-    <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" 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, DRIVER_CAPACITY_ID
-        )
-        ( <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.driverCapacityId,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>
-        ,DRIVER_CAPACITY_ID=
-        <foreach close="end" collection="list" index="index" item="item" open="case ORDER_ID" separator=" ">
-            when #{item.orderId,jdbcType=DECIMAL} then #{item.driverCapacityId,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",
-                AP.PLAN_ID "planId",
-                APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-                RM.MATERIAL_NAME "materialName",
-                AP.PLAN_NO "planNo",
-                RC.CAPACITY_NUMBER "capacityNumber",
-                RC.CAPACITY_ID "capacityId",
-                RCD.DRIVER_NAME "driverName",
-                OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-                AP.PLAN_TRUCK_TIME "planTruckTime",
-                AP.PLAN_INCOMING_TIME "planIncomingTime",
-                OO.INSERT_USERNAME "insertUsername",
-                OO.INSERT_TIME "insertTime",
-                OO.ORDER_NUMBER "orderNumber",
-                RW.WAREHOUSE_NAME "warehouseName", --卸货点
-                OO.ORDER_ENTRY_TIME "orderEntryTime", --进厂时间
-                RS.SUPPLIER_NAME "supplierName",  --发货单位
-                RCSE.CONSIGNEE_COMPANY_NAME "consigneeCompanyName" --收货单位
-
-        from OMSTRUCK_ORDER OO
-        left join AMS_PURCHASE_ORDER APO
-        on OO.ORDER_PLAN_ID = APO.PURCHASE_ORDER_ID
-        left join AMSTRUCK_PURPLAN AP
-        on AP.BATCH_ID = APO.BATCH_ID and AP.PLAN_STATUS != 3
-        left join RMS_CAPACITY RC
-        on RC.CAPACITY_ID = OO.CAPACITY_ID
-        left join RMS_DRIVER_CAPACITY RDC
-        on RDC.CAPACITY_ID = RC.CAPACITY_ID
-        left join RMS_CAR_DRIVER RCD
-        on RCD.DRIVER_ID = RDC.DRIVER_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_LINE RL
-        on OO.LINE_ID = RL.LINE_ID
-        left join RMS_LINE_SEGEMNT RLS --查找卸货点
-        on RLS.LINE_ID = RL.LINE_ID and RLS.SEGMENT_END_NODE_TYPE = 3
-        left join RMS_WAREHOUSE RW
-        on RLS.SEGMENT_END_NODE_ID = RW.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>
-            <if test="orderStatus != null">
-                OO.ORDER_STATUS = #{orderStatus}
-            </if>
-            <if test="planId != null ">
-                and AP.PLAN_ID = #{planId}
-            </if>
-            <if test="orderType != null">
-                and ORDER_TYPE = #{orderType}
-            </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="driverName != null">
-                and
-                <foreach collection="driverName" item="item" open="(" separator="or" close=")">
-                    "driverName" 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",
-            RCT.CAPACITY_TYPE_NAME "capacityTypeName",
-            RC.CAPACITY_CORLOR "capacityCorlor",
-            RC2.CARRIER_NAME "carrierName",
-            RC.CAPACITY_OWNERIS "capacityOwneris",
-            RC.CAPACITY_BLACKLIST "capacityBlacklist",
-            RC.CAPACITY_VIP "capacityVip",
-            RC.INSERT_TIME "insertTime"
-        from RMS_CAPACITY RC
-        left join RMS_CAPACITY_TYPE RCT
-        on RC.CAPACITY_TYPE_ID = RCT.CAPACITY_TYPE_ID
-        left join RMS_CARRIER RC2
-        on RC.CARRIER_ID = RC2.CARRIER_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="capacityNumber != null">
-                <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
-                    "capacityNumber" like '%${item}%'
-                </foreach>
-            </if>
-
-            <if test="capacityCorlor != null">
-                and
-                <foreach collection="capacityCorlor" item="item" open="(" separator="or" close=")">
-                    "capacityCorlor" 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="capacityTypeName != null">
-                and
-                <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
-                    "capacityTypeName" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="capacityBlacklist != null">
-                and
-                <foreach collection="capacityBlacklist" item="item" open="(" separator="or" close=")">
-                    "capacityBlacklist" like '%${item}%'
-                </foreach>
-            </if>
-
-            <if test="capacityOwneris != null">
-                and
-                <foreach collection="capacityOwneris" item="item" open="(" separator="or" close=")">
-                    "capacityOwneris" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="capacityVip != null">
-                and
-                <foreach collection="capacityVip" item="item" open="(" separator="or" close=")">
-                    "capacityVip" 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 查询司机接单数据  、通过运单号查询所有运单信息-->
-    <select id="getTruckOrderByCapacityNum" parameterType="java.util.Map" resultType="java.util.Map">
-
-        select
-        *
-        from(
-        select
-        OO.ORDER_ID "orderId",
-        OO.ORDER_NUMBER "orderNumber",
-        RC.CAPACITY_NUMBER "capacityNumber",
-        RM.MATERIAL_NAME "materialName",
-        OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-        OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime",
-        <include refid="columnSql">
-        </include>
-        AP.PLAN_INCOMING_TIME "entryTime"
-        from OMSTRUCK_ORDER OO
-        left join AMS_PURCHASE_ORDER APO
-        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
-        left join AMSTRUCK_PURPLAN AP
-        on AP.BATCH_ID = APO.BATCH_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
-        left join RMS_LINE RL
-        on RL.LINE_ID = OO.LINE_ID
-        <include refid="placeSql">
-        </include>
-        <where>
-            <if test="capacityId != null">
-                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="orderTypee != null">
-                and OO.ORDER_TYPE = #{orderTypee}
-            </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="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="entryTime != null">
-                and
-                <foreach collection="entryTime" item="item" open="(" separator="or" close=")">
-                    "entryTime" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="gatepostName1 != null">
-                and
-                <foreach collection="gatepostName1" item="item" open="(" separator="or" close=")">
-                    "gatepostName1" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="gatepostName2 != null">
-                and
-                <foreach collection="gatepostName2" item="item" open="(" separator="or" close=")">
-                    "gatepostName2" like '%${item}%'
-                </foreach>
-            </if>
-            <if test="truckCalculateNumber != null">
-                and
-                <foreach collection="truckCalculateNumber" item="item" open="(" separator="or" close=")">
-                    "truckCalculateNumber" 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="truckCalculateNum != null">
-                and
-                <foreach collection="truckCalculateNum" item="item" open="(" separator="or" close=")">
-                    "truckCalculateNum" like '%${item}%'
-                </foreach>
-            </if>
-        </where>
-        <include refid="orderBy">
-        </include>
-        <if test="orderField == null  ">
-            order by "orderReceiveRefuseTime" 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",
-               oo.ORDER_LINE_SEQUENCE       as "orderLineSequence"
-        FROM OMSTRUCK_ORDER OO
-                 LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
-                           ON TTR.ORDER_ID = OO.ORDER_ID
-                 LEFT JOIN TMSTRUCK_ENFACTORY_RESULT TER
-                           ON TER.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
-        WHERE RW.WAREHOUSE_TYPE_ID = 3
-          AND 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",
-               OO.ORDER_ENTRY_TIME "orderEntryTime"
-        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
-        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">
-                      OO.ORDER_ID = #{orderId}
-                  </if>
-    </select>
-
-<!--  查询运输派单信息  -->
-    <select id="getTransportDispatch" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
-
-        select
-        *
-        from(
-
-            select
-                APO.PURCHASE_ORDER_NO "purchaseOrderNo",
-                RS.SUPPLIER_NAME "supplierName",
-                RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
-                RW.WAREHOUSE_NAME "warehouseName",
-                RCON.CONSIGNEE_CONTACT_NAME "consigneeContactName",
-                RCON.CONSIGNEE_CONTACT_TEL "consigneeContactTel",
-                APO.PUCHASE_ORDER_DELIVERY_DATE "puchaseOrderDeliveryDate",
-                RM.MATERIAL_NAME "materialName",
-                OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
-                OO.ORDER_ISSUE_TIME "orderIssueTime",
-                OO.ORDER_RECEIVE_REFUSE_TIME "orderReceiveRefuseTime"
-
-            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_LINE_SEGEMNT RLS
-            on RLS.LINE_ID = OO.LINE_ID and RLS.SEGMENT_END_NODE_TYPE = 3
-            left join RMS_WAREHOUSE RW
-            on RW.WAREHOUSE_ID = RLS.SEGMENT_END_NODE_ID
-            <where>
-                <if test="orderStatus != null">
-                    OO.ORDER_STATUS = #{orderStatus}
-                </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="purchaseOrderNo != null">
-            <foreach collection="purchaseOrderNo" item="item" open="(" separator="or" close=")">
-                "purchaseOrderNo" 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>
-    </where>
-    <include refid="orderBy">
-    </include>
-        <if test="orderField == null  ">
-            order by "orderReceiveRefuseTime" desc
-        </if>
-    </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="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>
-    <!--查询司机排班信息-->
-    <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
-        <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>
-</mapper>

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

@@ -1,387 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.steerinfo.dil.mapper.OmstruckOrderMaterialMapper">
-  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.OmstruckOrderMaterial">
-    <id column="ORDER_MATERIAL_ID" jdbcType="DECIMAL" property="orderMaterialId" />
-    <result column="ORDER_ID" jdbcType="DECIMAL" property="orderId" />
-    <result column="MATERIAL_ID" jdbcType="DECIMAL" property="materialId" />
-    <result column="ORDER_MATERIAL_NUMBER" jdbcType="DECIMAL" property="orderMaterialNumber" />
-    <result column="ORDER_MATERIAL_WEIGHT" jdbcType="DECIMAL" property="orderMaterialWeight" />
-    <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="MATERIAL_DIRECTION" jdbcType="DECIMAL" property="materialDirection" />
-  </resultMap>
-  <sql id="columns">
-    ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT, 
-    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    MATERIAL_DIRECTION
-  </sql>
-  <sql id="columns_alias">
-    t.ORDER_MATERIAL_ID, t.ORDER_ID, t.MATERIAL_ID, t.ORDER_MATERIAL_NUMBER, t.ORDER_MATERIAL_WEIGHT, 
-    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
-    t.MATERIAL_DIRECTION
-  </sql>
-  <sql id="select">
-    SELECT <include refid="columns"/> FROM OMSTRUCK_ORDER_MATERIAL
-  </sql>
-  <sql id="select_alias">
-    SELECT <include refid="columns_alias"/> FROM OMSTRUCK_ORDER_MATERIAL t
-  </sql>
-  <sql id="where">
-    <where>
-      <if test="orderMaterialId != null">
-        and ORDER_MATERIAL_ID = #{orderMaterialId}
-      </if>
-      <if test="orderId != null">
-        and ORDER_ID = #{orderId}
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </if>
-      <if test="orderMaterialNumber != null">
-        and ORDER_MATERIAL_NUMBER = #{orderMaterialNumber}
-      </if>
-      <if test="orderMaterialWeight != null">
-        and ORDER_MATERIAL_WEIGHT = #{orderMaterialWeight}
-      </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="materialDirection != null">
-        and MATERIAL_DIRECTION = #{materialDirection}
-      </if>
-    </where>
-  </sql>
-  <sql id="whereLike">
-    <where>
-      <if test="orderMaterialId != null">
-        and ORDER_MATERIAL_ID = #{orderMaterialId}
-      </if>
-      <if test="orderId != null">
-        and ORDER_ID = #{orderId}
-      </if>
-      <if test="materialId != null">
-        and MATERIAL_ID = #{materialId}
-      </if>
-      <if test="orderMaterialNumber != null">
-        and ORDER_MATERIAL_NUMBER = #{orderMaterialNumber}
-      </if>
-      <if test="orderMaterialWeight != null">
-        and ORDER_MATERIAL_WEIGHT = #{orderMaterialWeight}
-      </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="materialDirection != null">
-        and MATERIAL_DIRECTION = #{materialDirection}
-      </if>
-    </where>
-  </sql>
-  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
-    delete from OMSTRUCK_ORDER_MATERIAL
-    where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
-  </delete>
-  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
-    delete from OMSTRUCK_ORDER_MATERIAL
-    where 1!=1
-    <if test="orderId != null">
-      or ORDER_ID = #{orderId}
-    </if>
-    <if test="materialId != null">
-      or MATERIAL_ID = #{materialId}
-    </if>
-    <if test="orderMaterialNumber != null">
-      or ORDER_MATERIAL_NUMBER = #{orderMaterialNumber}
-    </if>
-    <if test="orderMaterialWeight != null">
-      or ORDER_MATERIAL_WEIGHT = #{orderMaterialWeight}
-    </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="materialDirection != null">
-      or MATERIAL_DIRECTION = #{materialDirection}
-    </if>
-  </delete>
-  <insert id="insert" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
-    insert into OMSTRUCK_ORDER_MATERIAL (ORDER_MATERIAL_ID, ORDER_ID, MATERIAL_ID,
-                                         ORDER_MATERIAL_NUMBER, ORDER_MATERIAL_WEIGHT,
-                                         INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME,
-                                         UPDATE_TIME, INSERT_UPDATE_REMARK, MATERIAL_DIRECTION
-    )
-    values (#{orderMaterialId,jdbcType=DECIMAL}, #{orderId,jdbcType=DECIMAL}, #{materialId,jdbcType=DECIMAL},
-            #{orderMaterialNumber,jdbcType=DECIMAL}, #{orderMaterialWeight,jdbcType=DECIMAL},
-            #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, #{updateUsername,jdbcType=VARCHAR},
-            #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, #{materialDirection,jdbcType=DECIMAL}
-           )
-  </insert>
-  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
-    insert into OMSTRUCK_ORDER_MATERIAL
-    <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test="orderMaterialId != null">
-        ORDER_MATERIAL_ID,
-      </if>
-      <if test="orderId != null">
-        ORDER_ID,
-      </if>
-      <if test="materialId != null">
-        MATERIAL_ID,
-      </if>
-      <if test="orderMaterialNumber != null">
-        ORDER_MATERIAL_NUMBER,
-      </if>
-      <if test="orderMaterialWeight != null">
-        ORDER_MATERIAL_WEIGHT,
-      </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="materialDirection != null">
-        MATERIAL_DIRECTION,
-      </if>
-    </trim>
-    <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test="orderMaterialId != null">
-        #{orderMaterialId,jdbcType=DECIMAL},
-      </if>
-      <if test="orderId != null">
-        #{orderId,jdbcType=DECIMAL},
-      </if>
-      <if test="materialId != null">
-        #{materialId,jdbcType=DECIMAL},
-      </if>
-      <if test="orderMaterialNumber != null">
-        #{orderMaterialNumber,jdbcType=DECIMAL},
-      </if>
-      <if test="orderMaterialWeight != null">
-        #{orderMaterialWeight,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="materialDirection != null">
-        #{materialDirection,jdbcType=DECIMAL},
-      </if>
-    </trim>
-  </insert>
-  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
-    update OMSTRUCK_ORDER_MATERIAL
-    set ORDER_ID = #{orderId,jdbcType=DECIMAL},
-        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-        ORDER_MATERIAL_NUMBER = #{orderMaterialNumber,jdbcType=DECIMAL},
-        ORDER_MATERIAL_WEIGHT = #{orderMaterialWeight,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},
-        MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL}
-    where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
-  </update>
-  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.OmstruckOrderMaterial">
-    update OMSTRUCK_ORDER_MATERIAL
-    <set>
-      <if test="orderId != null">
-        ORDER_ID = #{orderId,jdbcType=DECIMAL},
-      </if>
-      <if test="materialId != null">
-        MATERIAL_ID = #{materialId,jdbcType=DECIMAL},
-      </if>
-      <if test="orderMaterialNumber != null">
-        ORDER_MATERIAL_NUMBER = #{orderMaterialNumber,jdbcType=DECIMAL},
-      </if>
-      <if test="orderMaterialWeight != null">
-        ORDER_MATERIAL_WEIGHT = #{orderMaterialWeight,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="materialDirection != null">
-        MATERIAL_DIRECTION = #{materialDirection,jdbcType=DECIMAL},
-      </if>
-    </set>
-    where ORDER_MATERIAL_ID = #{orderMaterialId,jdbcType=DECIMAL}
-  </update>
-  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
-    <include refid="select"/>
-    where ORDER_MATERIAL_ID = #{orderMaterialId,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_MATERIAL
-    (ORDER_MATERIAL_ID,
-    ORDER_ID, MATERIAL_ID, ORDER_MATERIAL_NUMBER,
-    ORDER_MATERIAL_WEIGHT, INSERT_USERNAME,
-    INSERT_TIME, UPDATE_USERNAME,
-    UPDATE_TIME, INSERT_UPDATE_REMARK,
-    MATERIAL_DIRECTION)
-    ( <foreach collection="list" item="item" separator="union all">
-    select
-    #{item.orderMaterialId,jdbcType=DECIMAL},
-    #{item.orderId,jdbcType=DECIMAL}, #{item.materialId,jdbcType=DECIMAL}, #{item.orderMaterialNumber,jdbcType=DECIMAL},
-    #{item.orderMaterialWeight,jdbcType=DECIMAL}, #{item.insertUsername,jdbcType=VARCHAR},
-    #{item.insertTime,jdbcType=TIMESTAMP}, #{item.updateUsername,jdbcType=VARCHAR},
-    #{item.updateTime,jdbcType=TIMESTAMP}, #{item.insertUpdateRemark,jdbcType=VARCHAR},
-    #{item.materialDirection,jdbcType=DECIMAL} from dual
-  </foreach> )
-  </insert>
-  <update id="batchUpdate" parameterType="java.util.List">
-    update OMSTRUCK_ORDER_MATERIAL
-    set
-    ORDER_MATERIAL_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialId,jdbcType=DECIMAL}
-    </foreach>
-    ,ORDER_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderId,jdbcType=DECIMAL}
-    </foreach>
-    ,MATERIAL_ID=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialId,jdbcType=DECIMAL}
-    </foreach>
-    ,ORDER_MATERIAL_NUMBER=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialNumber,jdbcType=DECIMAL}
-    </foreach>
-    ,ORDER_MATERIAL_WEIGHT=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.orderMaterialWeight,jdbcType=DECIMAL}
-    </foreach>
-    ,INSERT_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,INSERT_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,UPDATE_USERNAME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
-    </foreach>
-    ,UPDATE_TIME=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
-    </foreach>
-    ,INSERT_UPDATE_REMARK=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
-    </foreach>
-    ,MATERIAL_DIRECTION=
-    <foreach collection="list" item="item" index="index" separator=" " open="case ORDER_MATERIAL_ID" close="end">
-      when #{item.orderMaterialId,jdbcType=DECIMAL} then #{item.materialDirection,jdbcType=DECIMAL}
-    </foreach>
-    where ORDER_MATERIAL_ID in
-    <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
-      #{item.orderMaterialId,jdbcType=DECIMAL}
-    </foreach>
-  </update>
-  <delete id="batchDelete" parameterType="java.util.List">
-    delete from OMSTRUCK_ORDER_MATERIAL
-    where ORDER_MATERIAL_ID in
-    <foreach collection="list" item="id" open="(" close=")" 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>
-
-
-<!--  通过orderId获取子表主键 -->
-  <select id="getOrderMaterialIdByOrderId" parameterType="java.math.BigDecimal" resultType="java.math.BigDecimal">
-    select OOM.ORDER_MATERIAL_ID from OMSTRUCK_ORDER_MATERIAL OOM where OOM.ORDER_ID = #{orderId}
-  </select>
-
-</mapper>

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

@@ -432,8 +432,8 @@
     </if>
   </sql>
 
-<!--  查询所有的进厂作业实绩 -->
-  <select id="getAllEnFactoryResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+<!--  查询所有的采购进厂作业实绩 -->
+  <select id="getCGJKEnFactoryResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select *
     from (
            select
@@ -471,7 +471,7 @@
                             on RM.MATERIAL_ID = OOM.MATERIAL_ID
                   left join RMS_GATEPOST RG
                             on RG.GATEPOST_ID = TER.GATEPOST_ID
-            where TER.RESULT_ENTRY_GATE_TIME is not null
+            where TER.RESULT_ENTRY_GATE_TIME is not null and OO.ORDER_TYPE = #{orderTypee}
          )
       <where>
         <if test="purchaseOrderId != null">
@@ -491,7 +491,7 @@
           "resultForeignShipName" like '%${item}%'
         </foreach>
         </if>
-        <if test="orderNumber != null">
+        <if test="orderNumber != null and orderNumber != ''">
         and
         <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
           "orderNumber" like '%${item}%'
@@ -531,6 +531,74 @@
     <include refid="orderByEnterTime"></include>
   </select>
 
+
+<!--  查询内转进厂作业实绩  -->
+  <select id="getAllInwardTurnEnFactoryResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+    select *
+    from (
+    select
+        RM.MATERIAL_NAME            "materialName",
+        OO.ORDER_NUMBER             "orderNumber",
+        RC.CAPACITY_NUMBER          "capacityNumber",
+        RG.GATEPOST_NAME         "gatepostName",
+        TER.RESULT_ENTRY_MODE       "resultEntryMode",
+        TER.RESULT_ENTRY_GATE_TIME  "resultEntryGateTime",
+           (
+               CASE
+                   WHEN OOM.ORDER_MATERIAL_WEIGHT is null
+                   THEN OOM.ORDER_MATERIAL_NUMBER
+                   ELSE OOM.ORDER_MATERIAL_WEIGHT
+                   END
+               ) "orderMaterialNo"
+    from TMSTRUCK_ENFACTORY_RESULT TER
+    left join TMSTRUCK_TOTAL_RESULT TTR
+    on TER.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+    left join OMSTRUCK_ORDER OO
+    on TTR.ORDER_ID = OO.ORDER_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
+    left join RMS_GATEPOST RG
+    on RG.GATEPOST_ID = TER.GATEPOST_ID
+    where TER.RESULT_ENTRY_GATE_TIME is not null and OO.ORDER_TYPE = 4
+    )
+    <where>
+      <if test="materialName != null">
+
+        <foreach collection="materialName" item="item" open="(" separator="or" close=")">
+          "materialName" 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="capacityNumber != null">
+        and
+        <foreach collection="capacityNumber" item="item" open="(" separator="or" close=")">
+          "capacityNumber" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="resultEntryMode != null">
+        and
+        <foreach collection="resultEntryMode" item="item" open="(" separator="or" close=")">
+          "resultEntryMode" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="orderMaterialNo != null">
+        and
+        <foreach collection="orderMaterialNo" item="item" open="(" separator="or" close=")">
+          "orderMaterialNo" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
+    <include refid="orderByEnterTime"></include>
+  </select>
   
 <!--  通过车牌号并且状态不为2 或 运输订单 或运输订单ID  查询关联的实绩总表ID -->
   <select id="selectOrderIdByCpAndOn" parameterType="java.util.Map" resultType="int">
@@ -546,7 +614,7 @@
       </if>
 
       <if test="orderNumber != null">
-         OO.ORDER_NUMBER = #{orderNumber}
+        and OO.ORDER_NUMBER = #{orderNumber}
       </if>
       <if test="capacityNumber != null">
         RC.CAPACITY_NUMBER = #{capacityNumber} and OO.ORDER_STATUS != 2 --司机还未结束不能生成下一单

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

@@ -555,14 +555,16 @@
     <select id="selectResultId" parameterType="string" resultType="java.util.Map">
         select TLFR.RESULT_ID "resultId",
                OO.ORDER_ID "orderId",
-               OO.CAPACITY_ID "capacityId",
-               OO.ORDER_TYPE "orderType",
-               TTR.RESULT_TOTAL_ID "resultTotalId"
+               OO.ORDER_TYPE "orderTypee",
+               TTR.RESULT_TOTAL_ID "resultTotalId",
+               RDC.CAPACITY_ID "capacityId"
         from OMSTRUCK_ORDER OO
                  left join TMSTRUCK_TOTAL_RESULT TTR
                            on OO.ORDER_ID = TTR.ORDER_ID
                  left join TMSTRUCK_LEAVE_FACTORY_RESULT TLFR
                            on TLFR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
+                 left join RMS_DRIVER_CAPACITY RDC
+                           on RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
         where OO.ORDER_NUMBER = #{orderNumber}
     </select>
 

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

@@ -583,7 +583,7 @@
   </sql>
 
 <!--  获取所有装车实绩  -->
-  <select id="getAllLoadResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+  <select id="getCGJKLoadResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
 
     select *
     from (
@@ -766,7 +766,12 @@
       OMSTRUCK_ORDER OO
         LEFT JOIN OMSTRUCK_ORDER_MATERIAL OOM ON OO.ORDER_ID = OOM.ORDER_ID
     WHERE
-      OO.ORDER_NUMBER = #{orderNumber}
+      <if test="orderNumber != null">
+        OO.ORDER_NUMBER = #{orderNumber}
+      </if>
+      <if test="orderId != null">
+        and OO.ORDER_ID = #{orderId}
+      </if>
   </select>
 
 <!--  通过订单ID 和物资Id 查询装车实绩ID 可能会有多条-->

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

@@ -426,4 +426,100 @@
     </if>
   </select>
 
+<!-- 查询采购计量委托  -->
+  <select id="getCGMeasureCommission" parameterType="java.util.Map" resultType="java.util.Map">
+    select APO.PURCHASE_ORDER_NO "purchaseOrderNo",
+           RC.CAPACITY_NUMBER "capacityNumber",
+           OO.ORDER_NUMBER "orderNumber",
+           RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+           RS.SUPPLIER_ID "supplierId",
+           RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+           RM.MATERIAL_NAME "materialName",
+           RW.WAREHOUSE_NAME "warehouseName",
+           DB.RESULT_FOREIGN_SHIP_NAME "resultForeignShipName"
+    from TMSTRUCK_MEASURE_COMMISSION TMC
+    left join TMSTRUCK_TOTAL_RESULT TTR
+        on TTR.RESULT_TOTAL_ID = TMC.RESULT_TOTAL_ID
+    left join OMSTRUCK_ORDER OO
+        on OO.ORDER_ID = TTR.ORDER_ID
+    left join AMS_PURCHASE_ORDER APO
+        on APO.PURCHASE_ORDER_ID = OO.ORDER_PLAN_ID
+    left join DIL_BATCH DB
+        on APO.BATCH_ID = DB.BATCH_ID
+    left join RMS_DRIVER_CAPACITY RDC
+        on OO.DRIVER_CAPACITY_ID = RDC.DRIVER_CAPACITY_ID
+    left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = RDC.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 TMSTRUCK_WEIGHT_RESULT TWR
+        on TWR.RESULT_TOTAL_ID = TMC.RESULT_TOTAL_ID
+    <if test="type == 0"> --计皮
+        left join RMS_TRUCK_CALCULATE RTC
+            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+    </if>
+    <if test="type == 1"> --计毛
+        left join RMS_TRUCK_CALCULATE RTC
+            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+    </if>
+    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 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 TMC.COMMSSION_TYPE = #{type} and TMC.RESULT_TOTAL_ID = #{resultTotalId}
+  </select>
+
+<!--  查询销售计量委托  -->
+    <select id="getXSMeasureCommission" parameterType="java.util.Map" resultType="java.util.Map">
+        select
+                ASO.SALE_NUMBER "saleNumber",
+                RS.SHIPPER_NAME "shipperName",
+                RC.CAPACITY_NUMBER "capacityNumber",
+                OO.ORDER_NUMBER "orderNumber",
+                RTC.TRUCK_CALCULATE_NUMBER "truckCalculateNumber",
+                RCON.CONSIGNEE_COMPANY_NAME "consigneeCompanyName",
+                RM.MATERIAL_NAME "materialName",
+                RW.WAREHOUSE_NAME "warehouseName",
+        from TMSTRUCK_MEASURE_COMMISSION TMC
+        left join TMSTRUCK_TOTAL_RESULT TTR
+        on TTR.RESULT_TOTAL_ID = TMC.RESULT_TOTAL_ID
+        left join OMSTRUCK_ORDER OO
+        on OO.ORDER_ID = TTR.ORDER_ID
+        left join AMS_SALE_ORDER ASO
+        on ASO.SALE_ORDER_ID = OO.ORDER_PLAN_ID
+        left join RMS_DRIVER_CAPACITY RDC
+        on OO.DRIVER_CAPACITY_ID = RDC.DRIVER_CAPACITY_ID
+        left join RMS_CAPACITY RC
+        on RC.CAPACITY_ID = RDC.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 TMSTRUCK_WEIGHT_RESULT TWR
+        on TWR.RESULT_TOTAL_ID = TMC.RESULT_TOTAL_ID
+        <if test="type == 0"> --计皮
+            left join RMS_TRUCK_CALCULATE RTC
+            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_TARE_PLACE_ID
+        </if>
+        <if test="type == 1"> --计毛
+            left join RMS_TRUCK_CALCULATE RTC
+            on RTC.TRUCK_CALCULATE_ID = TWR.RESULT_GROSS_PLACE_ID
+        </if>
+        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 RMS_SHIPPER RS -- 发货单位
+        on RS.SHIPPER_ID = ASO.SHIPPER_ID
+        left join RMS_CONSIGNEE RCON -- 收货单位
+        on RCON.CONSIGNEE_ID = ASO.RECEIVE_ID
+        where TMC.COMMSSION_TYPE = #{type} and TMC.RESULT_TOTAL_ID = #{resultTotalId}
+    </select>
+
 </mapper>

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

@@ -453,7 +453,7 @@
   </sql>
 
 <!--  查询所有签收实绩 -->
-  <select id="getReceiveResult" parameterType="java.util.Map" resultType="java.util.Map">
+  <select id="getReceiptResult" parameterType="java.util.Map" resultType="java.util.Map">
     select
            *
     from (

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

@@ -274,7 +274,7 @@
   </select>
 
 <!-- 通过运输订单ID查询上一个订单的信息 -->
-  <select id="getOldOrderMesById" parameterType="java.math.BigDecimal" resultType="com.steerinfo.dil.model.OmstruckOrder">
+  <select id="getOldOrderMesById" parameterType="java.math.BigDecimal" resultType="java.util.Map">
     select  OO.ORDER_TYPE "orderType",
             OO.ORDER_PLAN_ID "orderPlanId",
             OO.LINE_ID "lineId",
@@ -290,7 +290,7 @@
   </select>
 
   <!-- 通过运输订单Id查询查询上一个订单子表的信息 -->
-  <select id="getOldOrderMaterialMesByOrderId" parameterType="java.math.BigDecimal" resultType="com.steerinfo.dil.model.OmstruckOrderMaterial">
+  <select id="getOldOrderMaterialMesByOrderId" parameterType="java.math.BigDecimal" resultType="java.util.Map">
       select OOM.ORDER_MATERIAL_WEIGHT "orderMaterialWeight",
              OOM.MATERIAL_ID "materialId",
              OOM.ORDER_MATERIAL_NUMBER "orderMaterialNumber"
@@ -298,5 +298,38 @@
       where OOM.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"
 
+    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>
+  </select>
 </mapper>

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

@@ -0,0 +1,774 @@
+<?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.TmstruckTimeTaskResultMapper">
+  <resultMap id="BaseResultMap" type="com.steerinfo.dil.model.TmstruckTimeTaskResult">
+    <id column="TIME_TASK_RESULT_ID" jdbcType="DECIMAL" property="timeTaskResultId" />
+    <result column="RESULT_TOTAL_ID" jdbcType="DECIMAL" property="resultTotalId" />
+    <result column="RESULT_VALUE" jdbcType="DECIMAL" property="resultValue" />
+    <result column="RESULT_UOM_ID" jdbcType="DECIMAL" property="resultUomId" />
+    <result column="RESULT_TIME_TYPE" jdbcType="DECIMAL" property="resultTimeType" />
+    <result column="RESULT_TIME" jdbcType="TIMESTAMP" property="resultTime" />
+    <result column="RESULT_START_NODE_ID" jdbcType="DECIMAL" property="resultStartNodeId" />
+    <result column="RESULT_START_LONGITUDE_VAL" jdbcType="VARCHAR" property="resultStartLongitudeVal" />
+    <result column="RESULT_START_LATITUDE_VAL" jdbcType="VARCHAR" property="resultStartLatitudeVal" />
+    <result column="RESULT_END_NODE_ID" jdbcType="DECIMAL" property="resultEndNodeId" />
+    <result column="RESULT_END_LONGITUDE_VAL" jdbcType="VARCHAR" property="resultEndLongitudeVal" />
+    <result column="RESULT_END_LATITUDE_VAL" jdbcType="VARCHAR" property="resultEndLatitudeVal" />
+    <result column="RESULT_MEMO" jdbcType="VARCHAR" property="resultMemo" />
+    <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="DELETE_NAME" jdbcType="VARCHAR" property="deleteName" />
+    <result column="DELETE_TIME" jdbcType="TIMESTAMP" property="deleteTime" />
+  </resultMap>
+  <sql id="columns">
+    TIME_TASK_RESULT_ID, RESULT_TOTAL_ID, RESULT_VALUE, RESULT_UOM_ID, RESULT_TIME_TYPE, 
+    RESULT_TIME, RESULT_START_NODE_ID, RESULT_START_LONGITUDE_VAL, RESULT_START_LATITUDE_VAL, 
+    RESULT_END_NODE_ID, RESULT_END_LONGITUDE_VAL, RESULT_END_LATITUDE_VAL, RESULT_MEMO, 
+    INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+    DELETE_NAME, DELETE_TIME
+  </sql>
+  <sql id="columns_alias">
+    t.TIME_TASK_RESULT_ID, t.RESULT_TOTAL_ID, t.RESULT_VALUE, t.RESULT_UOM_ID, t.RESULT_TIME_TYPE, 
+    t.RESULT_TIME, t.RESULT_START_NODE_ID, t.RESULT_START_LONGITUDE_VAL, t.RESULT_START_LATITUDE_VAL, 
+    t.RESULT_END_NODE_ID, t.RESULT_END_LONGITUDE_VAL, t.RESULT_END_LATITUDE_VAL, t.RESULT_MEMO, 
+    t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, 
+    t.DELETE_NAME, t.DELETE_TIME
+  </sql>
+  <sql id="select">
+    SELECT <include refid="columns"/> FROM TMSTRUCK_TIME_TASK_RESULT
+  </sql>
+  <sql id="select_alias">
+    SELECT <include refid="columns_alias"/> FROM TMSTRUCK_TIME_TASK_RESULT t
+  </sql>
+  <sql id="where">
+    <where> 
+      <if test="timeTaskResultId != null">
+        and TIME_TASK_RESULT_ID = #{timeTaskResultId}
+      </if>
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="resultValue != null">
+        and RESULT_VALUE = #{resultValue}
+      </if>
+      <if test="resultUomId != null">
+        and RESULT_UOM_ID = #{resultUomId}
+      </if>
+      <if test="resultTimeType != null">
+        and RESULT_TIME_TYPE = #{resultTimeType}
+      </if>
+      <if test="resultTime != null">
+        and TO_CHAR(RESULT_TIME,'yyyy-MM-dd') = #{resultTime}
+      </if>
+      <if test="resultStartNodeId != null">
+        and RESULT_START_NODE_ID = #{resultStartNodeId}
+      </if>
+      <if test="resultStartLongitudeVal != null and resultStartLongitudeVal != ''">
+        and RESULT_START_LONGITUDE_VAL = #{resultStartLongitudeVal}
+      </if>
+      <if test="resultStartLatitudeVal != null and resultStartLatitudeVal != ''">
+        and RESULT_START_LATITUDE_VAL = #{resultStartLatitudeVal}
+      </if>
+      <if test="resultEndNodeId != null">
+        and RESULT_END_NODE_ID = #{resultEndNodeId}
+      </if>
+      <if test="resultEndLongitudeVal != null and resultEndLongitudeVal != ''">
+        and RESULT_END_LONGITUDE_VAL = #{resultEndLongitudeVal}
+      </if>
+      <if test="resultEndLatitudeVal != null and resultEndLatitudeVal != ''">
+        and RESULT_END_LATITUDE_VAL = #{resultEndLatitudeVal}
+      </if>
+      <if test="resultMemo != null and resultMemo != ''">
+        and RESULT_MEMO = #{resultMemo}
+      </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="deleteName != null and deleteName != ''">
+        and DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+    </where>
+  </sql>
+  <sql id="whereLike">
+    <where> 
+      <if test="timeTaskResultId != null">
+        and TIME_TASK_RESULT_ID = #{timeTaskResultId}
+      </if>
+      <if test="resultTotalId != null">
+        and RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="resultValue != null">
+        and RESULT_VALUE = #{resultValue}
+      </if>
+      <if test="resultUomId != null">
+        and RESULT_UOM_ID = #{resultUomId}
+      </if>
+      <if test="resultTimeType != null">
+        and RESULT_TIME_TYPE = #{resultTimeType}
+      </if>
+      <if test="resultTime != null">
+        and TO_CHAR(RESULT_TIME,'yyyy-MM-dd') = #{resultTime}
+      </if>
+      <if test="resultStartNodeId != null">
+        and RESULT_START_NODE_ID = #{resultStartNodeId}
+      </if>
+      <if test="resultStartLongitudeVal != null and resultStartLongitudeVal != ''">
+        and RESULT_START_LONGITUDE_VAL LIKE '%${resultStartLongitudeVal}%'
+      </if>
+      <if test="resultStartLatitudeVal != null and resultStartLatitudeVal != ''">
+        and RESULT_START_LATITUDE_VAL LIKE '%${resultStartLatitudeVal}%'
+      </if>
+      <if test="resultEndNodeId != null">
+        and RESULT_END_NODE_ID = #{resultEndNodeId}
+      </if>
+      <if test="resultEndLongitudeVal != null and resultEndLongitudeVal != ''">
+        and RESULT_END_LONGITUDE_VAL LIKE '%${resultEndLongitudeVal}%'
+      </if>
+      <if test="resultEndLatitudeVal != null and resultEndLatitudeVal != ''">
+        and RESULT_END_LATITUDE_VAL LIKE '%${resultEndLatitudeVal}%'
+      </if>
+      <if test="resultMemo != null and resultMemo != ''">
+        and RESULT_MEMO LIKE '%${resultMemo}%'
+      </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="deleteName != null and deleteName != ''">
+        and DELETE_NAME LIKE '%${deleteName}%'
+      </if>
+      <if test="deleteTime != null">
+        and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+      </if>
+    </where>
+  </sql>
+  <delete id="deleteByPrimaryKey" parameterType="java.math.BigDecimal">
+    delete from TMSTRUCK_TIME_TASK_RESULT
+    where TIME_TASK_RESULT_ID = #{timeTaskResultId,jdbcType=DECIMAL}
+  </delete>
+  <delete id="deleteBySelectiveElement" parameterType="java.util.HashMap">
+    delete from TMSTRUCK_TIME_TASK_RESULT
+    where 1!=1 
+      <if test="resultTotalId != null">
+        or RESULT_TOTAL_ID = #{resultTotalId}
+      </if>
+      <if test="resultValue != null">
+        or RESULT_VALUE = #{resultValue}
+      </if>
+      <if test="resultUomId != null">
+        or RESULT_UOM_ID = #{resultUomId}
+      </if>
+      <if test="resultTimeType != null">
+        or RESULT_TIME_TYPE = #{resultTimeType}
+      </if>
+      <if test="resultTime != null">
+        or TO_CHAR(RESULT_TIME,'yyyy-MM-dd') = '#{resultTime}'
+      </if>
+      <if test="resultStartNodeId != null">
+        or RESULT_START_NODE_ID = #{resultStartNodeId}
+      </if>
+      <if test="resultStartLongitudeVal != null and resultStartLongitudeVal != ''">
+        or RESULT_START_LONGITUDE_VAL = #{resultStartLongitudeVal}
+      </if>
+      <if test="resultStartLatitudeVal != null and resultStartLatitudeVal != ''">
+        or RESULT_START_LATITUDE_VAL = #{resultStartLatitudeVal}
+      </if>
+      <if test="resultEndNodeId != null">
+        or RESULT_END_NODE_ID = #{resultEndNodeId}
+      </if>
+      <if test="resultEndLongitudeVal != null and resultEndLongitudeVal != ''">
+        or RESULT_END_LONGITUDE_VAL = #{resultEndLongitudeVal}
+      </if>
+      <if test="resultEndLatitudeVal != null and resultEndLatitudeVal != ''">
+        or RESULT_END_LATITUDE_VAL = #{resultEndLatitudeVal}
+      </if>
+      <if test="resultMemo != null and resultMemo != ''">
+        or RESULT_MEMO = #{resultMemo}
+      </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="deleteName != null and deleteName != ''">
+        or DELETE_NAME = #{deleteName}
+      </if>
+      <if test="deleteTime != null">
+        or TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = '#{deleteTime}'
+      </if>
+  </delete>
+  <insert id="insert" parameterType="com.steerinfo.dil.model.TmstruckTimeTaskResult">
+    insert into TMSTRUCK_TIME_TASK_RESULT (TIME_TASK_RESULT_ID, RESULT_TOTAL_ID, 
+      RESULT_VALUE, RESULT_UOM_ID, RESULT_TIME_TYPE, 
+      RESULT_TIME, RESULT_START_NODE_ID, RESULT_START_LONGITUDE_VAL, 
+      RESULT_START_LATITUDE_VAL, RESULT_END_NODE_ID, 
+      RESULT_END_LONGITUDE_VAL, RESULT_END_LATITUDE_VAL, 
+      RESULT_MEMO, INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
+      DELETE_NAME, DELETE_TIME)
+    values (#{timeTaskResultId,jdbcType=DECIMAL}, #{resultTotalId,jdbcType=DECIMAL}, 
+      #{resultValue,jdbcType=DECIMAL}, #{resultUomId,jdbcType=DECIMAL}, #{resultTimeType,jdbcType=DECIMAL}, 
+      #{resultTime,jdbcType=TIMESTAMP}, #{resultStartNodeId,jdbcType=DECIMAL}, #{resultStartLongitudeVal,jdbcType=VARCHAR}, 
+      #{resultStartLatitudeVal,jdbcType=VARCHAR}, #{resultEndNodeId,jdbcType=DECIMAL}, 
+      #{resultEndLongitudeVal,jdbcType=VARCHAR}, #{resultEndLatitudeVal,jdbcType=VARCHAR}, 
+      #{resultMemo,jdbcType=VARCHAR}, #{insertUsername,jdbcType=VARCHAR}, #{insertTime,jdbcType=TIMESTAMP}, 
+      #{updateUsername,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, #{insertUpdateRemark,jdbcType=VARCHAR}, 
+      #{deleteName,jdbcType=VARCHAR}, #{deleteTime,jdbcType=TIMESTAMP})
+  </insert>
+  <insert id="insertSelective" parameterType="com.steerinfo.dil.model.TmstruckTimeTaskResult">
+    insert into TMSTRUCK_TIME_TASK_RESULT
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="timeTaskResultId != null">
+        TIME_TASK_RESULT_ID,
+      </if>
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID,
+      </if>
+      <if test="resultValue != null">
+        RESULT_VALUE,
+      </if>
+      <if test="resultUomId != null">
+        RESULT_UOM_ID,
+      </if>
+      <if test="resultTimeType != null">
+        RESULT_TIME_TYPE,
+      </if>
+      <if test="resultTime != null">
+        RESULT_TIME,
+      </if>
+      <if test="resultStartNodeId != null">
+        RESULT_START_NODE_ID,
+      </if>
+      <if test="resultStartLongitudeVal != null">
+        RESULT_START_LONGITUDE_VAL,
+      </if>
+      <if test="resultStartLatitudeVal != null">
+        RESULT_START_LATITUDE_VAL,
+      </if>
+      <if test="resultEndNodeId != null">
+        RESULT_END_NODE_ID,
+      </if>
+      <if test="resultEndLongitudeVal != null">
+        RESULT_END_LONGITUDE_VAL,
+      </if>
+      <if test="resultEndLatitudeVal != null">
+        RESULT_END_LATITUDE_VAL,
+      </if>
+      <if test="resultMemo != null">
+        RESULT_MEMO,
+      </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="deleteName != null">
+        DELETE_NAME,
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="timeTaskResultId != null">
+        #{timeTaskResultId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTotalId != null">
+        #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultValue != null">
+        #{resultValue,jdbcType=DECIMAL},
+      </if>
+      <if test="resultUomId != null">
+        #{resultUomId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTimeType != null">
+        #{resultTimeType,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTime != null">
+        #{resultTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultStartNodeId != null">
+        #{resultStartNodeId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultStartLongitudeVal != null">
+        #{resultStartLongitudeVal,jdbcType=VARCHAR},
+      </if>
+      <if test="resultStartLatitudeVal != null">
+        #{resultStartLatitudeVal,jdbcType=VARCHAR},
+      </if>
+      <if test="resultEndNodeId != null">
+        #{resultEndNodeId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultEndLongitudeVal != null">
+        #{resultEndLongitudeVal,jdbcType=VARCHAR},
+      </if>
+      <if test="resultEndLatitudeVal != null">
+        #{resultEndLatitudeVal,jdbcType=VARCHAR},
+      </if>
+      <if test="resultMemo != null">
+        #{resultMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+    </trim>
+  </insert>
+  <update id="updateByPrimaryKey" parameterType="com.steerinfo.dil.model.TmstruckTimeTaskResult">
+    update TMSTRUCK_TIME_TASK_RESULT
+    set RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+      RESULT_VALUE = #{resultValue,jdbcType=DECIMAL},
+      RESULT_UOM_ID = #{resultUomId,jdbcType=DECIMAL},
+      RESULT_TIME_TYPE = #{resultTimeType,jdbcType=DECIMAL},
+      RESULT_TIME = #{resultTime,jdbcType=TIMESTAMP},
+      RESULT_START_NODE_ID = #{resultStartNodeId,jdbcType=DECIMAL},
+      RESULT_START_LONGITUDE_VAL = #{resultStartLongitudeVal,jdbcType=VARCHAR},
+      RESULT_START_LATITUDE_VAL = #{resultStartLatitudeVal,jdbcType=VARCHAR},
+      RESULT_END_NODE_ID = #{resultEndNodeId,jdbcType=DECIMAL},
+      RESULT_END_LONGITUDE_VAL = #{resultEndLongitudeVal,jdbcType=VARCHAR},
+      RESULT_END_LATITUDE_VAL = #{resultEndLatitudeVal,jdbcType=VARCHAR},
+      RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
+      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},
+      DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP}
+    where TIME_TASK_RESULT_ID = #{timeTaskResultId,jdbcType=DECIMAL}
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.steerinfo.dil.model.TmstruckTimeTaskResult">
+    update TMSTRUCK_TIME_TASK_RESULT
+    <set>
+      <if test="resultTotalId != null">
+        RESULT_TOTAL_ID = #{resultTotalId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultValue != null">
+        RESULT_VALUE = #{resultValue,jdbcType=DECIMAL},
+      </if>
+      <if test="resultUomId != null">
+        RESULT_UOM_ID = #{resultUomId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTimeType != null">
+        RESULT_TIME_TYPE = #{resultTimeType,jdbcType=DECIMAL},
+      </if>
+      <if test="resultTime != null">
+        RESULT_TIME = #{resultTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="resultStartNodeId != null">
+        RESULT_START_NODE_ID = #{resultStartNodeId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultStartLongitudeVal != null">
+        RESULT_START_LONGITUDE_VAL = #{resultStartLongitudeVal,jdbcType=VARCHAR},
+      </if>
+      <if test="resultStartLatitudeVal != null">
+        RESULT_START_LATITUDE_VAL = #{resultStartLatitudeVal,jdbcType=VARCHAR},
+      </if>
+      <if test="resultEndNodeId != null">
+        RESULT_END_NODE_ID = #{resultEndNodeId,jdbcType=DECIMAL},
+      </if>
+      <if test="resultEndLongitudeVal != null">
+        RESULT_END_LONGITUDE_VAL = #{resultEndLongitudeVal,jdbcType=VARCHAR},
+      </if>
+      <if test="resultEndLatitudeVal != null">
+        RESULT_END_LATITUDE_VAL = #{resultEndLatitudeVal,jdbcType=VARCHAR},
+      </if>
+      <if test="resultMemo != null">
+        RESULT_MEMO = #{resultMemo,jdbcType=VARCHAR},
+      </if>
+      <if test="insertUsername != null">
+        INSERT_USERNAME = #{insertUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="insertTime != null">
+        INSERT_TIME = #{insertTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updateUsername != null">
+        UPDATE_USERNAME = #{updateUsername,jdbcType=VARCHAR},
+      </if>
+      <if test="updateTime != null">
+        UPDATE_TIME = #{updateTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="insertUpdateRemark != null">
+        INSERT_UPDATE_REMARK = #{insertUpdateRemark,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteName != null">
+        DELETE_NAME = #{deleteName,jdbcType=VARCHAR},
+      </if>
+      <if test="deleteTime != null">
+        DELETE_TIME = #{deleteTime,jdbcType=TIMESTAMP},
+      </if>
+    </set>
+    where TIME_TASK_RESULT_ID = #{timeTaskResultId,jdbcType=DECIMAL}
+  </update>
+  <select id="selectByPrimaryKey" parameterType="java.math.BigDecimal" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where TIME_TASK_RESULT_ID = #{timeTaskResultId,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 TMSTRUCK_TIME_TASK_RESULT 
+      (TIME_TASK_RESULT_ID, 
+      RESULT_TOTAL_ID, RESULT_VALUE, RESULT_UOM_ID, 
+      RESULT_TIME_TYPE, RESULT_TIME, 
+      RESULT_START_NODE_ID, RESULT_START_LONGITUDE_VAL, 
+      RESULT_START_LATITUDE_VAL, RESULT_END_NODE_ID, 
+      RESULT_END_LONGITUDE_VAL, RESULT_END_LATITUDE_VAL, 
+      RESULT_MEMO, INSERT_USERNAME, INSERT_TIME, 
+      UPDATE_USERNAME, UPDATE_TIME, 
+      INSERT_UPDATE_REMARK, DELETE_NAME, 
+      DELETE_TIME)
+    ( <foreach collection="list" item="item" separator="union all"> 
+   select  
+      #{item.timeTaskResultId,jdbcType=DECIMAL}, 
+      #{item.resultTotalId,jdbcType=DECIMAL}, #{item.resultValue,jdbcType=DECIMAL}, #{item.resultUomId,jdbcType=DECIMAL}, 
+      #{item.resultTimeType,jdbcType=DECIMAL}, #{item.resultTime,jdbcType=TIMESTAMP}, 
+      #{item.resultStartNodeId,jdbcType=DECIMAL}, #{item.resultStartLongitudeVal,jdbcType=VARCHAR}, 
+      #{item.resultStartLatitudeVal,jdbcType=VARCHAR}, #{item.resultEndNodeId,jdbcType=DECIMAL}, 
+      #{item.resultEndLongitudeVal,jdbcType=VARCHAR}, #{item.resultEndLatitudeVal,jdbcType=VARCHAR}, 
+      #{item.resultMemo,jdbcType=VARCHAR}, #{item.insertUsername,jdbcType=VARCHAR}, #{item.insertTime,jdbcType=TIMESTAMP}, 
+      #{item.updateUsername,jdbcType=VARCHAR}, #{item.updateTime,jdbcType=TIMESTAMP}, 
+      #{item.insertUpdateRemark,jdbcType=VARCHAR}, #{item.deleteName,jdbcType=VARCHAR}, 
+      #{item.deleteTime,jdbcType=TIMESTAMP} from dual  
+   </foreach> )
+  </insert>
+  <update id="batchUpdate" parameterType="java.util.List">
+     update TMSTRUCK_TIME_TASK_RESULT
+     set
+       TIME_TASK_RESULT_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.timeTaskResultId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TOTAL_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultTotalId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_VALUE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultValue,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_UOM_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultUomId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TIME_TYPE=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultTimeType,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,RESULT_START_NODE_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultStartNodeId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_START_LONGITUDE_VAL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultStartLongitudeVal,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_START_LATITUDE_VAL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultStartLatitudeVal,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_END_NODE_ID=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultEndNodeId,jdbcType=DECIMAL}
+       </foreach>
+       ,RESULT_END_LONGITUDE_VAL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultEndLongitudeVal,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_END_LATITUDE_VAL=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultEndLatitudeVal,jdbcType=VARCHAR}
+       </foreach>
+       ,RESULT_MEMO=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.resultMemo,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.insertUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,INSERT_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.insertTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,UPDATE_USERNAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.updateUsername,jdbcType=VARCHAR}
+       </foreach>
+       ,UPDATE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.updateTime,jdbcType=TIMESTAMP}
+       </foreach>
+       ,INSERT_UPDATE_REMARK=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.insertUpdateRemark,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_NAME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.deleteName,jdbcType=VARCHAR}
+       </foreach>
+       ,DELETE_TIME=
+       <foreach collection="list" item="item" index="index" separator=" " open="case TIME_TASK_RESULT_ID" close="end">
+          when #{item.timeTaskResultId,jdbcType=DECIMAL} then #{item.deleteTime,jdbcType=TIMESTAMP}
+       </foreach>
+     where TIME_TASK_RESULT_ID in 
+     <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
+    #{item.timeTaskResultId,jdbcType=DECIMAL}
+     </foreach> 
+  </update>
+  <delete id="batchDelete" parameterType="java.util.List">
+    delete from TMSTRUCK_TIME_TASK_RESULT
+    where TIME_TASK_RESULT_ID in 
+    <foreach collection="list" item="id" open="(" close=")" separator=",">
+      #{id}
+    </foreach>
+  </delete>
+  <!-- 友情提示！！！-->
+  <!-- 请将自己写的代码放在此标签之下，方便以后粘贴复制。-->
+
+<!--  通过运输订单号查询总实绩ID -->
+  <select id="getResultTotalIdByOrderNum" resultType="java.util.Map">
+    SELECT TTR.RESULT_TOTAL_ID "resultTotalId"
+    FROM OMSTRUCK_ORDER OO
+    LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+    ON TTR.ORDER_ID = OO.ORDER_ID
+    WHERE OO.ORDER_NUMBER = #{orderNumber}
+  </select>
+
+
+  <!--  查询上一次结束时间 -->
+  <select id="getLastTimeout" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+    select *
+    from(
+        SELECT TTTR.RESULT_TIME "resultTime"
+        FROM TMSTRUCK_TIME_TASK_RESULT TTTR
+        WHERE TTTR.RESULT_TOTAL_ID = #{resultTotalId}
+          AND TTTR.RESULT_TIME_TYPE = 5
+        ORDER BY "resultTime" DESC
+        )
+    where rownum = 1
+  </select>
+
+<!--  查询用车单位确认开始时间-->
+  <select id="getStartTime" parameterType="java.math.BigDecimal" resultType="java.util.Map">
+    SELECT TTTR.RESULT_TIME "resultTime"
+    FROM TMSTRUCK_TIME_TASK_RESULT TTTR
+    WHERE TTTR.RESULT_TOTAL_ID = #{resultTotalId}
+      AND TTTR.RESULT_TIME_TYPE = 0
+  </select>
+
+<!--  查询所有确认暂停结束时间-->
+  <select id="getAllTimeout" resultType="java.util.Map">
+    SELECT TTTR.RESULT_VALUE "resultValue"
+    FROM TMSTRUCK_TIME_TASK_RESULT TTTR
+    WHERE TTTR.RESULT_TOTAL_ID = #{resultTotalId}
+      AND TTTR.RESULT_TIME_TYPE = 7
+  </select>
+
+  <!--  通过签收时间排序 -->
+  <sql id="orderBy">
+    <if test="orderField != null and orderField != ''">
+      order by "${orderField}"
+      <if test="orderType != null and orderType != ''">
+        ${orderType}
+      </if>
+    </if>
+    <if test="orderField == null  ">
+      order by "insertTime" desc
+    </if>
+  </sql>
+
+  <!-- 查询计时作业 -->
+  <select id="getAllTimeTaskResult" resultType="java.util.Map">
+    SELECT *
+    FROM (
+           SELECT OO.ORDER_NUMBER "orderNumber",
+                  RC.CAPACITY_NUMBER "capacityNumber",
+                  RCD.DRIVER_NAME "driverName",
+                  RCT.CAPACITY_TYPE_NAME "capacityTypeName",
+                  RM.MATERIAL_NAME "materialName",
+                  RS.SHIPPER_NAME "shipperName",
+                  (
+                      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",
+                  TTTR.RESULT_TIME "endTime",
+                  TTTR.RESULT_VALUE "timingTime",
+                  (
+                      SELECT FLOOR (SUM(TTTR3.RESULT_VALUE) / 60000)
+                      FROM TMSTRUCK_TIME_TASK_RESULT TTTR3
+                      WHERE TTTR3.RESULT_TIME_TYPE = 7
+                        AND TTTR3.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                    ) "allTimeout"
+
+           FROM TMSTRUCK_TIME_TASK_RESULT TTTR
+                  LEFT JOIN TMSTRUCK_TOTAL_RESULT TTR
+                            ON TTR.RESULT_TOTAL_ID = TTTR.RESULT_TOTAL_ID
+                  LEFT JOIN OMSTRUCK_ORDER OO
+                            ON OO.ORDER_ID = TTR.ORDER_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 AMSTRUCK_INWARD_PLAN AIP
+                            ON AIP.PLAN_ID = OO.ORDER_PLAN_ID AND OO.ORDER_TYPE = 4
+                  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_DRIVER_CAPACITY RDC
+                            ON RDC.DRIVER_CAPACITY_ID = OO.DRIVER_CAPACITY_ID
+                  LEFT JOIN RMS_CAPACITY RC
+                            ON RC.CAPACITY_ID = RDC.CAPACITY_ID
+                  LEFT JOIN RMS_CAR_DRIVER RCD
+                            ON RCD.DRIVER_ID = RDC.DRIVER_ID
+                  LEFT JOIN RMS_CAPACITY_TYPE RCT
+                            ON RCT.CAPACITY_TYPE_ID = RC.CAPACITY_TYPE_ID
+                  WHERE RESULT_TIME_TYPE = 3
+        )
+    <where>
+      <if test="orderNumber != null">
+        <foreach collection="orderNumber" item="item" open="(" separator="or" close=")">
+          "orderNumber" 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>
+      <if test="capacityTypeName != null">
+        and
+        <foreach collection="capacityTypeName" item="item" open="(" separator="or" close=")">
+          "capacityTypeName" 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="shipperName != null">
+        and
+        <foreach collection="shipperName" item="item" open="(" separator="or" close=")">
+          "shipperName" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="startTime != null">
+        and
+        <foreach collection="startTime" item="item" open="(" separator="or" close=")">
+          "startTime" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="endTime != null">
+        and
+        <foreach collection="endTime" item="item" open="(" separator="or" close=")">
+          "endTime" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="timingTime != null">
+        and
+        <foreach collection="timingTime" item="item" open="(" separator="or" close=")">
+          "timingTime" like '%${item}%'
+        </foreach>
+      </if>
+      <if test="allTimeout != null">
+        and
+        <foreach collection="allTimeout" item="item" open="(" separator="or" close=")">
+          "allTimeout" like '%${item}%'
+        </foreach>
+      </if>
+    </where>
+  </select>
+</mapper>

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

@@ -587,6 +587,7 @@
     <!--  通过运输订单号 查询实绩Id、总实绩ID -->
     <select id="selectTotalIdByOrderNo" parameterType="java.lang.String" resultType="java.util.Map">
         select OO.ORDER_ID         "orderId",
+               OO.ORDER_TYPE       "orderTypee",
                TUR.RESULT_ID       "resultId",
                TTR.RESULT_TOTAL_ID "resultTotalId"
         from OMSTRUCK_ORDER OO

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

@@ -655,23 +655,23 @@
   </select>
 
   <!--  查询所有的计皮实绩  -->
-  <select id="getAllJiPiResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
+    <select id="getAllJiPiResult" parameterType="java.util.Map" resultType="java.util.LinkedHashMap">
     select *
     from (
-    select
-    TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
-    APO.PURCHASE_ORDER_NO        "purchaseOrderNo",
-    RM.MATERIAL_NAME             "materialName",
-    OO.ORDER_NUMBER              "orderNumber",
-    RC.CAPACITY_NUMBER           "capacityNumber",
-    RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
-    TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
-    TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
-    DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
-    TWR.RESULT_TARE_WEIGHT       "resultTareWeight",
-    TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
-    TWR.RESULT_NET_WEIGHT        "resultNetWeight",
-    TWR.RESULT_POUND_NO          "resultPoundNo"
+      select
+      TWR.WEIGHT_TASK_RESULT_ID    "weightTaskResultId",
+      APO.PURCHASE_ORDER_NO        "purchaseOrderNo",
+      RM.MATERIAL_NAME             "materialName",
+      OO.ORDER_NUMBER              "orderNumber",
+      RC.CAPACITY_NUMBER           "capacityNumber",
+      RTC.TRUCK_CALCULATE_NUMBER   "truckCalculateNumber",
+      TWR.RESULT_GROSS_WEIGHT      "resultGrossWeight",
+      TWR.RESULT_GROSS_WEIGHT_TIME "resultGrossWeightTime",
+      DB.RESULT_FOREIGN_SHIP_NAME  "resultForeignShipName",
+      TWR.RESULT_TARE_WEIGHT       "resultTareWeight",
+      TWR.RESULT_TARE_WEIGHT_TIME  "resultTareWeightTime",
+      TWR.RESULT_NET_WEIGHT        "resultNetWeight",
+      TWR.RESULT_POUND_NO          "resultPoundNo"
     from TMSTRUCK_WEIGHT_RESULT TWR
     left join TMSTRUCK_TOTAL_RESULT TTR
     on TWR.RESULT_TOTAL_ID = TTR.RESULT_TOTAL_ID
@@ -784,4 +784,15 @@
     on RMS.MATERIAL_ID = RM.MATERIAL_ID
     where OO.ORDER_ID = #{orderId}
   </select>
+
+<!-- 通过物资ID查询可计量的汽车衡 -->
+    <select id="getCalculateIdByMaterial" parameterType="java.math.BigDecimal" resultType="java.lang.Integer">
+      select  RTC.TRUCK_CALCULATE_ID
+      from RMS_MATERIAL RM
+      left join RMS_TRUCK_CALCULATE_MATERIAL RTCM
+      on RM.MATERIAL_TYPE_ID = RTCM.MATERIAL_TYPE_ID
+      join RMS_TRUCK_CALCULATE RTC
+      on RTC.TRUCK_CALCULATE_ID = RTCM.TRUCK_CALCULATE_ID and RTC.TRUCK_CALCULATE_STATUS = 0
+      where RM.MATERIAL_ID = #{materialId}
+    </select>
 </mapper>

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

@@ -0,0 +1,45 @@
+<?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.UtilsMapper">
+
+
+    <!--  通过运力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="updateOrderStatusByOrderIdOrNum" parameterType="java.util.Map">
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_STATUS = #{orderStatus}
+        where
+        <if test="orderId != null">
+            OO.ORDER_ID = #{orderId}
+        </if>
+        <if test="orderNumber != null">
+        and  OO.ORDER_NUMBER = #{orderNumber}
+        </if>
+    </update>
+
+<!--  通过运输Id 或者运输订单号修改 路段顺序号  -->
+    <update id="updateLineSeqByOrderIdOrNum" parameterType="java.util.Map">
+        update OMSTRUCK_ORDER OO
+        set OO.ORDER_LINE_SEQUENCE = #{orderLineSequence}
+        where
+        <if test="orderId != null">
+            OO.ORDER_ID = #{orderId}
+        </if>
+        <if test="orderNumber != null">
+            and  OO.ORDER_NUMBER = #{orderNumber}
+        </if>
+    </update>
+
+</mapper>