修改

.gitignore

@@ -0,0 +1,33 @@
+target/
+*.iml
+.idea/
+rebel.xml
+.rebel.xml.bak
+out/artifacts/
+dil-api.iml
+src/test
+pom.xml
+src/main/resources/application-dev2.yml
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*

README.md

@@ -0,0 +1,6 @@
+# ANTAI-TMS-API
+
+#### 介绍
+运输管理系统；包括采购、生产、销售物流模块的派车；运输订单查询；计时、计次、计重等运输执行新增修改；厂内运输执行实绩与大宗的同步接口；吊车自动派车等。
+#### 软件架构
+springboot、mybatis、oracle；

src/main/java/com/steerinfo/DilApplicationMain.java

@@ -0,0 +1,34 @@
+package com.steerinfo;
+
+import feign.Retryer;
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.web.servlet.ServletComponentScan;
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/4/21 14:32
+ * @Version 1.0
+ */
+@SpringBootApplication
+@ServletComponentScan
+@EnableScheduling
+@MapperScan({"com.steerinfo.dil.mapper"})
+@EnableFeignClients(basePackages = "com.steerinfo.dil.feign")
+@EnableDiscoveryClient
+public class DilApplicationMain {
+    public static void main(String[] args) {
+        SpringApplication.run(DilApplicationMain.class,args);
+    }
+    @Bean
+    public Retryer feignRetryer() {
+        // 这里使用一个永不重试的Retryer
+        return Retryer.NEVER_RETRY;
+    }
+}

src/main/java/com/steerinfo/dil/config/AsyncConfiguration.java

@@ -0,0 +1,35 @@
+package com.steerinfo.dil.config;
+
+import io.swagger.annotations.Api;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
+
+@Configuration
+@EnableAsync
+@Api("多线程配置")
+public class AsyncConfiguration {
+    @Bean("doSomethingExecutor")
+    public Executor doSomeThingExecutor(){
+        ThreadPoolTaskExecutor executor=new ThreadPoolTaskExecutor();
+        //创建时候线程数量
+        executor.setCorePoolSize(10);
+        //最大时候的线程数量
+        executor.setMaxPoolSize(20);
+        //缓冲队列：用来缓冲执行任务的队列
+        executor.setQueueCapacity(500);
+        //允许线程空闲时间
+        executor.setKeepAliveSeconds(60);
+        //线程池前缀
+        executor.setThreadNamePrefix("do-something-");
+        //缓冲队列满了之后的拒绝策略
+        // 缓冲队列满了之后的拒绝策略：由调用线程处理（一般是主线程）
+        executor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardPolicy());
+        executor.initialize();
+        return executor;
+    }
+}

src/main/java/com/steerinfo/dil/config/CorsConfig1.java

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+/**
+ *
+ */
+@Configuration
+public class CorsConfig1 implements WebMvcConfigurer {
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowedMethods("GET","HEAD","POST","PUT","DELETE","OPTIONS")
+                .allowCredentials(true)
+                .maxAge(3600)
+                .allowedHeaders("*");
+    }
+}

src/main/java/com/steerinfo/dil/config/WebExceptionHandler.java

@@ -0,0 +1,24 @@
+package com.steerinfo.dil.config;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.apache.log4j.Logger;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@ControllerAdvice
+public class WebExceptionHandler {
+
+    static final Logger log = Logger.getLogger(WebExceptionHandler.class);
+
+    @ExceptionHandler(value =Exception.class)
+    @ResponseBody
+    public RESTfulResult exceptionHandler(Exception e){
+        log.error("全局异常捕获:"+e.getMessage());
+        e.printStackTrace();
+        if(e instanceof NullPointerException){
+            return new RESTfulResult("500", "操作失败：缺乏必要参数！", e);
+        }
+        return new RESTfulResult("500", "操作失败:"+e.getMessage(), e);
+    }
+}

src/main/java/com/steerinfo/dil/config/WebSocketConfig.java

@@ -0,0 +1,56 @@
+package com.steerinfo.dil.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.ChannelRegistration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+@Configuration
+@EnableWebSocketMessageBroker
+public class WebSocketConfig implements WebSocketMessageBrokerConfigurer {
+
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry stompEndpointRegistry) {
+//        stompEndpointRegistry
+//                .addEndpoint("/webSocket")
+//                .setAllowedOrigins("*");
+//                .withSockJS(); //使用sockJS
+
+//        stompEndpointRegistry
+//                .addEndpoint("/event-websocket-app")
+//                .setAllowedOrigins("*");
+        stompEndpointRegistry.addEndpoint("/event-websocket").setAllowedOrigins("*").withSockJS();
+
+    }
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry registry) {
+        //这里使用的是内存模式，生产环境可以使用rabbitmq或者其他mq。
+        //这里注册两个，主要是目的是将广播和队列分开。
+        //registry.enableStompBrokerRelay().setRelayHost().setRelayPort() 其他方式
+        registry.enableSimpleBroker("/topic");
+        //设置客户端前缀 即@MessageMapping
+        registry.setApplicationDestinationPrefixes("/app");
+        //点对点发送前缀
+        registry.setUserDestinationPrefix("/user");
+    }
+
+    /**
+     * 输入通道参数配置
+     *
+     * @param registration
+     */
+    @Override
+    public void configureClientInboundChannel(ChannelRegistration registration) {
+    }
+
+
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter(){
+        return new ServerEndpointExporter();
+    }
+}

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

@@ -0,0 +1,855 @@
+package com.steerinfo.dil.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.config.WebExceptionHandler;
+import com.steerinfo.dil.feign.DzFeign;
+import com.steerinfo.dil.feign.ReportFeign;
+import com.steerinfo.dil.mapper.*;
+import com.steerinfo.dil.model.*;
+import com.steerinfo.dil.service.impl.OmsTransOrderServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DaZongUtil;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.SneakyThrows;
+import oracle.jdbc.proxy.annotation.Post;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.logging.SimpleFormatter;
+
+/**
+ * OmsTransOrder RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-11-02 02:31
+ * 类描述
+ * 修订历史：
+ * 日期：2023-11-02
+ * 作者：generator
+ * 参考：
+ * 描述：OmsTransOrder RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/omstransorders")
+public class OmsTransOrderController extends BaseRESTfulController {
+    static final Logger log = Logger.getLogger(OmsTransOrderController.class);
+
+    @Autowired
+    OmsTransOrderServiceImpl omsTransOrderService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @Autowired
+    OmsTransOrderMapper omsTransOrderMapper;
+
+    @Autowired
+    SyncProductListMapper syncProductListMapper;
+
+    @Autowired
+    DzFeign dzFeign;
+
+    @Autowired
+    ReportFeign   reportFeign;
+
+    @Autowired
+    DaZongUtil daZongUtil;
+
+    @Autowired
+    CommonMapper commonMapper;
+
+    @Autowired
+    AmsTransRequirementMapper amsTransRequirementMapper;
+
+    @Autowired
+    AmsRequirementChildMapper amsRequirementChildMapper;
+
+
+
+    @ApiOperation(value="派单接口", notes="根据lineId、planChildId、capacityId来新增运输订单")
+    @PostMapping("/dispatchOrder")
+    public RESTfulResult dispatchOrder(@RequestBody Map<String,Object> map){
+        try{
+            String result = omsTransOrderService.dispatchOrder(map);
+            return success(map,result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value="批量派单接口", notes="根据lineId、planChildId、capacityId来新增运输订单")
+    @PostMapping("/batchDispatch")
+    public RESTfulResult batchDispatch(@RequestBody Map<String,Object> map){
+        try{
+            String result = omsTransOrderService.batchDispatch(map);
+            return success(map.get("list"),result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(e.getMessage(),"操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value="批量派单接口", notes="根据lineId、planChildId、capacityId来新增运输订单")
+    @PostMapping("/batchDispatchSc")
+    public RESTfulResult batchDispatchSc(@RequestBody Map<String,Object> map){
+        try{
+            String result = omsTransOrderService.batchDispatchSc(map);
+            return success(map.get("list"),result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(e.getMessage(),"操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+
+    @ApiOperation(value="修改运输订单", notes="仅允许修改司机、车号、运输路线")
+    @PostMapping("/updateTransOrder")
+    public RESTfulResult updateTransOrder(@RequestBody Map<String,Object> map){
+        try{
+            String result = omsTransOrderService.updateTransOrder(map);
+            return success(map,result);
+        }catch (IndexOutOfBoundsException e){
+            e.printStackTrace();
+            return failed(map,"操作失败，无法迁移实绩到目标线路！");
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(map,"操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(map,e.getMessage());
+        }
+    }
+
+
+    @ApiOperation(value="合并运输订单", notes="list , lineId")
+    @PostMapping("/mergeTransOrder")
+    public RESTfulResult mergeTransOrder(@RequestBody Map<String,Object> map){
+        try{
+            String result = omsTransOrderService.mergeTransOrder(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(e.getMessage(),"操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "查询运输订单")
+    @PostMapping("/getTransOrderList")
+    public RESTfulResult getTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        if("app".equals(map.get("terminalCode"))) {
+            pageSize = 100;
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = omsTransOrderService.getTransOrderList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+
+    @ApiOperation(value="接单接口", notes="根据lineId、planChildId、capacityId来新增运输订单")
+    @PostMapping("/receiptOrder")
+    public RESTfulResult receiptOrder(@RequestBody Map<String,Object> map){
+        try{
+            String result = omsTransOrderService.receiptOrder(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(e.getMessage(),"操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getStackTrace(),e.getMessage());
+        }
+    }
+
+
+    @ApiOperation(value="修改运输订单状态", notes="")
+    @PostMapping("/changeTransOrder")
+    public RESTfulResult changeTransOrder(@RequestBody Map<String,Object> map){
+        try{
+            String result = omsTransOrderService.changeTransOrder(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value="火运大宗销售订单 删除销售运输订单", notes="")
+    @PostMapping("/changeTransOrderH")
+    public RESTfulResult changeSaleTransOrderH(@RequestBody Map<String,Object> map){
+        try{
+            String result = omsTransOrderService.changeTransOrderH(map);
+            if (!result.equals("OK")){
+                return failed(null, "500", "运单删除失败！");
+            }
+            return success(map);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value="删除销售运输订单", notes="")
+    @PostMapping("/changeSaleTransOrder")
+    public RESTfulResult changeSaleTransOrder(@RequestBody Map<String,Object> map){
+        try{
+
+//            Integer integer = omsTransOrderService.selectDlivDirnoSeqCount(map.get("dlivDirnoSeq").toString());
+//            if (integer > 0) {
+//                return failed("派车单已装车，删除失败！","派车单已装车，删除失败！");
+//            }
+            String result = omsTransOrderService.changeTransOrder(map);
+            if (!result.equals("OK")){
+                return failed(null, "500", "运单删除失败！");
+            }
+//            String dlivDirnoSeq = omsTransOrderService.deleteSlmDlivDirListByDlivDirnoSeq(map.get("dlivDirnoSeq").toString());
+//            if (!dlivDirnoSeq.equals("OK")) {
+//                return failed(null, "500", "WMS中派车单删除失败！");
+//            }
+            return success(map);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value="关闭计划底下所有运输订单", notes="关闭未接收运输订单")
+    @PostMapping("/closeTransOrderByPlan")
+    public RESTfulResult closeTransOrderByPlan(@RequestBody Map<String,Object> map){
+        try{
+            String result = omsTransOrderService.closeTransOrderByPlan(map);
+            return success(map,result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "查询运输订单所有运输实绩")
+    @PostMapping("/getTransResult")
+    public RESTfulResult getTransResult(@RequestBody(required = false) Map<String, Object> map) {
+        try{
+            List<Map<String,Object>> list = omsTransOrderService.getTransResult(map);
+            return success(list,"查询成功！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+
+    @ApiOperation(value="销售派单接口", notes="根据lineId、planChildId、capacityId来新增运输订单")
+    @PostMapping("/saleDispatchOrder")
+    public RESTfulResult saleDispatchOrder(@RequestBody Map<String,Object> map){
+        try{
+            int max = 1;
+            List<Map<String, Object>> planChildren = (ArrayList) map.get("children");
+            for (Map<String, Object> planChild : planChildren) {
+                planChild.put("dlivDirnoSeq", omsTransOrderService.selectMax(max));
+                max++;
+            }
+            String result = omsTransOrderService.saleDispatchOrder(map);
+            return success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value="批量销售派单接口", notes="根据lineId、planChildId、capacityId来新增运输订单")
+    @PostMapping("/saleDispatchOrderList")
+    public RESTfulResult saleDispatchOrderList(@RequestBody Map<String,Object> map){
+        try{
+            String result = omsTransOrderService.saleDispatchOrderList(map);
+            return success(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "查询销售运输订单")
+    @PostMapping("/getSaleTransOrderList")
+    public RESTfulResult getSaleTransOrderList(@RequestBody(required = false) Map<String, Object> map,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> list = omsTransOrderService.getSaleTransOrderList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+    @ApiOperation(value = "查询厂内车辆数")
+    @PostMapping("/getCountEnfactory")
+    public RESTfulResult getCountEnfactory(@RequestBody(required = false) Map<String, Object> map) {
+        return success(omsTransOrderService.getCountEnfactory(map));
+
+    }
+
+
+
+    @ApiOperation(value = "查询司机运输汇总")
+    @PostMapping("/getDriverTotalResult")
+    public RESTfulResult getDriverTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize) {
+        DataChange.getMonthStartEnd(map);
+        if(map.containsKey("noPage")) {
+            return  success(omsTransOrderService.getDriverTotalResult(map));
+        }else{
+            PageHelper.startPage(pageNum, pageSize);
+            //分页查询数据
+            List<Map<String, Object>> list = omsTransOrderService.getDriverTotalResult(map);
+            PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+            return success(pageList);
+        }
+    }
+
+    @ApiOperation(value = "查询车辆运输汇总")
+    @PostMapping("/getCapacityTotalResult")
+    public RESTfulResult getCapacityTotalResult(@RequestBody(required = false) Map<String, Object> map,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize) {
+        DataChange.getMonthStartEnd(map);
+        if(map.containsKey("noPage")) {
+            return  success(omsTransOrderService.getCapacityTotalResult(map));
+        }else{
+            PageHelper.startPage(pageNum, pageSize);
+            //分页查询数据
+            List<Map<String, Object>> list = omsTransOrderService.getCapacityTotalResult(map);
+            PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+            return success(pageList);
+        }
+    }
+
+    @ApiOperation("生产物流-调度任务")
+    @PostMapping("/dispatchTask")
+    public RESTfulResult dispatchTask(@RequestBody Map<String, Object> map) throws Exception {
+        Map<String,Object> resMap = omsTransOrderService.dispatchTask(map);
+        if("failed".equals(resMap.get("status"))) {
+            return failed(resMap.get("errorMessage"),resMap.get("errorMessage").toString());
+        }
+        return success(map,"任务调度成功");
+    }
+
+    @ApiOperation("获取销售派车单信息")
+    @PostMapping("/getDlivDirnoSeqList/{id}")
+    public RESTfulResult getDlivDirnoSeqList(@PathVariable("id") String id) {
+        Map<String, Object> dlivDirnoSeqList = omsTransOrderService.getDlivDirnoSeqList(id);
+        return success(dlivDirnoSeqList);
+    }
+
+    @ApiOperation("修改销售派车单信息")
+    @PostMapping("/updateDlivDirnoSeq")
+    public Map<String, Object> updateDlivDirnoSeq(@RequestBody Map<String, Object> map) throws Exception {
+        Map<String,Object> params = omsTransOrderService.updateDlivDirnoSeq(map);
+        return params;
+    }
+
+    @ApiOperation("获取销售派车单信息装货信息")
+    @PostMapping("/selectDlivDirnoSeqDetails")
+    public RESTfulResult selectDlivDirnoSeqDetails(@RequestBody Map<String, Object> map) {
+        return success(omsTransOrderService.selectDlivDirnoSeqDetails(map));
+    }
+
+
+    @SneakyThrows
+    @ApiOperation("获取销售派车单信息装货信息")
+    @PostMapping("/creatTransResult")
+    public void creatTransResult(BigDecimal lineId, BigDecimal transOrderId,BigDecimal planChildId, String userName) throws Exception {
+        omsTransOrderService.creatTransResult(lineId, transOrderId,planChildId,userName);
+    }
+
+    @ApiOperation("获取销售派车单信息装货信息")
+    @PostMapping("/dispatchPush")
+    public void dispatchPush(BigDecimal businessType,
+                             BigDecimal capacityId,
+                             BigDecimal driverId,
+                             OmsTransOrder omsTransOrder,
+                             OmsOrderChild omsOrderChild,
+                             Map<String,Object> planDetails) throws Exception {
+        omsTransOrderService.dispatchPush(businessType,
+                capacityId,
+                driverId,
+                omsTransOrder,
+                omsOrderChild,
+                planDetails);
+    }
+
+    @ApiOperation("匹配运输路径，并自动生产实绩")
+    @PostMapping("/matchLineAndCreatResult")
+    public RESTfulResult matchLineAndCreatResult(@RequestBody Map<String, Object> map) {
+        try {
+            Map<String, Object> result = omsTransOrderService.matchLineAndCreatResult(map);
+            return success(result,"匹配成功！");
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "发运通知单直接派车", notes = "发运通知单直接派车")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/saleDispatchList")
+    public RESTfulResult saleDispatchList(@RequestBody Map<String, Object> map) throws Exception {
+        try {
+            String result = omsTransOrderService.saleDispatchList(map);
+            return success(map, result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info(e.getMessage());
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "多拼派单", notes = "多拼派单")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping("/saleDispatchDuoPin")
+    public RESTfulResult saleDispatchDuoPin(@RequestBody Map<String, Object> map) throws Exception {
+        try {
+            String result = omsTransOrderService.saleDispatchDuoPin(map);
+            return success(map, result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "确认出库", notes = "确认出库")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping("/outBound")
+    public RESTfulResult outBound(@RequestBody Map<String, Object> map) throws Exception {
+        try {
+            String result = omsTransOrderService.outBound(map);
+            return success(map, result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "撤销出库", notes = "撤销出库")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping("/revokeOutBound")
+    public RESTfulResult revokeOutBound(@RequestBody Map<String, Object> map) throws Exception {
+        try {
+            String result = omsTransOrderService.revokeOutBound(map);
+            return success(map, result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "关闭过期运输订单", notes = "多拼派单")
+    @PostMapping("/closeExpireTransOrder")
+    public RESTfulResult closeExpireTransOrder(@RequestBody Map<String, Object> map) throws Exception {
+        try {
+            int affect = omsTransOrderMapper.closeExpireTransOrder();
+            return success(map, "关闭过期运输订单数量："+affect);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "同步生产实绩", notes = "同步生产实绩")
+    @PostMapping("/syncProductionResult")
+    public RESTfulResult syncProductionResult(@RequestBody Map<String, Object> map){
+        try {
+            if(map.containsKey("wlpl")) {
+                List<Map<String,Object>> mapList = (List<Map<String, Object>>) map.get("mapList");
+                for(Map<String,Object> map1 : mapList) {
+                    if(map.containsKey("flag")) {
+                        map1.put("flag","update");
+                    }
+                    omsTransOrderService.syncProductionResult(map1);
+                    //判断单据有没有同步成功
+                    BigDecimal orderId = omsTransOrderMapper.selectOrderInfoByDB(map1);
+                    SyncProductList syncProductList = new SyncProductList();
+                    if(orderId == null) {
+                        syncProductList.setDeleted(1);
+                    }else{
+                        syncProductList.setDeleted(0);
+                    }
+                    JSONObject jsonObject = new JSONObject(map1);
+                    syncProductList.setPrimaryId(syncProductListMapper.nextId());
+                    syncProductList.setDjlx("调拨");
+                    syncProductList.setDjbh(map1.get("djbh").toString());
+                    syncProductList.setMaterialName(map1.get("materialName") == null ? "" : map1.get("materialName").toString());
+                    syncProductList.setProductList(jsonObject.toString());
+                    syncProductListMapper.insert(syncProductList);
+                }
+                return success("更新成功");
+            }
+            String result = omsTransOrderService.syncProductionResult(map);
+            //判断单据有没有同步成功
+            BigDecimal orderId = omsTransOrderMapper.selectOrderInfoByDB(map);
+            SyncProductList syncProductList = new SyncProductList();
+            if(orderId == null) {
+                syncProductList.setDeleted(1);
+            }else{
+                syncProductList.setDeleted(0);
+            }
+            JSONObject jsonObject = new JSONObject(map);
+            syncProductList.setPrimaryId(syncProductListMapper.nextId());
+            syncProductList.setDjlx("调拨");
+            syncProductList.setDjbh(map.get("djbh").toString());
+            syncProductList.setMaterialName(map.get("materialName") == null ? "" : map.get("materialName").toString());
+            syncProductList.setProductList(jsonObject.toString());
+            syncProductListMapper.insert(syncProductList);
+            return success(map, result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "获取司机日工作量", notes = "获取司机日工作量")
+    @PostMapping("/getDriverDayJobForApp")
+    public RESTfulResult getDriverDayJobForApp(@RequestBody Map<String, Object> map,Integer apiId){
+        //分页查询数据
+        List<Map<String,Object>> list = omsTransOrderService.getDriverDayJob(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "再次同步WMS派车单", notes = "再次同步WMS派车单")
+    @PostMapping("/slmDlivDirList")
+    public RESTfulResult slmDlivDirList(@RequestBody Map<String, Object> map) throws Exception {
+        String s = omsTransOrderService.slmDlivDirList(map);
+        return success(s);
+    }
+
+    @ApiOperation(value = "火运出库后修改车号", notes = "火运出库后修改车号")
+    @PostMapping("/updateCarNo")
+    public RESTfulResult updateCarNo(@RequestBody Map<String, Object> map) throws Exception {
+        try {
+            String s = omsTransOrderService.updateCarNo(map);
+            return success(map, s);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "禁用/启用运输订单")
+    @PostMapping("/banTransOrder")
+    public RESTfulResult banTransOrder(@RequestBody Map<String, Object> map) throws Exception {
+        try {
+            String s = omsTransOrderService.banTransOrder(map);
+            return success(map, s);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "查询销售火运装车", notes = "")
+    @PostMapping("/loadingOperation")
+    public RESTfulResult loadingOperation(@RequestBody Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> list = omsTransOrderService.loadingOperation(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "修改火运装车列序号")
+    @PostMapping("/updateTrainOrderSeq")
+    public RESTfulResult updateTrainOrderSeq(@RequestBody Map<String, Object> map) throws Exception {
+        try {
+            String s = omsTransOrderService.updateTrainOrderSeq(map);
+            return success(map, s);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "查询销售火运装车明细", notes = "")
+    @PostMapping("/purchaseTrainsOrderList")
+    public RESTfulResult purchaseTrainsOrderList(@RequestBody Map<String, Object> map,
+                                          Integer apiId,
+                                          Integer pageNum,
+                                          Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> list = omsTransOrderService.purchaseTrainsOrderList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "重传火运实绩->环保")
+    @PostMapping("/trainResultResend")
+    public RESTfulResult trainResultResend() throws Exception{
+        List<Map<String, Object>>  listXt = omsTransOrderMapper.getTrainResultForSend(null);
+        //List<Map<String, Object>>  listHa = omsTransOrderMapper.getTrainResultForSend("宏安");
+        int index= 0,section = 300;//分片大小
+        while(index * section < listXt.size()) {
+            index++;
+            List<Map<String, Object>> tempList = null;
+            if (index * section < listXt.size()) {
+                tempList = listXt.subList((index - 1) * section, index * section);
+            } else {
+                tempList = listXt.subList((index - 1) * section, listXt.size());
+            }
+            Map<String,Object>[]  paramArray = tempList.toArray(new Map[tempList.size()]);
+            daZongUtil.executeEnvironment("/train/saveOrUpdate", paramArray);
+        }
+        //while(index * section < listHa.size()) {
+        //    index++;
+        //    List<Map<String, Object>> tempList = null;
+        //    if (index * section < listHa.size()) {
+        //        tempList = listHa.subList((index - 1) * section, index * section);
+        //    } else {
+        //        tempList = listHa.subList((index - 1) * section, listHa.size());
+        //    }
+        //    Map<String,Object>[]  paramArray = tempList.toArray(new Map[tempList.size()]);
+        //    daZongUtil.executeEnvironment("/ha/train/saveOrUpdate", paramArray);
+        //}
+        return success("OK");
+    }
+
+
+
+
+    @ApiOperation(value = "采购-修改原发数量")
+    @PostMapping("/modifyChange")
+    public RESTfulResult modifyChange(@RequestBody Map<String, Object> params) {
+        try {
+            String s = omsTransOrderService.modifyChange(params);
+            return success(params, s);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "获取大宗净重")
+    @PostMapping("/getNetWeight")
+    public RESTfulResult getNetWeight(@RequestBody Map<String, Object> params) {
+        try {
+            String s = omsTransOrderService.getNetWeight(params);
+            return success(params, s);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+
+    @ApiOperation(value = "同步报表数据")
+    @PostMapping("/getgenerateOperateDaily")
+    public RESTfulResult generateOperateDaily(@RequestBody Map<String, Object> params) {
+        try {
+            List<Map<String, Object>> omsTransOrder = omsTransOrderMapper.getTransOrderList(params);
+            if (omsTransOrder!=null&&omsTransOrder.size()>0){
+                for (int i = 0; i <omsTransOrder.size() ; i++) {
+                    reportFeign.generateOperateDaily( omsTransOrder.get(i));
+                }
+            }
+            return success(params);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation("对数据进行纠错")
+    @PostMapping("/correctTransOrder")
+    public RESTfulResult correctTransOrder(@RequestBody Map<String,Object> map) {
+        String result = null;
+        try {
+            result = omsTransOrderService.correctTransOrder(map);
+            return success(result);
+        } catch (Exception e) {
+
+            e.printStackTrace();
+            return failed(e.getMessage());
+        }
+    }
+
+
+    @ApiOperation("固定派车")
+    @PostMapping("/fixedDispatch")
+    public RESTfulResult fixedDispatch() throws Exception {
+        omsTransOrderService.fixedDispatch();
+
+        return success();
+    }
+
+    @ApiOperation("查询需求派车")
+    @PostMapping("/getDispatchRules")
+    public RESTfulResult getDispatchRules(@RequestBody Map<String,Object> map) {
+        //获取是否派车；
+        List<BigDecimal> orderList = commonMapper.getOrderListByChild(DataChange.dataToBigDecimal(map.get("requirementChildId")));
+        if(orderList.size() > 0) {
+            return failed("该需求已派车，无需查看！");
+        }
+        //没有需求
+        Map<String,Object> objectMap = new HashMap<>();
+        AmsTransRequirement amsTransRequirement = amsTransRequirementMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("transRequirementId")));
+        AmsRequirementChild amsRequirementChild = amsRequirementChildMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("requirementChildId")));
+        Date dispatchTime = new Date((long) (amsTransRequirement.getRequirementStartTime().getTime() -  1.5 * 60 * 60 * 1000));
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        objectMap.put("dispatchTime",simpleDateFormat.format(dispatchTime));
+        //计算派车车号
+        BigDecimal capacityTypeId = amsTransRequirement.getCapacityTypeId();
+        Date requirementStartTime = amsTransRequirement.getRequirementStartTime();
+        Date requirementEndTime = amsTransRequirement.getRequirementEndTime();
+        Calendar startTimeCal = Calendar.getInstance();
+        startTimeCal.setTime(requirementStartTime);
+        Calendar endTimeCal = Calendar.getInstance();
+        endTimeCal.setTime(requirementEndTime);
+        // 获取开始时间
+        int startHours = startTimeCal.get(Calendar.HOUR_OF_DAY);
+        // 获取结束时间
+        int endHours = endTimeCal.get(Calendar.HOUR_OF_DAY);
+        List<Integer> startArrayList1 = Arrays.asList(7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19);
+        List<Integer> endArrayList1 = Arrays.asList(7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19);
+        List<Integer> startArrayList2 = Arrays.asList(19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6);
+        List<Integer> endArrayList2 = Arrays.asList(19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7,8);
+        //如果开始时间大于七点，并且结束时间小于19点，就是早班
+        String flag = "";
+        if(startArrayList1.contains(startHours) && endArrayList1.contains(endHours)) {
+            flag = "白班";
+        }
+        if(startArrayList2.contains(startHours) && endArrayList2.contains(endHours)) {
+            flag = "夜班";
+        }
+        String personnelNo = map.get("alternateFields8").toString();
+        if("无".equals(personnelNo)) {
+            //不需要吊挂工；
+            personnelNo = "0";
+        }
+        BigDecimal personnelNumber = DataChange.dataToBigDecimal(personnelNo);
+        //空闲中的、运力、司机数据
+        Map<String, Object> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("capacityTypeId",capacityTypeId);
+        objectObjectHashMap.put("shift",flag);
+        objectObjectHashMap.put("operationName",amsRequirementChild.getOperationName());
+        objectObjectHashMap.put("operationRangeName",amsRequirementChild.getOperationRangeName());
+        if(DataChange.dataToBigDecimal(map.get("dispatchSqe")).compareTo(new BigDecimal(7)) == 0) {
+            objectObjectHashMap.put("allShift","1");
+            objectMap.put("operationNameType","外出业务");
+        }else{
+            objectMap.put("operationNameType","站台装卸业务");
+        }
+        objectMap.put("capacityTypeName",amsTransRequirement.getCapacityTypeName());
+        // 查询该班次,所有异常的司机
+        List<Map<String,Object>> capacityDriverList = commonMapper.selectAbnormalCapacityDriverList(objectObjectHashMap);
+        objectMap.put("capacityDriverList",capacityDriverList);
+        return success(objectMap);
+    }
+
+
+    @ApiOperation("查询站台装卸")
+    @PostMapping("getZtZxShiji")
+    public RESTfulResult getZtZxShiji(@RequestBody Map<String, Object> map,
+                                      Integer apiId,
+                                      Integer pageNum,
+                                      Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> list = omsTransOrderService.getZtZxShiji(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @PostMapping("disposeMatchLoadData")
+    public RESTfulResult disposeMatchLoadData(@RequestBody Map<String, Object> map) {
+        String result = omsTransOrderService.disposeMatchLoadData(map);
+        return success(result) ;
+    }
+
+}

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

@@ -0,0 +1,2299 @@
+package com.steerinfo.dil.controller;
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.lang.hash.Hash;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.google.gson.JsonObject;
+import com.steerinfo.dil.config.WebExceptionHandler;
+import com.steerinfo.dil.feign.*;
+import com.steerinfo.dil.mapper.*;
+import com.steerinfo.dil.model.*;
+import com.steerinfo.dil.service.impl.*;
+import com.steerinfo.dil.util.BaseRESTfulController;
+import com.steerinfo.dil.util.DaZongUtil;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.EntityDispose;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.sun.org.apache.bcel.internal.generic.NEW;
+import io.swagger.annotations.ApiOperation;
+import org.apache.log4j.Logger;
+import org.omg.CORBA.OBJ_ADAPTER;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+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 javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.security.PublicKey;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Year;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+@RestController
+@RequestMapping("/${api.version}/test")
+public class TestController extends BaseRESTfulController {
+
+    static final Logger log = Logger.getLogger(TestController.class);
+
+    @Autowired
+    OmsTransOrderServiceImpl omsTransOrderService;
+
+    @Autowired
+    OmsTransOrderMapper omsTransOrderMapper;
+
+    @Autowired
+    TmsWeightResultMapper tmsWeightResultMapper;
+
+    @Autowired
+    DzFeign dzFeign;
+
+    @Autowired
+    EntityDispose entityDispose;
+
+    @Autowired
+    TmsSignInResultMapper tmsSignInResultMapper;
+
+    @Autowired
+    OmsOrderChildMapper omsOrderChildMapper;
+
+
+    @Autowired
+    TmsLoadResultMapper tmsLoadResultMapper;
+
+    @Autowired
+    TmsOutfactoryResultServiceImpl tmsOutfactoryResultService;
+
+    @Autowired
+    OmsOrderChildServiceImpl omsOrderChildService;
+
+    @Autowired
+    TmsUnloadResultMapper tmsUnloadResultMapper;
+
+    @Autowired
+    TmsQualityResultMapper tmsQualityResultMappper;
+
+    @Autowired
+    DaZongUtil daZongUtil;
+
+    @Autowired
+    private EmsFeign emsFeign;
+
+    @Autowired
+    private ReportFeign reportFeign;
+
+    @Autowired
+    CommonMapper commonMapper;
+
+    @Autowired
+    TmsTimingResultServiceImpl tmsTimingResultService;
+
+    @Autowired
+    TmsTimingResultController tmsTimingResultController;
+    @Autowired
+    private TmsTimingResultMapper tmsTimingResultMapper;
+
+    @Autowired
+    TmsWeightResultController tmsWeightResultController;
+
+    @Autowired
+    TmiFeign tmiFeign;
+
+    @Autowired
+    SyncProductListMapper syncProductListMapper;
+
+    @Resource
+    TmsWeightResultServiceImpl tmsWeightResultService;
+
+    @Autowired
+    TmsComprehensiveResultMapper tmsComprehensiveResultMapper;
+
+    @Autowired
+    AmsTransRequirementMapper amsTransRequirementMapper;
+
+    @Autowired
+    AmsRequirementChildMapper amsRequirementChildMapper;
+
+    @Autowired
+    WebsocketFeign websocketFeign;
+
+    @ApiOperation(value="测试接口", notes="")
+    @PostMapping("/test")
+    public RESTfulResult test(){
+        try{
+            omsTransOrderService.buluTransOrder();
+            return success("OK");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage());
+        }
+    }
+
+    /**
+     * 定时任务，每1分钟执行，获取大宗质检实绩
+     */
+    //@Scheduled(fixedDelay = 1000 * 60 * 240)
+    public void quiltyDz(){
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        List<Map<String,Object>> list = tmsUnloadResultMapper.getQualitingResult();
+        DateFormat df = new SimpleDateFormat("yyyyMMddHHmm");
+        DateFormat df2 = new SimpleDateFormat("yyyyMMddHHmmss");
+        for(Map<String,Object> item : list){
+            try{
+                JSONObject result = daZongUtil.executeNolog("30010000020",new Map[]{item});
+                JSONArray rows = result.getJSONObject("returndata").getJSONObject("tables0").getJSONArray("rows");
+                if(rows.size() > 0){
+                    JSONObject quiltyResult = JSONObject.parseObject(JSONObject.toJSONString(rows.get(0)));
+//                    log.info("质检结果："+quiltyResult);
+                    String gbrq = quiltyResult.getString("gbrq");//过磅日期-20240712164127
+                    String zyrq = quiltyResult.getString("zyrq");//制样日期-202407131317
+                    String hyrq = quiltyResult.getString("hyrq");//化验日期-202407140855
+                    String cydh = quiltyResult.getString("cydh");//采样单号
+                    String zjdh = quiltyResult.getString("zjdh");//质检单号
+                    BigDecimal water = quiltyResult.getBigDecimal("水分");
+                    BigDecimal s = quiltyResult.getBigDecimal("S");
+                    TmsQualityResult tmsQualityResult = tmsQualityResultMappper.selectByPrimaryKey(DataChange.dataToBigDecimal(item.get("resultId")));
+                    tmsQualityResult.setWaterProportion(water);
+                    tmsQualityResult.setMaterialId(DataChange.dataToBigDecimal(item.get("materialId")));
+                    tmsQualityResult.setSulfurProportion(s);
+                    tmsQualityResult.setSamplingTime(df2.parse(gbrq));
+                    try{
+                        tmsQualityResult.setAssembleTime(df.parse(zyrq));
+                    }catch (Exception e){}
+                    try{
+                        tmsQualityResult.setAssayTime(df.parse(hyrq));
+                    }catch (Exception e){}
+                    tmsQualityResult.setSamplingNo(cydh);
+                    tmsQualityResult.setAssayNo(zjdh);
+                    tmsQualityResult.setUpdateTime(new Date());
+                    tmsQualityResult.setUpdateUsername("大宗质检");
+                    tmsQualityResultMappper.updateByPrimaryKeySelective(tmsQualityResult);
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+                log.error("获取大宗质检实绩异常："+e.getMessage());
+            }
+        }
+    }
+
+    /**
+     * 定时任务，每1分钟执行，关闭未回传的运单
+     */
+    //@Scheduled(fixedDelay = 1000 * 60 * 60)
+    public void closeDz(){
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        Map<String,Object> map = dzFeign.getUnUploadOrder();
+        //关闭有净重的运单
+        int affect = omsTransOrderMapper.closeDz(map);
+        if(affect > 0){
+            log.info("关闭大宗未回传的运单数量："+affect);
+        }
+    }
+
+    /*定时任务,关闭已回传净重但半小时后仍未回传出厂的运单
+    * */
+    //@Scheduled(fixedDelay = 1000 * 60 * 30)
+    public void closeAbnormalOrder() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        int affect = omsTransOrderMapper.closeAbnormalOrder();
+        if(affect > 0) {
+            log.info("关闭大宗未回传出厂时间的运单数量：" + affect);
+        }
+    }
+
+
+    /**
+     * 定时任务,查询计时运单已签到,但未计时开始的运单
+     * */
+    //@Scheduled(fixedDelay = 5000 * 60 * 6)
+    //@PostMapping("autoTimeStarted")
+    public void autoTimeStarted() {
+        //
+        List<Map<String,Object>> mapList = omsTransOrderMapper.getNoTimeStarted();
+        for (Map<String,Object> map : mapList) {
+            try {
+                tmsTimingResultService.timingResult(map);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+
+    /**
+     * 定时任务，每1小时执行，关闭生产(计重、计次、计时)过期的运单
+     */
+    //@Scheduled(fixedDelay = 1000 * 60 * 60 * 3)
+    public void closeTransOrder_pruduct(){
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        //try {
+        //    List<OmsTransOrder> omsTransOrders = omsTransOrderMapper.getExpireOrder();
+        //    for (OmsTransOrder omsTransOrder : omsTransOrders) {
+        //        Map<String, Object> searchMap = new HashMap<>();
+        //        searchMap.put("transOrderId", omsTransOrder.getTransOrderId().toString());
+        //        Map<String, Object> transOrder = omsTransOrderMapper.getTransOrder(searchMap);
+        //        transOrder.put("userName", "admin");
+        //        Map<String, Object> map = emsFeign.emsdetailsordersAdd(transOrder);
+        //        log.info("关闭运单时调用结算："+map.toString());
+        //    }
+        //}catch (Exception e){
+        //    log.error("关闭运单时调用结算异常",e);
+        //}
+        //int affect = omsTransOrderMapper.closeExpireOrder();
+        int affect1 = omsTransOrderMapper.closeExpireOrder1();
+        //关闭生产物流计时超出用车时间的运单
+        int affect2 = omsTransOrderMapper.closeExpireOrder2();
+        //关闭已签到，但是一直未结束的运输订单(超出3天)
+        int affect3 = omsTransOrderMapper.closeExpireOrder3();
+        //关闭吊车未结束时间的单据
+        int affect4 = omsTransOrderMapper.closeExpireOrder4();
+
+        int affect5 = omsTransOrderMapper.closeExpireOrder5();
+
+        //if(affect > 0){
+        //    log.info("关闭生产(计重)过期的运单数量："+affect);
+        //}
+        if(affect1 > 0){
+            log.info("关闭生产(计次)过期的运单数量："+affect1);
+        }
+        if(affect2 > 0){
+            log.info("关闭生产(计时)过期的运单数量："+affect2);
+        }
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 60)
+    public void disposeTimeEnd() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        List<Map<String,Object>> affectListMap = omsTransOrderMapper.getTimeExpireOrder();
+        for(Map<String,Object> map : affectListMap) {
+            BigDecimal duration = DataChange.dataToBigDecimal(map.get("duration"));
+            map.put("abnormalFlag","是");
+            if(duration == null){
+                map.put("actualDuration",11);
+            }else if(duration.compareTo(new BigDecimal(11)) == 1) {
+                map.put("actualDuration",11.5);
+            }else{
+                map.put("actualDuration",duration);
+            }
+            try {
+                tmsTimingResultController.start(map);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    //过期运单自动关闭
+    //@Scheduled(fixedDelay = 1000 * 60 * 120)
+    public void closeExpireTransOrder()  {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        try {
+            // 查询过期运单,关闭时同步更新数量
+            List<BigDecimal> orderIds = omsTransOrderMapper.getCxExpireOrder();
+            //关闭运单
+            int affect = omsTransOrderMapper.closeExpireByTransOrder(orderIds);
+            //根据运单查询需求ID
+            List<BigDecimal> requirementChildIds = omsTransOrderMapper.getRequirementChildIdByOrderIds(orderIds);
+            for(BigDecimal requirementChildId : requirementChildIds) {
+                omsTransOrderService.sumWeight(requirementChildId);
+            }
+            //int affect = omsTransOrderMapper.closeExpireTransOrder();
+            log.info("关闭过期运输订单数量："+affect);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 30)
+    public void buluCapacityInfo() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        //获取没有四六证的车号
+        List<OmsTransOrder> omsTransOrderList = omsTransOrderMapper.selectUnInfoOrder();
+        for(OmsTransOrder omsTransOrder : omsTransOrderList) {
+            try {
+                Map<String, Object> objectObjectHashMap = new HashMap<>();
+                objectObjectHashMap.put("capacityNumber",omsTransOrder.getCapacityNumber());
+                objectObjectHashMap.put("transOrderNumber",omsTransOrder.getSerialNumber());
+                objectObjectHashMap.put("identityCard",omsTransOrder.getIdentityCard());
+                objectObjectHashMap.put("capacityId",omsTransOrder.getCapacityId());
+                objectObjectHashMap.put("driverId",omsTransOrder.getDriverId());
+                omsTransOrderService.buluCapacity(objectObjectHashMap);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+
+    /**
+     * 定时任务，每1分钟执行，获取大宗签到
+     */
+    //@Scheduled(fixedDelay = 1000 * 60 * 60)
+    public void signDz() throws Exception {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        List<Map<String, Object>> list = omsTransOrderMapper.getSigningOrder();
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        int index= 0,section = 200;//分片大小
+        while(index * section < list.size()) {
+            index++;
+            List<Map<String, Object>> tempList = null;
+            if (index * section < list.size()) {
+                tempList = list.subList((index - 1) * section, index * section);
+            } else {
+                tempList = list.subList((index - 1) * section, list.size());
+            }
+            //处理数据
+            if(tempList.size()>0){
+                Map<String,Object> searchMap_Dz = new HashMap<>();
+                searchMap_Dz.put("list",tempList);
+                List<Map<String, Object>>  resultList = dzFeign.getSignList(searchMap_Dz);
+                if(resultList.size()>0){
+                    for(Map<String ,Object > temp :resultList){
+                        if(temp.get("signInTime") != null && temp.get("transOrderNumber") != null){
+                            String transOrderNumber  = temp.get("transOrderNumber").toString();
+                            Date signTime = dateFormat.parse(temp.get("signInTime").toString());
+                            BigDecimal transOrderId = omsTransOrderMapper.getTransOrderIdByNumber(temp).get(0);
+                            //运单
+                            OmsTransOrder omsTransOrder = new OmsTransOrder();
+                            omsTransOrder.setTransOrderId(transOrderId);
+                            omsTransOrder.setDeleted(new BigDecimal(5));
+                            omsTransOrder.setCurrentLineSeq(new BigDecimal(1));
+                            omsTransOrder.setOrderStatus("大宗签到");
+                            omsTransOrder.setConfirmReason("大宗签到");
+                            //签到实绩
+                            Map<String,Object> searchMap = new HashMap<>();
+                            searchMap.put("transOrderId",transOrderId);
+                            searchMap.put("deleted",0);
+                            List<TmsSignInResult> signList = tmsSignInResultMapper.selectByParameters(searchMap);
+                            for(TmsSignInResult item : signList){
+                                if(item.getSignInTime() == null){
+                                    item.setSignInMode("大宗签到");
+                                    item.setSignInAddress("");
+                                    item.setLocationMode("大宗签到");
+                                    item.setSignInTime(signTime);
+                                    item.setUpdateTime(new Date());
+                                    item.setUpdateUsername("大宗签到");
+                                    tmsSignInResultMapper.updateByPrimaryKeySelective(item);
+                                    omsTransOrderMapper.updateByPrimaryKeySelective(omsTransOrder);
+                                    omsOrderChildService.updateOrderChildInfo(transOrderId,null,item.getSignInTime(),"签到");
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            //更新操作
+
+        }
+    }
+
+    //@PostMapping("/findUnloadDetails")
+    //@Scheduled(fixedDelay = 1000 * 60 * 60 * 6)
+    public RESTfulResult findUnloadDetails() {
+        String userName = "补录卸货实绩";
+        // 查询实收吨位没有的运单
+        List<BigDecimal> transOrderIds = omsTransOrderMapper.selectUnloadOrdersIds();
+        //List<BigDecimal> transOrderIds = omsTransOrderMapper.selectLoadOrderIds();
+        for (BigDecimal transOrderId : transOrderIds) {
+            OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(transOrderId);
+            try {
+                omsTransOrderService.findUnloadDetails(omsTransOrder,userName);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return success();
+    }
+
+
+    @PostMapping("/findSignTime")
+    public RESTfulResult findSignTime() {
+        String userName = "大宗补录签到实绩";
+        // 查询没有签到实绩的已完成的运单
+        List<BigDecimal> transOrderIds = omsTransOrderMapper.selectSignOrdersIds();
+        for (BigDecimal transOrderId : transOrderIds) {
+            OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(transOrderId);
+            try {
+                omsTransOrderService.findSignTime(omsTransOrder,userName);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return success();
+    }
+
+
+    @PostMapping("/restartWeightResult")
+    public RESTfulResult restartWeightResult() {
+        List<String> ysddList = omsTransOrderMapper.restartWeightResult();
+        dzFeign.restartWeightResult(ysddList);
+        return success();
+    }
+
+    @PostMapping("/disposeErrorRequirement")
+    public RESTfulResult disposeErrorRequirement() {
+        List<Map<String,Object>> mapList = tmsWeightResultMapper.getErrorRequirement();
+        int i=0;
+        for(Map<String,Object> map :mapList) {
+            Map<String,Object> map1 = dzFeign.getErrorRequirement(map);
+            BigDecimal wlNum1 = DataChange.dataToBigDecimal(tmsWeightResultMapper.selectCksl(DataChange.dataToBigDecimal(map.get("tdfl"))));
+            BigDecimal wlNum = DataChange.dataToBigDecimal(map.get("num")).add(wlNum1);
+            if(map1 == null) {
+                continue;
+            }
+
+            BigDecimal dzNum = DataChange.dataToBigDecimal(map1.get("num"));
+            if(wlNum.compareTo(dzNum) != 0){
+                System.out.println(wlNum + "=wlNum");
+                System.out.println(dzNum + "=dzNum");
+                System.out.println(map.get("tdls") + "=tdls");
+                System.out.println(map.get("tdfl") + "=tdfl");
+                System.out.println(dzNum.subtract(wlNum) + "=cz");
+                System.out.println("/n");
+                System.out.println("/n");
+                System.out.println(i++);
+            }
+        }
+
+        return success();
+    }
+
+    @PostMapping("/testSingle")
+    public RESTfulResult testSingle(){
+        return success(omsTransOrderMapper.selectByPrimaryKey(new BigDecimal(410040)));
+    }
+
+    @PostMapping("/bluWmsWeigh")
+    public RESTfulResult bluWmsWeigh() {
+        //查找没有信息
+        //查询3、20001
+        List<OmsTransOrder> omsTransOrders = omsTransOrderMapper.selectNoNetWeight();
+        List<TmsWeightResult> tmsWeightResultsTarget = new ArrayList<>();
+        List<TmsWeightResult> tmsWeightResultsOrigin = new ArrayList<>();
+        for(OmsTransOrder omsTransOrder : omsTransOrders) {
+            Map<String, Object> loadMap = new HashMap<>();
+            loadMap.put("transOrderId",omsTransOrder.getTransOrderId());
+            List<TmsLoadResult> loadResults = tmsLoadResultMapper.selectByParameters(loadMap);
+            if (loadResults.size() != 1) {
+                System.out.println(omsTransOrder.getTransOrderId().toString());
+                continue;
+            }
+            TmsLoadResult itemLoadResult = loadResults.get(0);
+            if (itemLoadResult == null || itemLoadResult.getLoadEndTime() == null) {
+                continue;
+            }
+            Map<String, Object> weightMap = new HashMap<>();
+            weightMap.put("capacityId",omsTransOrder.getCapacityId());
+            weightMap.put("loadTime",itemLoadResult.getLoadEndTime());
+            List<TmsWeightResult> weightResultsBand = tmsWeightResultMapper.selectWeightMap(weightMap);
+            if (weightResultsBand == null || weightResultsBand.size() == 0 || weightResultsBand.get(0) == null || weightResultsBand.size() > 1) {
+                continue;
+            }
+            List<OmsOrderChild> omsOrderChildren = omsOrderChildMapper.selectByParameters(loadMap);
+            TmsWeightResult itemOrigin = weightResultsBand.get(0);
+            List<TmsWeightResult> weightResultsLoad = tmsWeightResultMapper.selectByParameters(loadMap);
+            TmsWeightResult itemTarget = weightResultsLoad.get(0);
+            itemTarget.setPoundNo(itemOrigin.getPoundNo());
+            itemTarget.setTransOrderChildId(omsOrderChildren.get(0).getOrderChildId());
+            itemTarget.setGrossPlaceId(itemOrigin.getGrossPlaceId());
+            itemTarget.setGrossWeight(itemOrigin.getGrossWeight());
+            itemTarget.setGrossWeightTime(itemOrigin.getGrossWeightTime());
+            itemTarget.setTarePlaceId(itemOrigin.getTarePlaceId());
+            itemTarget.setTareWeightTime(itemOrigin.getTareWeightTime());
+            itemTarget.setTareWeight(itemOrigin.getTareWeight());
+            itemTarget.setNetWeightTime(itemOrigin.getNetWeightTime());
+            itemTarget.setNetWeight(itemOrigin.getNetWeight());
+            itemTarget.setResultImage(itemOrigin.getResultImage());
+            itemTarget.setAlternateFields6(itemOrigin.getAlternateFields6());
+            itemTarget.setAlternateFields9(itemOrigin.getTransOrderId().toString());
+            itemTarget.setAlternateFields10(itemOrigin.getResultId().toString());
+            tmsWeightResultsTarget.add(itemTarget);
+            itemOrigin.setAlternateFields9(itemTarget.getTransOrderId().toString());
+            itemOrigin.setAlternateFields10(itemTarget.getResultId().toString());
+            tmsWeightResultsOrigin.add(itemOrigin);
+        }
+        if(tmsWeightResultsTarget.size() > 0) {
+            tmsWeightResultMapper.batchUpdate(tmsWeightResultsTarget);
+        }
+        if(tmsWeightResultsOrigin.size() > 0) {
+            tmsWeightResultMapper.batchUpdate(tmsWeightResultsOrigin);
+        }
+        return success();
+    }
+
+
+
+    //@PostMapping("testWeightReplace")
+    //public void testWeightReplace(BigDecimal transOrderId) {
+    //    try {
+    //        omsTransOrderService.replaceResult(transOrderId);
+    //    } catch (Exception e) {
+    //        e.printStackTrace();
+    //    }
+    //}
+
+    @PostMapping("updateSaleWeight")
+    public RESTfulResult updateSaleWeight() {
+
+        return success();
+    }
+
+    @PostMapping("bluMonitor")
+    public RESTfulResult bluMonitor() {
+        //查询采购实绩
+        List<OmsTransOrder> omsTransOrderList = omsTransOrderMapper.selectByMonitor();
+        //int index = 0;
+        //int section = 200;
+        //while (index * section < omsTransOrderList.size()) {
+        //    index++;
+        //
+        //}
+        for(OmsTransOrder omsTransOrder : omsTransOrderList) {
+            try {
+                tmsOutfactoryResultService.generateMonitor(omsTransOrder.getTransOrderId());
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return success();
+    }
+
+    @PostMapping("/bluTzd")
+    public RESTfulResult bluTzd() {
+        List<Map<String,Object>> mapList = dzFeign.getProductionResultList(new HashMap<>());
+        for(Map<String,Object> map : mapList) {
+            omsTransOrderService.syncProductionResult(map);
+            //判断单据有没有同步成功
+            BigDecimal orderId = omsTransOrderMapper.selectOrderInfoByDB(map);
+            SyncProductList syncProductList = new SyncProductList();
+            if(orderId == null) {
+                syncProductList.setDeleted(1);
+            }else{
+                syncProductList.setDeleted(0);
+            }
+            JSONObject jsonObject = new JSONObject(map);
+            syncProductList.setPrimaryId(syncProductListMapper.nextId());
+            syncProductList.setDjbh(map.get("djbh").toString());
+            syncProductList.setMaterialName(map.get("materialName") == null ? "" : map.get("materialName").toString());
+            syncProductList.setProductList(jsonObject.toString());
+            syncProductList.setInsertTime(new Date());
+            syncProductListMapper.insert(syncProductList);
+        }
+        return success(1);
+    }
+
+
+
+    @PostMapping("matching")
+    public RESTfulResult matching() {
+        omsTransOrderService.matching(new BigDecimal(776064));
+        return success();
+    }
+
+    /**
+     * 匹配车号
+     * @return
+     */
+    @PostMapping("matchCarNumber")
+    public RESTfulResult matchCarNumber() {
+        RESTfulResult result = omsTransOrderService.matchCarNumber();
+        return result;
+    }
+
+    /**
+     * 合并大宗运单
+     * @return
+     */
+    @PostMapping("mergeDzOrder")
+    public RESTfulResult mergeDzOrder(@RequestBody HashMap<String,Object> model) {
+        if(model.get("shift")==null&&!"1".equals(model.get("shift"))&&!"2".equals(model.get("shift"))){
+            return failed("请传递早晚班数据！");
+        }
+        RESTfulResult result = omsTransOrderService.mergeDzOrder(model.get("shift").toString());
+        //生产详单和日报
+        if(result.getData()!=null&&result.getData() instanceof List){
+            List<BigDecimal> orderIds = (List<BigDecimal>) result.getData();
+            for(BigDecimal orderId : orderIds) {
+                Map<String, Object> searchMap = new HashMap<>();
+                searchMap.put("transOrderId", orderId.toString());
+                searchMap.put("userName", "admin");
+                Map<String, Object> transOrder = omsTransOrderMapper.getTransOrder(searchMap);
+                transOrder.put("userName", "admin");
+                Map<String, Object> map1 = emsFeign.emsdetailsordersAdd(transOrder);
+                Map<String,Object> map = new HashMap<>();
+                map.put("transOrderId",orderId);
+                RESTfulResult resTfulResult = reportFeign.generateOperateDaily(map);
+            }
+        }
+        return result;
+    }
+
+    @PostMapping("/disposeSyncDzOrder")
+    public RESTfulResult disposeSyncDzOrder() {
+        //获取1号到13号的数据
+        List<String> jsonStringList = omsTransOrderMapper.selectDzTransOrder();
+        for(String jsonString : jsonStringList) {
+            Map<String,Object> syncMap = JSONObject.parseObject(jsonString);
+            //获取匹配不到的数据,将其中身份证信息替换
+            //根据人员姓名去查
+            String isReWeight = DataChange.getString(syncMap.get("isReWeight"));
+            if("复磅".equals(isReWeight)) {
+                omsTransOrderService.syncProductionResult(syncMap);
+            }
+        }
+        return success();
+    }
+
+    @PostMapping("updateBfIcInfo")
+    public RESTfulResult updateBfIcInfo() {
+        List<Map<String,Object>> mapList = commonMapper.getHrInfo();
+        for(Map<String,Object> map : mapList) {
+            dzFeign.updateBfIcInfo(map);
+        }
+        return success();
+    }
+
+    @PostMapping("disposeDriverInfo")
+    public RESTfulResult disposeDriverInfo() {
+        List<Map<String,Object>> mapList = commonMapper.getHrInfo();
+        for(Map<String,Object> map:mapList) {
+            //查询人员数据
+            List<Map<String,Object>> mapList1 = commonMapper.getPinfo(map);
+            if(mapList1.size() == 0) {
+                //大概率是没有班组
+                commonMapper.updatePinfo(map);
+            }
+            if(mapList1.size() ==2) {
+                commonMapper.updatePinfo1(map);
+            }
+            if(mapList1 == null || mapList1.size() == 0 || mapList1.size() > 1) {
+                System.out.println(JSONObject.toJSONString(map));
+                System.out.println("==============");
+                System.out.println(mapList1.size());
+            }
+        }
+        return success();
+    }
+
+    @PostMapping("disposeSaleNum")
+    public RESTfulResult disposeSaleNum(@RequestBody Map<String,Object> map) {
+        //List<String> saleNoList = (List<String>) map.get("saleNoList");
+        //根据销售订单号获取子表id
+        List<BigDecimal> childIdList = commonMapper.getChildList(map);
+        //List<BigDecimal> childIdList = commonMapper.getChildListOrder(map);
+        for (BigDecimal requirementChildId : childIdList) {
+            omsTransOrderService.sumWeight(requirementChildId);
+        }
+        return success();
+    }
+
+    @PostMapping("updateMaterialNumber")
+    public RESTfulResult updateMaterialNumber() {
+        //获取未停用的计划子表ID
+        List<BigDecimal> planChildIds = omsTransOrderMapper.selectPlanChildIds();
+        for(BigDecimal planChildId : planChildIds) {
+            omsTransOrderService.sumWeightPlan(planChildId);
+        }
+        return success();
+    }
+
+
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 60)
+    @PostMapping("getInnerResult")
+    public void syncInnerResult() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        List<Map<String,Object>> mapList = dzFeign.getInnerResult();
+        for(Map<String,Object> map : mapList) {
+            omsTransOrderService.syncProductionResult(map);
+            //判断单据有没有同步成功
+            BigDecimal orderId = omsTransOrderMapper.selectOrderInfoByDB(map);
+            SyncProductList syncProductList = new SyncProductList();
+            if(orderId == null) {
+                syncProductList.setDeleted(1);
+            }else{
+                syncProductList.setDeleted(0);
+            }
+            JSONObject jsonObject = new JSONObject(map);
+            syncProductList.setPrimaryId(syncProductListMapper.nextId());
+            syncProductList.setDjlx("收货");
+            syncProductList.setDjbh(map.get("djbh").toString());
+            syncProductList.setMaterialName(map.get("materialName") == null ? "" : map.get("materialName").toString());
+            syncProductList.setProductList(jsonObject.toString());
+            syncProductList.setInsertTime(new Date());
+            syncProductListMapper.insert(syncProductList);
+        }
+    }
+
+    @PostMapping("reDispatchOrder")
+    public void reDispatchOrder() throws Exception {
+        omsTransOrderService.reDispatchOrder(new BigDecimal(772721));
+    }
+
+    @PostMapping("disposeResultList")
+    public void disposeResultList() {
+        List<String> strings = Arrays.asList("902410170022","902410210017");
+        for(String s : strings) {
+            Map<String, Object> objectObjectHashMap = new HashMap<>();
+            objectObjectHashMap.put("djbh",s);
+            List<Map<String,Object>> mapList = dzFeign.getProductionResultList(objectObjectHashMap);
+            for(Map<String,Object> map : mapList) {
+                omsTransOrderService.syncProductionResult(map);
+            }
+        }
+    }
+
+    @PostMapping("/restartPrice")
+    public void restartPrice() throws Exception {
+        List<BigDecimal> mapList = omsTransOrderMapper.getNeedOrderIds();
+        for(BigDecimal transOrderId :mapList) {
+            omsTransOrderService.updateTimeOrderStatus(transOrderId,"计时结束","admin");
+        }
+    }
+
+    @PostMapping("getErrorResult")
+    public void getErrorResult() {
+        List<String> stringList = dzFeign.getErrorResult();
+        for(String s : stringList) {
+            JSONObject jsonObject = null;
+            try {
+                System.out.println(s);
+                String res = s.replace("\"transOrderChildId\":,","\"transOrderChildId\":1,");
+                jsonObject = JSON.parseObject(res);
+                //根据运单号
+                BigDecimal transOrderChildId = omsTransOrderMapper.selectTransOrderChildId(jsonObject.get("transOrderNumber"));
+                //判断有没有净重
+                if(transOrderChildId == null) {
+                    continue;
+                }
+                jsonObject.put("transOrderChildId",transOrderChildId);
+                tmsWeightResultController.syncWeightResult(jsonObject);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            //if(jsonObject.get("transOrderNumber") != null && jsonObject.)
+            System.out.println(jsonObject);
+
+        }
+    }
+
+    //@PostMapping("syncWmsCarNo")
+    //@Scheduled(fixedDelay = 1000 * 60 * 20)
+    public void syncWmsCarNo() {
+        //查询上站型钢业务-同步;
+        List<Map<String,Object>> mapList = omsTransOrderMapper.selectWmsCarNo();
+        Map<String, Object> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("mapList",mapList);
+        tmiFeign.syncWmsCarNo(objectObjectHashMap);
+    }
+
+    //@PostMapping("deleteWmsCarNo")
+    //@Scheduled(fixedDelay = 1000 * 60 * 5)
+    public void deleteWmsCarNo() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        //查询上站型钢业务-删除;
+        List<Map<String,Object>> mapList = omsTransOrderMapper.selectDeleteWmsCarNo();
+        Map<String, Object> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("mapList",mapList);
+        tmiFeign.deleteWmsCarNo(objectObjectHashMap);
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 80)
+    public void restartSyncProduct() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        //针对同步失败的重新同步
+        List<Map<String,Object>> productList = syncProductListMapper.getFailedList();
+        for(Map<String,Object> map : productList) {
+            String s = map.get("productList").toString();
+            JSONObject jsonObject = JSON.parseObject(s);
+            omsTransOrderService.syncProductionResult(jsonObject);
+            //判断单据有没有同步成功
+            BigDecimal orderId = omsTransOrderMapper.selectOrderInfoByDB(jsonObject);
+            SyncProductList syncProductList = syncProductListMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("primaryId")));
+            if(orderId == null) {
+                syncProductList.setDeleted(1);
+                syncProductList.setAlternateFields1("多次重试仍失败");
+            }else{
+                syncProductList.setDeleted(0);
+                syncProductList.setAlternateFields1("");
+            }
+            syncProductListMapper.updateByPrimaryKeySelective(syncProductList);
+        }
+    }
+
+    @PostMapping("/updateProductList")
+    public void updateProductList() {
+        List<String> productList = omsTransOrderMapper.selectBluList();
+        for(String s : productList) {
+            JSONObject jsonObject = JSON.parseObject(s);
+            omsTransOrderService.syncProductionResult(jsonObject);
+        }
+    }
+
+    @ApiOperation("更新计划数量")
+    public void updatePlanNumber(){
+
+    }
+
+    @PostMapping("disposeInventoryData")
+    public void disposeInventoryData() {
+        List<Map<String,Object>> omsChildList = omsOrderChildMapper.getDzOrderIds();
+        for(Map<String,Object> map : omsChildList) {
+            tmsWeightResultService.transGridMaterial(DataChange.dataToBigDecimal(map.get("transOrderChildId")),
+                    DataChange.dataToBigDecimal(map.get("netWeight")),"dz","wl",DataChange.dataToDate(map.get("netWeightTime")));
+        }
+    }
+
+    @PostMapping("disposeListAggCapacity")
+    public RESTfulResult disposeListAggCapacity() {
+        //根据销售订单号获取子表id
+        List<BigDecimal> childIdList = commonMapper.getPlanChildList();
+        for (BigDecimal planChildId : childIdList) {
+            omsTransOrderService.listAggCapacity(planChildId);
+        }
+        return success();
+    }
+
+    @PostMapping("/syncNetWeightOrder")
+    //@Scheduled(fixedDelay = 1000 * 60 * 10)
+    public void syncNetWeightOrder() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        String businessScene = "采购";
+        List<String> cgNoWeightOrderIds = omsTransOrderMapper.getNoWeightOrderIds(businessScene);
+        Map<String, Object> map = new HashMap<>();
+        map.put("mapList",cgNoWeightOrderIds);
+        map.put("businessScene","采购");
+        List<Map<String,Object>> resList =  dzFeign.getNetWeightResult(map);
+        for(Map<String,Object> stringObjectMap : resList) {
+            stringObjectMap.put("netWeightTime",DataChange.dataToDate(stringObjectMap.get("netWeightTime")));
+            omsOrderChildMapper.updateNetWeightInfo(stringObjectMap);
+            omsOrderChildMapper.updateWeightResultInfo(stringObjectMap);
+        }
+        String businessScene1 = "销售";
+        List<String> xsNoWeightOrderIds = omsTransOrderMapper.getNoWeightOrderIds(businessScene1);
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("mapList",xsNoWeightOrderIds);
+        map1.put("businessScene","销售");
+        List<Map<String,Object>> resList1 =  dzFeign.getNetWeightResult(map1);
+        for(Map<String,Object> stringObjectMap : resList1) {
+            stringObjectMap.put("netWeightTime",DataChange.dataToDate(stringObjectMap.get("netWeightTime")));
+            omsOrderChildMapper.updateNetWeightInfo(stringObjectMap);
+        }
+    }
+
+    @Scheduled(fixedDelay = 1000 * 60 * 10)
+    public void fixedDispatch() throws Exception {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        omsTransOrderService.fixedDispatch();
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 60)
+    public int leavePersonInfo() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return 1;
+        }
+        //查询请假时间在系统时间一个小时以外的数据
+        //更新请假状态
+        List<Map<String, Object>> personnelMaps = commonMapper.selectLeaveInfo();
+        for(Map<String,Object> map : personnelMaps) {
+            BigDecimal personnelId = DataChange.dataToBigDecimal(map.get("personnelId"));
+            String time = map.get("time").toString();
+            String startTime = time.split("--")[0];
+            String endTime = time.split("--")[1];
+            //将转换成时间
+            Date startTimeDate = DataChange.dataToDate(startTime);
+            Date endTimeDate = DataChange.dataToDate(endTime);
+            if(startTimeDate.compareTo(new Date(new Date().getTime() + 120 * 60 * 1000)) <= 0 && endTimeDate.compareTo(new Date()) >= 0) {
+                //请假时间小于当前时间,则变更状态
+                commonMapper.updatePersonnelStatus(personnelId,3);
+            }
+        }
+        //查询需要复岗的请假数据
+        List<Map<String, Object>> fgPersonnelMaps = commonMapper.selectFgInfo();
+        for(Map<String,Object> map : fgPersonnelMaps) {
+            BigDecimal personnelId = DataChange.dataToBigDecimal(map.get("personnelId"));
+            String time = map.get("time").toString();
+            String startTime = time.split("--")[0];
+            String endTime = time.split("--")[1];
+            //将转换成时间
+            Date startTimeDate = DataChange.dataToDate(startTime);
+            Date endTimeDate = DataChange.dataToDate(endTime);
+            if(endTimeDate.compareTo(new Date()) <= 0) {
+                //请假时间小于当前时间,则变更状态
+                TmsComprehensiveResult tmsComprehensiveResult = tmsComprehensiveResultMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("resultId")));
+                tmsComprehensiveResult.setAlternateFields8("时间到,自动复岗");
+                tmsComprehensiveResult.setAlternateFields9("时间到,自动复岗");
+                tmsComprehensiveResultMapper.updateByPrimaryKey(tmsComprehensiveResult);
+                commonMapper.updatePersonnelStatus(personnelId,0);
+            }
+        }
+        //查询需要切换的借车数据
+        List<Map<String, Object>> fgJcMaps = commonMapper.selectJcInfo();
+        for(Map<String,Object> map : fgJcMaps) {
+            String time = map.get("time").toString();
+            String startTime = time.split("—")[0];
+            String endTime = time.split("—")[1];
+            //将转换成时间
+            Date startTimeDate = DataChange.dataToDate(startTime);
+            Date endTimeDate = DataChange.dataToDate(endTime);
+            if(endTimeDate.compareTo(new Date()) <= 0) {
+                //借车时间小于当前时间,则变更状态
+                TmsComprehensiveResult tmsComprehensiveResult = tmsComprehensiveResultMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("resultId")));
+                tmsComprehensiveResult.setAlternateFields8("时间到,自动还车");
+                tmsComprehensiveResult.setAlternateFields9("时间到,自动还车");
+                tmsComprehensiveResult.setAlternateFields20("系统自动还车");
+                tmsComprehensiveResultMapper.updateByPrimaryKey(tmsComprehensiveResult);
+                Map<String,Object> map1 = new HashMap<>();
+                map1.put("capacityDriverId",tmsComprehensiveResult.getAlternateFields19());
+                map1.put("deleted",1);
+                map1.put("alternateFields1","还车");
+                tmsComprehensiveResultMapper.updateCapacityStatus(DataChange.dataToBigDecimal(tmsComprehensiveResult.getAlternateFields11()),new BigDecimal(0));
+                //删除排班记录
+                tmsComprehensiveResultMapper.updateCapacityDriver(map1);
+            }
+        }
+        return 1;
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 10)
+    public void searchInnerIdCardNo() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        List<OmsTransOrder> omsTransOrderList = omsTransOrderMapper.selectInnerOrder();
+        for(OmsTransOrder omsTransOrder : omsTransOrderList) {
+            Map<String, Object> map1 = new HashMap<>();
+            map1.put("icBh",omsTransOrder.getAlternateFields32());
+            Map<String,Object> map = dzFeign.getIdcards(map1);
+            BigDecimal driverId = null;
+            Object driverName = map.get("driverName");
+            if(driverName != null) {
+                String driverName1 = driverName.toString().split("国六|电动")[0];
+                map.put("driverName",driverName1);
+            }
+            //根据身份证号查找司机
+            try {
+                driverId = omsTransOrderMapper.selectDriverId(map);
+            } catch (Exception e) {
+                e.printStackTrace();
+                //根据司机姓名去查询身份证号
+                try {
+                    String idCardNo = omsTransOrderMapper.getIdCardNo(map.get("driverName").toString());
+                    map.put("identityCard",idCardNo);
+                    driverId = omsTransOrderMapper.selectDriverId(map);
+                } catch (Exception exception) {
+                    exception.printStackTrace();
+                }
+                log.error("该身份证对应多个司机。");
+                //return "该身份证对应多个司机。";
+            }
+            if (driverId == null) {
+                try {
+                    String idCardNo = omsTransOrderMapper.getIdCardNo(map.get("driverName").toString());
+                    map.put("identityCard",idCardNo);
+                    driverId = omsTransOrderMapper.selectDriverId(map);
+                } catch (Exception exception) {
+                    exception.printStackTrace();
+                }
+                log.error("该身份证未对应到司机");
+                //return "该身份证未对应到司机";
+            }
+            BigDecimal capacityId = null;
+            String reg = "((厂内|场内){0,1}[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼]{1}[A-HJ-Z]{1}(([DF]{1}[A-HJ-NP-Z0-9]{1}[0-9]{4})|([0-9]{5}[DF]{1})|([A-HJ-NP-Z0-9]{5})))";
+            Pattern pattern = Pattern.compile(reg);
+            Matcher matcher = pattern.matcher(map.get("capacityNumber").toString().toUpperCase());
+            String capacityNo = null;
+            if(matcher.find()) {
+                capacityNo = matcher.group();
+                capacityId = omsTransOrderMapper.selectCapacityId(capacityNo);
+            }
+            omsTransOrder.setCapacityId(capacityId);
+            omsTransOrder.setDriverId(driverId);
+            entityDispose.disposeOmsTransOrder(omsTransOrder);
+            omsTransOrderMapper.updateByPrimaryKeySelective(omsTransOrder);
+        }
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 60 * 5)
+    public int autoGenerateQingRequirement() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return 1;
+        }
+        //生成清车底需求;
+        AmsTransRequirement amsTransRequirement = amsTransRequirementMapper.selectByPrimaryKey(new BigDecimal(1442083));
+        AmsRequirementChild amsRequirementChild = amsRequirementChildMapper.selectByPrimaryKey(new BigDecimal(1511586));
+        //新增
+        //生成白班需求
+        Calendar calendarBaiStart = Calendar.getInstance();
+        Calendar calendarBaiEnd = Calendar.getInstance();
+        calendarBaiStart.setTime(new Date());
+        calendarBaiStart.set(calendarBaiStart.get(Calendar.YEAR),calendarBaiStart.get(Calendar.MONTH),calendarBaiStart.get(Calendar.DAY_OF_MONTH),7,0,0);
+        calendarBaiEnd.set(calendarBaiStart.get(Calendar.YEAR),calendarBaiStart.get(Calendar.MONTH),calendarBaiStart.get(Calendar.DAY_OF_MONTH),19,0,0);
+        if(calendarBaiStart.getTime().compareTo(new Date()) <= 0) {
+            //return 0;
+        }else{
+            List<BigDecimal> transRequirementIds = amsTransRequirementMapper.selectQingRequirementIds(calendarBaiStart.getTime(),calendarBaiEnd.getTime());
+            if(transRequirementIds.size() > 0) {
+                //return 0;
+            }else{
+                amsTransRequirement.setTransRequirementId(amsTransRequirementMapper.nextId());
+                amsTransRequirement.setRequirementStartTime(calendarBaiStart.getTime());
+                amsTransRequirement.setRequirementEndTime(calendarBaiEnd.getTime());
+                amsTransRequirement.setRequirementType("白班");
+                amsTransRequirement.setDeleted(new BigDecimal(3));
+                amsTransRequirement.setInsertTime(new Date());
+                amsRequirementChild.setRequirementChildId(amsRequirementChildMapper.nextId());
+                amsRequirementChild.setTransRequirementId(amsTransRequirement.getTransRequirementId());
+                amsRequirementChild.setInsertTime(new Date());
+                amsTransRequirementMapper.insertSelective(amsTransRequirement);
+                amsRequirementChildMapper.insertSelective(amsRequirementChild);
+            };
+        }
+        //生成夜班需求
+        Calendar calendarYeStart = Calendar.getInstance();
+        Calendar calendarYeEnd = Calendar.getInstance();
+        calendarYeStart.setTime(new Date());
+        calendarYeStart.set(calendarYeStart.get(Calendar.YEAR),calendarYeStart.get(Calendar.MONTH),calendarYeStart.get(Calendar.DAY_OF_MONTH),19,0,0);
+        calendarYeEnd.set(calendarYeStart.get(Calendar.YEAR),calendarYeStart.get(Calendar.MONTH),calendarYeStart.get(Calendar.DAY_OF_MONTH) + 1,7,0,0);
+        if(calendarYeStart.getTime().compareTo(new Date()) <= 0) {
+            //return 0;
+        }else{
+            List<BigDecimal> transRequirementIdsYe = amsTransRequirementMapper.selectQingRequirementIds(calendarYeStart.getTime(),calendarYeEnd.getTime());
+            if(transRequirementIdsYe.size() > 0) {
+            }else{
+                amsTransRequirement.setTransRequirementId(amsTransRequirementMapper.nextId());
+                amsTransRequirement.setRequirementStartTime(calendarYeStart.getTime());
+                amsTransRequirement.setRequirementEndTime(calendarYeEnd.getTime());
+                amsTransRequirement.setRequirementType("夜班");
+                amsTransRequirement.setDeleted(new BigDecimal(3));
+                amsTransRequirement.setInsertTime(new Date());
+                amsRequirementChild.setRequirementChildId(amsRequirementChildMapper.nextId());
+                amsRequirementChild.setTransRequirementId(amsTransRequirement.getTransRequirementId());
+                amsRequirementChild.setInsertTime(new Date());
+                amsTransRequirementMapper.insertSelective(amsTransRequirement);
+                amsRequirementChildMapper.insertSelective(amsRequirementChild);
+            }
+        }
+        return 1;
+    }
+
+
+
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 3)
+    public void autoDispatchDiaoChe() throws Exception {
+        //派清车底，优先派
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        //白班
+        String requirementType = "白班";
+        List<Map<String,Object>> mapListRenGonBai = commonMapper.selectQingRequirement(requirementType);
+        for(int i = 0 ; i < mapListRenGonBai.size() ; i++) {
+            //查询今天该轮到谁
+            //数据
+            Map<String,Object> map = mapListRenGonBai.get(i);
+            // 判断是否判单
+            List<BigDecimal> orderList = commonMapper.getOrderListByChild(DataChange.dataToBigDecimal(map.get("requirementChildId")));
+            if(orderList != null && orderList.size() > 0) {
+                continue;
+            }
+            //查询清车底的上一个排序是谁
+            Map<String,Object> lastCarInfo = commonMapper.getLastQingCar(requirementType);
+            int  lastSqe = DataChange.dataToBigDecimal(lastCarInfo.get("sqe")).intValue();
+            Integer sort = lastSqe % 9 + 1;
+            //查询数据
+            List<Map<String,Object>> personnelIds = commonMapper.selectQingPersonnelId(sort,requirementType);
+            Map<String, Object> dispatchMap = new HashMap<>();
+            dispatchMap.put("carrierId",37019);
+            dispatchMap.put("capacityTypeId",map.get("capacityTypeId"));
+            dispatchMap.put("requirementChildId",map.get("requirementChildId"));
+            dispatchMap.put("businessType",map.get("businessType"));
+            dispatchMap.put("capacityTypeName",map.get("capacityTypeName"));
+            dispatchMap.put("carrierId",37019);
+            dispatchMap.put("userName","系统");
+            dispatchMap.put("userId","系统");
+            dispatchMap.put("list",personnelIds);
+            try {
+                omsTransOrderService.dispatchTask(dispatchMap);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        //查询清车底的班次
+        //夜班
+        String requirementType1 = "夜班";
+        List<Map<String,Object>> mapListRenGonYe = commonMapper.selectQingRequirement(requirementType1);
+        for(int i = 0 ; i < mapListRenGonYe.size() ; i++) {
+            //查询今天该轮到谁
+            //数据
+            Map<String,Object> map = mapListRenGonYe.get(i);
+            // 判断是否判单
+            List<BigDecimal> orderList = commonMapper.getOrderListByChild(DataChange.dataToBigDecimal(map.get("requirementChildId")));
+            if(orderList != null && orderList.size() > 0) {
+                continue;
+            }
+            //查询清车底的上一个排序是谁
+            Map<String,Object> lastCarInfo = commonMapper.getLastQingCar(requirementType1);
+            int  lastSqe = DataChange.dataToBigDecimal(lastCarInfo.get("sqe")).intValue();
+            Integer sort = lastSqe % 9 + 1;
+            //查询数据
+            List<Map<String,Object>> personnelIds = commonMapper.selectQingPersonnelId(sort,requirementType1);
+            Map<String, Object> dispatchMap = new HashMap<>();
+            dispatchMap.put("carrierId",37019);
+            dispatchMap.put("capacityTypeId",map.get("capacityTypeId"));
+            dispatchMap.put("requirementChildId",map.get("requirementChildId"));
+            dispatchMap.put("businessType",map.get("businessType"));
+            dispatchMap.put("capacityTypeName",map.get("capacityTypeName"));
+            dispatchMap.put("userName","系统");
+            dispatchMap.put("userId","系统");
+            dispatchMap.put("list",personnelIds);
+            try {
+                omsTransOrderService.dispatchTask(dispatchMap);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        //派吊车,查询未派发的站台装卸需求；---上站卸货
+        List<Map<String,Object>> mapList = commonMapper.selectNoDispatchRequirementZtZx();
+        //获取长度及序号
+        for(Map<String,Object> map : mapList) {
+                // 判断是否判单
+                List<BigDecimal> orderList = commonMapper.getOrderListByChild(DataChange.dataToBigDecimal(map.get("requirementChildId")));
+                if(orderList != null && orderList.size() > 0) {
+                    continue;
+                }
+                BigDecimal capacityTypeId = DataChange.dataToBigDecimal(map.get("capacityTypeId"));
+                Date requirementStartTime = DataChange.dataToDate(map.get("requirementStartTime"));
+                Date requirementEndTime = DataChange.dataToDate(map.get("requirementEndTime"));
+                Calendar startTimeCal = Calendar.getInstance();
+                startTimeCal.setTime(requirementStartTime);
+                Calendar endTimeCal = Calendar.getInstance();
+                endTimeCal.setTime(requirementEndTime);
+                // 获取开始时间
+                int startHours = startTimeCal.get(Calendar.HOUR_OF_DAY);
+                // 获取结束时间
+                int endHours = endTimeCal.get(Calendar.HOUR_OF_DAY);
+                List<Integer> startArrayList1 = Arrays.asList(7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19);
+                List<Integer> endArrayList1 = Arrays.asList(7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19);
+                List<Integer> startArrayList2 = Arrays.asList(19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6);
+                List<Integer> endArrayList2 = Arrays.asList(19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7,8);
+                //如果开始时间大于七点，并且结束时间小于19点，就是早班
+                String flag = "";
+                if(startArrayList1.contains(startHours) && endArrayList1.contains(endHours)) {
+                    flag = "白班";
+                }
+                if(startArrayList2.contains(startHours) && endArrayList2.contains(endHours)) {
+                    flag = "夜班";
+                }
+                String personnelNo = map.get("personnelNo").toString();
+                if("无".equals(personnelNo)) {
+                    //不需要吊挂工；
+                    personnelNo = "0";
+                }
+                BigDecimal personnelNumber = DataChange.dataToBigDecimal(personnelNo);
+                if("白班".equals(flag)) {
+                    //匹配甲班、空闲中的、运力、司机数据
+                    Map<String, Object> objectObjectHashMap = new HashMap<>();
+                    objectObjectHashMap.put("capacityTypeId",capacityTypeId);
+                    objectObjectHashMap.put("shift","白班");
+                    // 查询所有运力
+                    List<Map<String,Object>> capacityInfoList = commonMapper.getCapacityMes(objectObjectHashMap);
+                    String clFlag = "";
+                    if(capacityInfoList.size() > 0 && capacityInfoList.get(0).get("capacityInnerNumber").toString().contains("甲")) {
+                        clFlag = "甲";
+                    }else{
+                        clFlag = "乙";
+                    }
+                    Map<String,Object> lastCarInfo = commonMapper.getLastCarInfo(clFlag);
+                    int  lastSqe = DataChange.dataToBigDecimal(lastCarInfo.get("sqe")).intValue();
+                    Map<String,Object> capacityMesMap = new HashMap<>();
+                    int k = 0;
+                    for(int j = lastSqe % 9 + 1 ; j <= 9 && k <= 9; j = j % 9 + 1 ) {
+                        for(int i = 0 ; i < capacityInfoList.size() ; i++) {
+                            //遍历第一个数，是lastSqe后的第一个数
+                            int lastSqeCpa = DataChange.dataToBigDecimal(capacityInfoList.get(i).get("sort")).intValue();
+                            if(lastSqeCpa == j) {
+                                Map<String,Object> capacityInfoMap = capacityInfoList.get(i);
+                                BigDecimal capacityId = DataChange.dataToBigDecimal(capacityInfoMap.get("capacityId"));
+                                BigDecimal driverId = DataChange.dataToBigDecimal(capacityInfoMap.get("driverId"));
+                                BigDecimal sort = DataChange.dataToBigDecimal(capacityInfoMap.get("sort"));
+                                String schStatus = capacityInfoMap.get("schStatus").toString();
+                                if(!"正常".equals(schStatus)) {
+                                    continue;
+                                }
+                                //判断车辆是否作业状态
+                                int countOrder = commonMapper.getCapacityStatus(capacityId);
+                                int countOrderZcp = commonMapper.getCapacityStatusZcp(capacityId);
+                                if(countOrder > 0 && countOrder != countOrderZcp) {
+                                    //装车皮业务与所有业务都相等，说明可以继续派车
+                                    continue;
+                                }
+                                int driverCountOrder = commonMapper.getDriverStatus(driverId);
+                                int driverCountOrderZcp = commonMapper.getDriverStatusZcp(driverId);
+                                if(driverCountOrder > 0 && driverCountOrderZcp != driverCountOrder) {
+                                    continue;
+                                }
+                                capacityMesMap = capacityInfoMap;
+                                break;
+                            }
+                        }
+                        if(capacityMesMap.size() > 0) {
+                            break;
+                        }
+                        k++;
+                    }
+                    List<Map<String,Object>> tableList = new ArrayList<>();
+                    if(capacityMesMap.size() > 0) {
+                        Map<String, Object> dispatchMap = new HashMap<>();
+                        dispatchMap.put("carrierId",37019);
+                        dispatchMap.put("capacityTypeId",capacityTypeId);
+                        dispatchMap.put("requirementChildId",map.get("requirementChildId"));
+                        dispatchMap.put("businessType",map.get("businessType"));
+                        dispatchMap.put("capacityTypeName",map.get("capacityTypeName"));
+                        dispatchMap.put("userName","系统");
+                        dispatchMap.put("userId","系统");
+                        //如果是一个人
+                        tableList.add(capacityMesMap);
+                        dispatchMap.put("list",tableList);
+                        try {
+                            omsTransOrderService.dispatchTask(dispatchMap);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        //上面去派车,下面是派人工
+                        Map<String, Object> dispatchMap1 = new HashMap<>();
+                        dispatchMap1.put("carrierId",37019);
+                        dispatchMap1.put("capacityTypeId",969904);
+                        dispatchMap1.put("requirementChildId",map.get("requirementChildId"));
+                        dispatchMap1.put("businessType",map.get("businessType"));
+                        dispatchMap1.put("capacityTypeName","业务处人工队");
+                        dispatchMap1.put("userName","系统");
+                        dispatchMap1.put("userId","系统");
+                        Map<String,Object> alternateFields11Map = commonMapper.getZhiHuiGongId(capacityMesMap.get("capacityId"));
+                        List<Map<String,Object>> diaoGuaGongIds = commonMapper.getDiaoGuaGongIds(capacityMesMap.get("capacityId"),personnelNumber);
+                        List<Map<String,Object>> tableList1 = new ArrayList<>();
+                        if(alternateFields11Map != null) {
+                            tableList1.add(alternateFields11Map);
+                        }
+                        if(diaoGuaGongIds != null && diaoGuaGongIds.size() > 0) {
+                            tableList1.addAll(diaoGuaGongIds);
+                        }
+                        dispatchMap1.put("list",tableList1);
+                        try {
+                            omsTransOrderService.dispatchTask(dispatchMap1);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }else{
+                        continue;
+                    }
+                    //指挥工
+                }else if("夜班".equals(flag)) {
+                    //匹配甲班、空闲中的、运力、司机数据
+                    Map<String, Object> objectObjectHashMap = new HashMap<>();
+                    objectObjectHashMap.put("capacityTypeId",capacityTypeId);
+                    objectObjectHashMap.put("shift","夜班");
+                    // 查询所有运力
+                    List<Map<String,Object>> capacityInfoList = commonMapper.getCapacityMes(objectObjectHashMap);
+                    String clFlag = "";
+                    if(capacityInfoList.size() > 0 && capacityInfoList.get(0).get("capacityInnerNumber").toString().contains("甲")) {
+                        clFlag = "甲";
+                    }else{
+                        clFlag = "乙";
+                    }
+                    Map<String,Object> lastCarInfo = commonMapper.getLastCarInfo(clFlag);
+                    int  lastSqe = DataChange.dataToBigDecimal(lastCarInfo.get("sqe")).intValue();
+                    Map<String,Object> capacityMesMap = new HashMap<>();
+                    int k = 0;
+                    for(int j = lastSqe % 9 + 1 ; j <= 9 && k <= 9; j = j % 9 + 1 ) {
+                        for(int i = 0 ; i < capacityInfoList.size() ; i++) {
+                            //遍历第一个数，是lastSqe后的第一个数
+                            int lastSqeCpa = DataChange.dataToBigDecimal(capacityInfoList.get(i).get("sort")).intValue();
+                            if(lastSqeCpa == j) {
+                                Map<String,Object> capacityInfoMap = capacityInfoList.get(i);
+                                BigDecimal capacityId = DataChange.dataToBigDecimal(capacityInfoMap.get("capacityId"));
+                                BigDecimal driverId = DataChange.dataToBigDecimal(capacityInfoMap.get("driverId"));
+                                BigDecimal sort = DataChange.dataToBigDecimal(capacityInfoMap.get("sort"));
+                                String schStatus = capacityInfoMap.get("schStatus").toString();
+                                if(!"正常".equals(schStatus)) {
+                                    continue;
+                                }
+                                //判断车辆是否作业状态
+                                int countOrder = commonMapper.getCapacityStatus(capacityId);
+                                int countOrderZcp = commonMapper.getCapacityStatusZcp(capacityId);
+                                if(countOrder > 0 && countOrder != countOrderZcp) {
+                                    //装车皮业务与所有业务都相等，说明可以继续派车
+                                    continue;
+                                }
+                                int driverCountOrder = commonMapper.getDriverStatus(driverId);
+                                int driverCountOrderZcp = commonMapper.getDriverStatusZcp(driverId);
+                                if(driverCountOrder > 0 && driverCountOrderZcp != driverCountOrder) {
+                                    continue;
+                                }
+                                capacityMesMap = capacityInfoMap;
+                                break;
+                            }
+                        }
+                        if(capacityMesMap.size() > 0) {
+                            break;
+                        }
+                        k++;
+                    }
+                    List<Map<String,Object>> tableList = new ArrayList<>();
+                    if(capacityMesMap.size() > 0) {
+                        Map<String, Object> dispatchMap = new HashMap<>();
+                        dispatchMap.put("carrierId",37019);
+                        dispatchMap.put("capacityTypeId",capacityTypeId);
+                        dispatchMap.put("requirementChildId",map.get("requirementChildId"));
+                        dispatchMap.put("businessType",map.get("businessType"));
+                        dispatchMap.put("capacityTypeName",map.get("capacityTypeName"));
+                        dispatchMap.put("userName","系统");
+                        dispatchMap.put("userId","系统");
+                        //如果是一个人
+                        tableList.add(capacityMesMap);
+                        dispatchMap.put("list",tableList);
+                        try {
+                            omsTransOrderService.dispatchTask(dispatchMap);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                        //上面去派车,下面是派人工
+                        Map<String, Object> dispatchMap1 = new HashMap<>();
+                        dispatchMap1.put("carrierId",37019);
+                        dispatchMap1.put("capacityTypeId",969904);
+                        dispatchMap1.put("requirementChildId",map.get("requirementChildId"));
+                        dispatchMap1.put("businessType",map.get("businessType"));
+                        dispatchMap1.put("capacityTypeName","业务处人工队");
+                        dispatchMap1.put("userName","系统");
+                        dispatchMap1.put("userId","系统");
+                        Map<String,Object> alternateFields11Map = commonMapper.getZhiHuiGongId(capacityMesMap.get("capacityId"));
+                        List<Map<String,Object>> diaoGuaGongIds = commonMapper.getDiaoGuaGongIds(capacityMesMap.get("capacityId"),personnelNumber);
+                        List<Map<String,Object>> tableList1 = new ArrayList<>();
+                        if(alternateFields11Map != null) {
+                            tableList1.add(alternateFields11Map);
+                        }
+                        if(diaoGuaGongIds != null && diaoGuaGongIds.size() > 0) {
+                            tableList1.addAll(diaoGuaGongIds);
+                        }
+                        dispatchMap1.put("list",tableList1);
+                        try {
+                            omsTransOrderService.dispatchTask(dispatchMap1);
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }else{
+                        continue;
+                    }
+                }
+        }
+        // 派发装车皮
+        List<Map<String,Object>> mapListZcp = commonMapper.selectZcpNoDispatchRequirementZtZx();
+        //获取长度及序号
+        for(Map<String,Object> map : mapListZcp) {
+            // 判断是否判单
+            List<BigDecimal> orderList = commonMapper.getOrderListByChild(DataChange.dataToBigDecimal(map.get("requirementChildId")));
+            if(orderList != null && orderList.size() > 0) {
+                continue;
+            }
+            BigDecimal capacityTypeId = DataChange.dataToBigDecimal(map.get("capacityTypeId"));
+            Date requirementStartTime = DataChange.dataToDate(map.get("requirementStartTime"));
+            Date requirementEndTime = DataChange.dataToDate(map.get("requirementEndTime"));
+            Calendar startTimeCal = Calendar.getInstance();
+            startTimeCal.setTime(requirementStartTime);
+            Calendar endTimeCal = Calendar.getInstance();
+            endTimeCal.setTime(requirementEndTime);
+            // 获取开始时间
+            int startHours = startTimeCal.get(Calendar.HOUR_OF_DAY);
+            // 获取结束时间
+            int endHours = endTimeCal.get(Calendar.HOUR_OF_DAY);
+            List<Integer> startArrayList1 = Arrays.asList(7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19);
+            List<Integer> endArrayList1 = Arrays.asList(7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19);
+            List<Integer> startArrayList2 = Arrays.asList(19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6);
+            List<Integer> endArrayList2 = Arrays.asList(19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7,8);
+            //如果开始时间大于七点，并且结束时间小于19点，就是早班
+            String flag = "";
+            if(startArrayList1.contains(startHours) && endArrayList1.contains(endHours)) {
+                flag = "白班";
+            }
+            if(startArrayList2.contains(startHours) && endArrayList2.contains(endHours)) {
+                flag = "夜班";
+            }
+            String personnelNo = map.get("personnelNo").toString();
+            if("无".equals(personnelNo)) {
+                //不需要吊挂工；
+                personnelNo = "0";
+            }
+            BigDecimal personnelNumber = DataChange.dataToBigDecimal(personnelNo);
+            if("白班".equals(flag)) {
+                //匹配甲班、空闲中的、运力、司机数据
+                Map<String, Object> objectObjectHashMap = new HashMap<>();
+                objectObjectHashMap.put("capacityTypeId",capacityTypeId);
+                objectObjectHashMap.put("shift","白班");
+                // 查询所有运力
+                List<Map<String,Object>> capacityInfoList = commonMapper.getCapacityMes(objectObjectHashMap);
+                String clFlag = "";
+                if(capacityInfoList.size() > 0 && capacityInfoList.get(0).get("capacityInnerNumber").toString().contains("甲")) {
+                    clFlag = "甲";
+                }else{
+                    clFlag = "乙";
+                }
+                Map<String,Object> lastCarInfo = commonMapper.getZcpLastCarInfo(clFlag);
+                int  lastSqe = DataChange.dataToBigDecimal(lastCarInfo.get("sqe")).intValue();
+                Map<String,Object> capacityMesMap = new HashMap<>();
+                int k = 0 ;
+                for(int j = lastSqe % 9 + 1 ; j <= 9 && k <= 9; j = j % 9 + 1) {
+                    for(int i = 0 ; i < capacityInfoList.size() ; i++) {
+                        //遍历第一个数，是lastSqe后的第一个数
+                        int lastSqeCpa = DataChange.dataToBigDecimal(capacityInfoList.get(i).get("sort")).intValue();
+                        if(lastSqeCpa == j) {
+                            Map<String,Object> capacityInfoMap = capacityInfoList.get(i);
+                            BigDecimal capacityId = DataChange.dataToBigDecimal(capacityInfoMap.get("capacityId"));
+                            BigDecimal driverId = DataChange.dataToBigDecimal(capacityInfoMap.get("driverId"));
+                            BigDecimal sort = DataChange.dataToBigDecimal(capacityInfoMap.get("sort"));
+                            String schStatus = capacityInfoMap.get("schStatus").toString();
+                            if(!"正常".equals(schStatus)) {
+                                break;
+                            }
+                            //判断车辆是否作业状态
+                            int countOrder = commonMapper.getCapacityStatus(capacityId);
+                            if(countOrder > 0) {
+                                break;
+                            }
+                            int driverCountOrder = commonMapper.getDriverStatus(driverId);
+                            if(driverCountOrder > 0) {
+                                break;
+                            }
+                            capacityMesMap = capacityInfoMap;
+                            break;
+                        }
+                    }
+                    if(capacityMesMap.size() > 0) {
+                        break;
+                    }
+                    k++;
+                }
+                List<Map<String,Object>> tableList = new ArrayList<>();
+                if(capacityMesMap.size() > 0) {
+                    Map<String, Object> dispatchMap = new HashMap<>();
+                    dispatchMap.put("carrierId",37019);
+                    dispatchMap.put("capacityTypeId",capacityTypeId);
+                    dispatchMap.put("requirementChildId",map.get("requirementChildId"));
+                    dispatchMap.put("businessType",map.get("businessType"));
+                    dispatchMap.put("capacityTypeName",map.get("capacityTypeName"));
+                    dispatchMap.put("userName","系统");
+                    dispatchMap.put("userId","系统");
+                    //如果是一个人
+                    tableList.add(capacityMesMap);
+                    dispatchMap.put("list",tableList);
+                    try {
+                        omsTransOrderService.dispatchTask(dispatchMap);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    //上面去派车,下面是派人工
+                    Map<String, Object> dispatchMap1 = new HashMap<>();
+                    dispatchMap1.put("carrierId",37019);
+                    dispatchMap1.put("capacityTypeId",969904);
+                    dispatchMap1.put("requirementChildId",map.get("requirementChildId"));
+                    dispatchMap1.put("businessType",map.get("businessType"));
+                    dispatchMap1.put("capacityTypeName","业务处人工队");
+                    dispatchMap1.put("userName","系统");
+                    dispatchMap1.put("userId","系统");
+                    Map<String,Object> alternateFields11Map = commonMapper.getZhiHuiGongId(capacityMesMap.get("capacityId"));
+                    List<Map<String,Object>> diaoGuaGongIds = commonMapper.getDiaoGuaGongIds(capacityMesMap.get("capacityId"),personnelNumber);
+                    List<Map<String,Object>> tableList1 = new ArrayList<>();
+                    if(alternateFields11Map != null) {
+                        tableList1.add(alternateFields11Map);
+                    }
+                    if(diaoGuaGongIds != null && diaoGuaGongIds.size() > 0) {
+                        tableList1.addAll(diaoGuaGongIds);
+                    }
+                    dispatchMap1.put("list",tableList1);
+                    try {
+                        omsTransOrderService.dispatchTask(dispatchMap1);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }else{
+                    continue;
+                }
+                //指挥工
+            }else if("夜班".equals(flag)) {
+                //匹配甲班、空闲中的、运力、司机数据
+                Map<String, Object> objectObjectHashMap = new HashMap<>();
+                objectObjectHashMap.put("capacityTypeId",capacityTypeId);
+                objectObjectHashMap.put("shift","夜班");
+                // 查询所有运力
+                String clFlag = "";
+                List<Map<String,Object>> capacityInfoList = commonMapper.getCapacityMes(objectObjectHashMap);
+                if(capacityInfoList.size() > 0 && capacityInfoList.get(0).get("capacityInnerNumber").toString().contains("甲")) {
+                    clFlag = "甲";
+                }else{
+                    clFlag = "乙";
+                }
+                Map<String,Object> lastCarInfo = commonMapper.getZcpLastCarInfo(clFlag);
+                int  lastSqe = DataChange.dataToBigDecimal(lastCarInfo.get("sqe")).intValue();
+                Map<String,Object> capacityMesMap = new HashMap<>();
+                int k = 0;
+                for(int j = lastSqe % 9 + 1 ; j <= 9 && k<=9; j = j % 9 + 1) {
+                    for(int i = 0 ; i < capacityInfoList.size() ; i++) {
+                        //遍历第一个数，是lastSqe后的第一个数
+                        int lastSqeCpa = DataChange.dataToBigDecimal(capacityInfoList.get(i).get("sort")).intValue();
+                        if(lastSqeCpa == j) {
+                            Map<String,Object> capacityInfoMap = capacityInfoList.get(i);
+                            BigDecimal capacityId = DataChange.dataToBigDecimal(capacityInfoMap.get("capacityId"));
+                            BigDecimal driverId = DataChange.dataToBigDecimal(capacityInfoMap.get("driverId"));
+                            BigDecimal sort = DataChange.dataToBigDecimal(capacityInfoMap.get("sort"));
+                            String schStatus = capacityInfoMap.get("schStatus").toString();
+                            if(!"正常".equals(schStatus)) {
+                                continue;
+                            }
+                            //判断车辆是否作业状态
+                            int countOrder = commonMapper.getCapacityStatus(capacityId);
+                            if(countOrder > 0) {
+                                continue;
+                            }
+                            int driverCountOrder = commonMapper.getDriverStatus(driverId);
+                            if(driverCountOrder > 0) {
+                                continue;
+                            }
+                            capacityMesMap = capacityInfoMap;
+                            break;
+                        }
+                    }
+                    if(capacityMesMap.size() > 0) {
+                        break;
+                    }
+                    k++;
+                }
+                List<Map<String,Object>> tableList = new ArrayList<>();
+                if(capacityMesMap.size() > 0) {
+                    Map<String, Object> dispatchMap = new HashMap<>();
+                    dispatchMap.put("carrierId",37019);
+                    dispatchMap.put("capacityTypeId",capacityTypeId);
+                    dispatchMap.put("requirementChildId",map.get("requirementChildId"));
+                    dispatchMap.put("businessType",map.get("businessType"));
+                    dispatchMap.put("capacityTypeName",map.get("capacityTypeName"));
+                    dispatchMap.put("userName","系统");
+                    dispatchMap.put("userId","系统");
+                    //如果是一个人
+                    tableList.add(capacityMesMap);
+                    dispatchMap.put("list",tableList);
+                    try {
+                        omsTransOrderService.dispatchTask(dispatchMap);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    //上面去派车,下面是派人工
+                    Map<String, Object> dispatchMap1 = new HashMap<>();
+                    dispatchMap1.put("carrierId",37019);
+                    dispatchMap1.put("capacityTypeId",969904);
+                    dispatchMap1.put("requirementChildId",map.get("requirementChildId"));
+                    dispatchMap1.put("businessType",map.get("businessType"));
+                    dispatchMap1.put("capacityTypeName","业务处人工队");
+                    dispatchMap1.put("userName","系统");
+                    dispatchMap1.put("userId","系统");
+                    Map<String,Object> alternateFields11Map = commonMapper.getZhiHuiGongId(capacityMesMap.get("capacityId"));
+                    List<Map<String,Object>> diaoGuaGongIds = commonMapper.getDiaoGuaGongIds(capacityMesMap.get("capacityId"),personnelNumber);
+                    List<Map<String,Object>> tableList1 = new ArrayList<>();
+                    if(alternateFields11Map != null) {
+                        tableList1.add(alternateFields11Map);
+                    }
+                    if(diaoGuaGongIds != null && diaoGuaGongIds.size() > 0) {
+                        tableList1.addAll(diaoGuaGongIds);
+                    }
+                    dispatchMap1.put("list",tableList1);
+                    try {
+                        omsTransOrderService.dispatchTask(dispatchMap1);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }else{
+                    continue;
+                }
+            }
+        }
+        //派吊车,查询未派发的外出需求；
+        List<Map<String,Object>> map1List = commonMapper.selectNoDispatchRequirement();
+        for(Map<String,Object> map : map1List) {
+            // 判断是否判单
+            List<BigDecimal> orderList = commonMapper.getOrderListByChild(DataChange.dataToBigDecimal(map.get("requirementChildId")));
+            if(orderList != null && orderList.size() > 0) {
+                continue;
+            }
+            BigDecimal capacityTypeId = DataChange.dataToBigDecimal(map.get("capacityTypeId"));
+            Date requirementStartTime = DataChange.dataToDate(map.get("requirementStartTime"));
+            Date requirementEndTime = DataChange.dataToDate(map.get("requirementEndTime"));
+            Calendar startTimeCal = Calendar.getInstance();
+            startTimeCal.setTime(requirementStartTime);
+            Calendar endTimeCal = Calendar.getInstance();
+            endTimeCal.setTime(requirementEndTime);
+            // 获取开始时间
+            int startHours = startTimeCal.get(Calendar.HOUR_OF_DAY);
+            // 获取结束时间
+            int endHours = endTimeCal.get(Calendar.HOUR_OF_DAY);
+            List<Integer> startArrayList1 = Arrays.asList(7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19);
+            List<Integer> endArrayList1 = Arrays.asList(7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19);
+            List<Integer> startArrayList2 = Arrays.asList(19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6);
+            List<Integer> endArrayList2 = Arrays.asList(19, 20, 21, 22, 23, 24, 0, 1, 2, 3, 4, 5, 6, 7,8);
+            //如果开始时间大于七点，并且结束时间小于19点，就是早班
+            String flag = "";
+            if(startArrayList1.contains(startHours) && endArrayList1.contains(endHours)) {
+                flag = "白班";
+            }
+            if(startArrayList2.contains(startHours) && endArrayList2.contains(endHours)) {
+                flag = "夜班";
+            }
+            String personnelNo = map.get("personnelNo").toString();
+            if("无".equals(personnelNo)) {
+                //不需要吊挂工；
+                personnelNo = "0";
+            }
+            BigDecimal personnelNumber = DataChange.dataToBigDecimal(personnelNo);
+            if("白班".equals(flag)) {
+                //匹配甲班、空闲中的、运力、司机数据
+                Map<String, Object> objectObjectHashMap = new HashMap<>();
+                objectObjectHashMap.put("capacityTypeId",capacityTypeId);
+                objectObjectHashMap.put("shift","白班");
+                objectObjectHashMap.put("allShift","1");
+                //获取长白班车辆，优先派长白班
+                List<Map<String,Object>> capacityInfoListCbb = commonMapper.getCbbCapacityMes(objectObjectHashMap);
+                Map<String,Object> capacityMesMap = new HashMap<>();
+                for(int i = 0 ; i < capacityInfoListCbb.size() ; i++) {
+                    if(personnelNumber.compareTo(BigDecimal.ZERO) == 1) {
+                        //如果需要人工,则不能派长白班吊车
+                        continue;
+                    }
+                    //遍历第一个数，是lastsqe后的第一个数
+                    Map<String,Object> capacityInfoMap = capacityInfoListCbb.get(i);
+                    BigDecimal capacityId = DataChange.dataToBigDecimal(capacityInfoMap.get("capacityId"));
+                    BigDecimal driverId = DataChange.dataToBigDecimal(capacityInfoMap.get("driverId"));
+                    BigDecimal sort = DataChange.dataToBigDecimal(capacityInfoMap.get("sort"));
+                    String schStatus = capacityInfoMap.get("schStatus").toString();
+                    if(!"正常".equals(schStatus)) {
+                        continue;
+                    }
+                    //判断车辆是否作业状态
+                    int countOrder = commonMapper.getWcCapacityStatus(capacityId);
+                    int countOrderZcp = commonMapper.getCapacityStatusZcp(capacityId);
+                    if(countOrder > 0 && countOrder != countOrderZcp) {
+                        //装车皮业务与所有业务都相等，说明可以继续派车
+                        continue;
+                    }
+                    int driverCountOrder = commonMapper.getDriverStatus(driverId);
+                    int driverCountOrderZcp = commonMapper.getDriverStatusZcp(driverId);
+                    if(driverCountOrder > 0 && driverCountOrderZcp != driverCountOrder) {
+                        continue;
+                    }
+                    capacityMesMap = capacityInfoMap;
+                    break;
+                }
+                if(capacityMesMap.get("driverId") == null) {
+                    List<Map<String,Object>> capacityInfoList = commonMapper.getCapacityMes(objectObjectHashMap);
+                    String clFlag = "";
+                    if(capacityInfoList.size() > 0 && capacityInfoList.get(0).get("capacityInnerNumber").toString().contains("甲")) {
+                        clFlag = "甲";
+                    }else{
+                        clFlag = "乙";
+                    }
+                    Map<String,Object> lastCarInfo = commonMapper.getLastCarInfoJx(clFlag);
+                    int  lastSqe = DataChange.dataToBigDecimal(lastCarInfo.get("sqe")).intValue();
+                    for(int i = 0 ; i < capacityInfoList.size()  ; i++) {
+                        //遍历第一个数，是lastsqe后的第一个数
+                        Map<String,Object> capacityInfoMap = null;
+                        try {
+                            capacityInfoMap = capacityInfoList.get((lastSqe + i) % capacityInfoList.size());
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            continue;
+                        }
+                        BigDecimal capacityId = DataChange.dataToBigDecimal(capacityInfoMap.get("capacityId"));
+                        BigDecimal driverId = DataChange.dataToBigDecimal(capacityInfoMap.get("driverId"));
+                        BigDecimal sort = DataChange.dataToBigDecimal(capacityInfoMap.get("sort"));
+                        String schStatus = capacityInfoMap.get("schStatus").toString();
+                        if(!"正常".equals(schStatus)) {
+                            continue;
+                        }
+                        //判断车辆是否作业状态
+                        int countOrder = commonMapper.getCapacityStatus(capacityId);
+                        int countOrderZcp = commonMapper.getCapacityStatusZcp(capacityId);
+                        if(countOrder > 0 && countOrder != countOrderZcp) {
+                            //装车皮业务与所有业务都相等，说明可以继续派车
+                            continue;
+                        }
+                        int driverCountOrder = commonMapper.getDriverStatus(driverId);
+                        int driverCountOrderZcp = commonMapper.getDriverStatusZcp(driverId);
+                        if(driverCountOrder > 0 && driverCountOrderZcp != driverCountOrder) {
+                            continue;
+                        }
+                        capacityMesMap = capacityInfoMap;
+                        break;
+                    }
+                }
+                List<Map<String,Object>> tableList = new ArrayList<>();
+                if(capacityMesMap.size() > 0) {
+                    Map<String, Object> dispatchMap = new HashMap<>();
+                    dispatchMap.put("carrierId",37019);
+                    dispatchMap.put("capacityTypeId",capacityTypeId);
+                    dispatchMap.put("requirementChildId",map.get("requirementChildId"));
+                    dispatchMap.put("businessType",map.get("businessType"));
+                    dispatchMap.put("capacityTypeName",map.get("capacityTypeName"));
+                    dispatchMap.put("userName","系统");
+                    dispatchMap.put("userId","系统");
+                    //如果是一个人
+                    tableList.add(capacityMesMap);
+                    dispatchMap.put("list",tableList);
+                    try {
+                        omsTransOrderService.dispatchTask(dispatchMap);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    //上面去派车,下面是派人工
+                    Map<String, Object> dispatchMap1 = new HashMap<>();
+                    dispatchMap1.put("carrierId",37019);
+                    dispatchMap1.put("capacityTypeId",969904);
+                    dispatchMap1.put("requirementChildId",map.get("requirementChildId"));
+                    dispatchMap1.put("businessType",map.get("businessType"));
+                    dispatchMap1.put("capacityTypeName","业务处人工队");
+                    dispatchMap1.put("userName","系统");
+                    dispatchMap1.put("userId","系统");
+                    Map<String,Object> alternateFields11Map = commonMapper.getZhiHuiGongId(capacityMesMap.get("capacityId"));
+                    List<Map<String,Object>> diaoGuaGongIds = commonMapper.getDiaoGuaGongIds(capacityMesMap.get("capacityId"),personnelNumber);
+                    List<Map<String,Object>> tableList1 = new ArrayList<>();
+                    if(alternateFields11Map != null) {
+                        tableList1.add(alternateFields11Map);
+                    }
+                    if(diaoGuaGongIds != null && diaoGuaGongIds.size() > 0) {
+                        tableList1.addAll(diaoGuaGongIds);
+                    }
+                    dispatchMap1.put("list",tableList1);
+                    try {
+                        omsTransOrderService.dispatchTask(dispatchMap1);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }else{
+                    continue;
+                }
+                //指挥工
+            }else if("夜班".equals(flag)) {
+                //匹配甲班、空闲中的、运力、司机数据
+                Map<String, Object> objectObjectHashMap = new HashMap<>();
+                objectObjectHashMap.put("capacityTypeId",capacityTypeId);
+                objectObjectHashMap.put("shift","夜班");
+                List<Map<String,Object>> capacityInfoList = commonMapper.getCapacityMes(objectObjectHashMap);
+                if(capacityInfoList == null || capacityInfoList.size() == 0) {
+                    continue;
+                }
+                String clFlag = "";
+                if(capacityInfoList.size() > 0 && capacityInfoList.get(0).get("capacityInnerNumber").toString().contains("甲")) {
+                    clFlag = "甲";
+                }else{
+                    clFlag = "乙";
+                }
+                Map<String,Object> lastCarInfo = commonMapper.getLastCarInfoJx(clFlag);
+                int  lastSqe = DataChange.dataToBigDecimal(lastCarInfo.get("sqe")).intValue();
+                Map<String,Object> capacityMesMap = new HashMap<>();
+                for(int i = 0 ; i < capacityInfoList.size() ; i++) {
+                    //遍历第一个数，是lastsqe后的第一个数
+                    Map<String,Object> capacityInfoMap = null;
+                    try {
+                        capacityInfoMap = capacityInfoList.get((lastSqe + i) % capacityInfoList.size() );
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        continue;
+                    }
+                    BigDecimal capacityId = DataChange.dataToBigDecimal(capacityInfoMap.get("capacityId"));
+                    BigDecimal driverId = DataChange.dataToBigDecimal(capacityInfoMap.get("driverId"));
+                    BigDecimal sort = DataChange.dataToBigDecimal(capacityInfoMap.get("sort"));
+                    String schStatus = capacityInfoMap.get("schStatus").toString();
+                    if(!"正常".equals(schStatus)) {
+                        continue;
+                    }
+                    //判断车辆是否作业状态
+                    int countOrder = commonMapper.getWcCapacityStatus(capacityId);
+                    int countOrderZcp = commonMapper.getCapacityStatusZcp(capacityId);
+                    if(countOrder > 0 && countOrder != countOrderZcp) {
+                        //装车皮业务与所有业务都相等，说明可以继续派车
+                        continue;
+                    }
+                    int driverCountOrder = commonMapper.getDriverStatus(driverId);
+                    int driverCountOrderZcp = commonMapper.getDriverStatusZcp(driverId);
+                    if(driverCountOrder > 0 && driverCountOrderZcp != driverCountOrder) {
+                        continue;
+                    }
+                    capacityMesMap = capacityInfoMap;
+                    break;
+                }
+                List<Map<String,Object>> tableList = new ArrayList<>();
+                if(capacityMesMap.size() > 0) {
+                    Map<String, Object> dispatchMap = new HashMap<>();
+                    dispatchMap.put("carrierId",37019);
+                    dispatchMap.put("capacityTypeId",capacityTypeId);
+                    dispatchMap.put("requirementChildId",map.get("requirementChildId"));
+                    dispatchMap.put("businessType",map.get("businessType"));
+                    dispatchMap.put("capacityTypeName",map.get("capacityTypeName"));
+                    dispatchMap.put("userName","系统");
+                    dispatchMap.put("userId","系统");
+                    //如果是一个人
+                    tableList.add(capacityMesMap);
+                    dispatchMap.put("list",tableList);
+                    try {
+                        omsTransOrderService.dispatchTask(dispatchMap);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                    //上面去派车,下面是派人工
+                    Map<String, Object> dispatchMap1 = new HashMap<>();
+                    dispatchMap1.put("carrierId",37019);
+                    dispatchMap1.put("capacityTypeId",969904);
+                    dispatchMap1.put("requirementChildId",map.get("requirementChildId"));
+                    dispatchMap1.put("businessType",map.get("businessType"));
+                    dispatchMap1.put("capacityTypeName","业务处人工队");
+                    dispatchMap1.put("userName","系统");
+                    dispatchMap1.put("userId","系统");
+                    Map<String,Object> alternateFields11Map = commonMapper.getZhiHuiGongId(capacityMesMap.get("capacityId"));
+                    List<Map<String,Object>> diaoGuaGongIds = commonMapper.getDiaoGuaGongIds(capacityMesMap.get("capacityId"),personnelNumber);
+                    List<Map<String,Object>> tableList1 = new ArrayList<>();
+                    if(alternateFields11Map != null) {
+                        tableList1.add(alternateFields11Map);
+                    }
+                    if(diaoGuaGongIds != null && diaoGuaGongIds.size() > 0) {
+                        tableList1.addAll(diaoGuaGongIds);
+                    }
+                    dispatchMap1.put("list",tableList1);
+                    try {
+                        omsTransOrderService.dispatchTask(dispatchMap1);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }else{
+                    continue;
+                }
+            }
+        }
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 60)
+    //@PostMapping("getDbInnerResult")
+    public void syncDbInnerResult() {
+        Map<String, Object> objectObjectHashMap = new HashMap<>();
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        List<Map<String,Object>> mapList = dzFeign.getDbInnerResult(objectObjectHashMap);
+        for(Map<String,Object> map : mapList) {
+            omsTransOrderService.syncProductionResult(map);
+            //判断单据有没有同步成功
+            BigDecimal orderId = omsTransOrderMapper.selectOrderInfoByDB(map);
+            SyncProductList syncProductList = new SyncProductList();
+            if(orderId == null) {
+                syncProductList.setDeleted(1);
+            }else{
+                syncProductList.setDeleted(0);
+            }
+            JSONObject jsonObject = new JSONObject(map);
+            syncProductList.setPrimaryId(syncProductListMapper.nextId());
+            syncProductList.setDjlx("调拨");
+            syncProductList.setDjbh(map.get("djbh").toString());
+            syncProductList.setMaterialName(map.get("materialName") == null ? "" : map.get("materialName").toString());
+            syncProductList.setProductList(jsonObject.toString());
+            syncProductList.setInsertTime(new Date());
+            syncProductListMapper.insert(syncProductList);
+        }
+    }
+
+
+    @PostMapping("matchLoaderCapacityOrder")
+    public void matchLoaderCapacityOrder() {
+        //获取计重无烟煤数据
+        List<Map<String, Object>> omsTransOrderList = omsTransOrderMapper.selectWuyanmei();
+        for(Map<String,Object> map : omsTransOrderList) {
+            OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("transOrderId")));
+            OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("orderChildId")));
+            omsTransOrderService.matchLoaderCapacityOrder(omsTransOrder,omsOrderChild);
+        }
+    }
+
+    @PostMapping("matchPriceSyncDz")
+    public void matchPriceSyncDz() {
+        //获取计重无烟煤数据
+        List<Map<String, Object>> omsTransOrderList = omsTransOrderMapper.selectWuyanmei();
+        for(Map<String,Object> map : omsTransOrderList) {
+            OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("transOrderId")));
+            OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("orderChildId")));
+            omsTransOrderService.matchPriceSyncDz(omsTransOrder,omsOrderChild);
+        }
+    }
+
+    @PostMapping("generateMonthOrder")
+    public void generateMonthOrder() throws ParseException {
+        //跨天的装载机计吨需求
+        List<Map<String,Object>> mapList = omsTransOrderMapper.selectMonthOrder();
+        for(Map<String,Object> map : mapList) {
+            BigDecimal transOrderId = DataChange.dataToBigDecimal(map.get("transOrderId"));
+            BigDecimal orderChildId = DataChange.dataToBigDecimal(map.get("orderChildId"));
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd");
+            String guoDuDateStr = simpleDateFormat1.format(DataChange.dataToDate(map.get("requirementEndTime"))) + " 00:00:00";
+            Date guoDuDate = simpleDateFormat.parse(guoDuDateStr);
+            OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(orderChildId);
+            OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(transOrderId);
+            //更新结束时间
+            omsOrderChildMapper.updateReciptDate(orderChildId,guoDuDate);
+            //新增子表
+            //新增
+            omsTransOrder.setTransOrderId(omsTransOrderMapper.nextId());
+            omsTransOrder.setIssueTime(guoDuDate);
+            omsOrderChild.setReceiptTime(DataChange.dataToDate(map.get("requirementEndTime")));
+            omsOrderChild.setOrderChildId(omsOrderChildMapper.nextId());
+            omsOrderChild.setTransOrderId(omsTransOrder.getTransOrderId());
+            omsOrderChild.setNetWeight(null);
+            omsOrderChild.setActualWeight(null);
+            omsOrderChild.setAlternateFields20(null);
+            omsOrderChildMapper.insertSelective(omsOrderChild);
+            omsTransOrderMapper.insertSelective(omsTransOrder);
+        }
+    }
+
+    @PostMapping("disposeErrorData")
+    public void disposeErrorData() {
+        //查询2月装矿石数据全部清空
+        int i = omsTransOrderMapper.clearNetWeight();
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 120)
+    public void getBlueList() throws Exception {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        Map<String,Object> map = dzFeign.getBlueList();
+        List<Map<String,Object>> mapCgList = (List<Map<String, Object>>) map.get("cgList");
+        List<Map<String,Object>> mapXsList = (List<Map<String, Object>>) map.get("xsList");
+        ArrayList<Object> objects = new ArrayList<>();
+        //查询需要修改的计划
+        if(mapCgList.size() > 0) {
+            List<Map<String,Object>> mapCgNeedUpdateList = commonMapper.selectCgNeedUpdateList(mapCgList);
+            objects.addAll(mapCgNeedUpdateList);
+        }
+        if(mapXsList.size() > 0) {
+            List<Map<String,Object>> mapXsNeedUpdateList = commonMapper.selectCgNeedUpdateList(mapXsList);
+            objects.addAll(mapXsNeedUpdateList);
+        }
+        if(objects.size() > 0) {
+            Map<String,Object> stringObjectMap = new HashMap<>();
+            stringObjectMap.put("mapList",objects);
+            omsTransOrderService.correctTransOrder(stringObjectMap);
+        }
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 120)
+    public void syncZcpData() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        // 获取两天内的装车皮数据
+        List<Map<String,Object>> mapList = tmsLoadResultMapper.selectTrainLoadResult();
+        for(Map<String,Object> map : mapList) {
+            //遍历，去查询
+            BigDecimal tonnageValue = omsTransOrderMapper.getTotalTonnageValue(map);
+            TmsLoadResult tmsLoadResult = tmsLoadResultMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("resultId")));
+            tmsLoadResult.setActualTonnage(tonnageValue);
+            tmsLoadResult.setAlternateFields5("系统");
+            tmsLoadResultMapper.updateByPrimaryKeySelective(tmsLoadResult);
+            //统计所有吨位
+        }
+        for(Map<String,Object> map : mapList) {
+            OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("transOrderChildId")));
+            //统计该子表下所有装货实绩ID
+            BigDecimal totalTonnageValue = omsOrderChildMapper.getTotalTonnageValue(omsOrderChild.getOrderChildId());
+            omsOrderChild.setNetWeight(totalTonnageValue);
+            omsOrderChild.setActualWeight(omsOrderChild.getNetWeight());
+            omsOrderChildMapper.updateByPrimaryKeySelective(omsOrderChild);
+        }
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 60)
+    public void remindWuLiu() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        //获取超过需求时间半小时未签到及未计时开始的车辆
+        List<Map<String,Object>> capacityInnerNoSignList = omsTransOrderMapper.getCapacityInnerNoSignList();
+        for(Map<String,Object> capacityInnerNoSignMap : capacityInnerNoSignList) {
+            Object capacityInnerNoSignStr = capacityInnerNoSignMap.get("capacityStrs");
+            if(capacityInnerNoSignStr != null) {
+                try {
+                    HashMap<String, Object> sendMap = new HashMap<>();
+                    sendMap.put("userId", "admin");
+                    sendMap.put("userName","admin");
+                    sendMap.put("title", "未签到提醒");
+                    sendMap.put("sendMessage", capacityInnerNoSignStr + ":未签到,请提醒其及时签到");
+                    sendMap.put("sendType", "01");//01：通知消息
+                    String websocketId = capacityInnerNoSignMap.get("webSocketId").toString();
+                    RESTfulResult resTfulResult = null;
+                    resTfulResult = websocketFeign.sendWebsocket(websocketId, sendMap);
+                    if (resTfulResult != null && !resTfulResult.isSucceed()) {
+                        log.error("物流调度消息推送失败：" + resTfulResult.getMessage());
+                    }
+                } catch (Exception e) {
+                    log.error("物流调度消息推送异常：{}", e);
+                    e.printStackTrace();
+                }
+            }
+        }
+        //获取超过需求半小时还未计时开始的车辆
+        List<Map<String,Object>> capacityInnerNoTimeList = omsTransOrderMapper.getCapacityInnerNoTimeList();
+        for(Map<String,Object> capacityInnerNoTimeMap : capacityInnerNoTimeList) {
+            Object capacityInnerNoTimeStr = capacityInnerNoTimeMap.get("capacityStrs");
+            if(capacityInnerNoTimeStr != null) {
+                try {
+                    HashMap<String, Object> sendMap = new HashMap<>();
+                    sendMap.put("userId", "admin");
+                    sendMap.put("userName","admin");
+                    sendMap.put("title", "未签到提醒");
+                    sendMap.put("sendMessage", capacityInnerNoTimeStr + ":未签到,请提醒其及时签到");
+                    sendMap.put("sendType", "01");//01：通知消息
+                    String websocketId = capacityInnerNoTimeMap.get("webSocketId").toString();
+                    RESTfulResult resTfulResult = null;
+                    resTfulResult = websocketFeign.sendWebsocket(websocketId, sendMap);
+                    if (resTfulResult != null && !resTfulResult.isSucceed()) {
+                        log.error("物流调度消息推送失败：" + resTfulResult.getMessage());
+                    }
+                } catch (Exception e) {
+                    log.error("物流调度消息推送异常：{}", e);
+                    e.printStackTrace();
+                }
+            }
+        }
+        // 统计昨日未完成任务的车辆及司机并提醒调度
+        List<Map<String,Object>> capacityNoFinishList = omsTransOrderMapper.getCapacityNoFinishList();
+        for(Map<String,Object> capacityInnerNoFinishMap : capacityNoFinishList) {
+            Object capacityInnerNoFinishStr = capacityInnerNoFinishMap.get("capacityStrs");
+            if(capacityInnerNoFinishStr != null) {
+                try {
+                    HashMap<String, Object> sendMap = new HashMap<>();
+                    sendMap.put("userId", "admin");
+                    sendMap.put("userName","admin");
+                    sendMap.put("title", "未签到提醒");
+                    sendMap.put("sendMessage", capacityInnerNoFinishStr + ":未签到,请提醒其及时签到");
+                    sendMap.put("sendType", "01");//01：通知消息
+                    String websocketId = capacityInnerNoFinishMap.get("webSocketId").toString();
+                    RESTfulResult resTfulResult = null;
+                    resTfulResult = websocketFeign.sendWebsocket(websocketId, sendMap);
+                    if (resTfulResult != null && !resTfulResult.isSucceed()) {
+                        log.error("物流调度消息推送失败：" + resTfulResult.getMessage());
+                    }
+                } catch (Exception e) {
+                    log.error("物流调度消息推送异常：{}", e);
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    //@Scheduled(fixedDelay = 1000 * 60 * 60)
+    @PostMapping("remindSiji")
+    public void remindSiji() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        //获取今日下发时间为今天，但今天还未签到的司机；超出需求半小时的，业务名称、车号、用车单位;
+        Map<String, Object> objectObjectHashMap = new HashMap<>();
+        List<Map<String,Object>> sendMapList = new ArrayList<>();
+        List<Map<String,Object>> noSignMesList = commonMapper.getNoSignMesList();
+        for(Map<String,Object> stringObjectMap : noSignMesList) {
+            try {
+                //查询司机
+                HashMap<String, Object> sendMap = new HashMap<>();
+                sendMap.put("personnelId",stringObjectMap.get("driverId"));
+                sendMap.put("title",stringObjectMap.get("issueTime") + "任务未签到提醒");
+                //finalPlanDetails.get("")
+                String text = "作业：" + stringObjectMap.get("operationRangeName") + stringObjectMap.get("operationName") + "未签到！";
+                sendMap.put("content",text);
+                HashMap<String, Object> mapData = new HashMap<>();
+                mapData.put("text",text);
+                sendMap.put("data",mapData);
+                sendMapList.add(sendMap);
+            }catch (Exception e){
+                log.error("消息推送失败：{}",e);
+                e.printStackTrace();
+            }
+        }
+        //获取签到了但签到与需求最大时长一个小时后还未计时开始的
+        List<Map<String,Object>> noTimeStartMesList = commonMapper.getNoTimeStartMesList();
+        for(Map<String,Object> stringObjectMap : noTimeStartMesList) {
+            try {
+                //查询司机
+                HashMap<String, Object> sendMap = new HashMap<>();
+                sendMap.put("personnelId",stringObjectMap.get("driverId"));
+                sendMap.put("title",stringObjectMap.get("issueTime") + "任务未开始提醒");
+                //finalPlanDetails.get("")
+                String text = "作业：" + stringObjectMap.get("operationRangeName") + stringObjectMap.get("operationName") + "未计时开始！";
+                sendMap.put("content",text);
+                HashMap<String, Object> mapData = new HashMap<>();
+                mapData.put("text",text);
+                sendMap.put("data",mapData);
+                sendMapList.add(sendMap);
+            }catch (Exception e){
+                log.error("消息推送失败：{}",e);
+                e.printStackTrace();
+            }
+        }
+        //获取昨日未生成实绩的运输任务（计时、计次、装载机计重）
+        List<Map<String,Object>> noFinishMesList = commonMapper.getNoFinishStartMesList();
+        for(Map<String,Object> stringObjectMap : noFinishMesList) {
+            try {
+                //查询司机
+                HashMap<String, Object> sendMap = new HashMap<>();
+                sendMap.put("personnelId",stringObjectMap.get("driverId"));
+                sendMap.put("title",stringObjectMap.get("issueTime") + "业务未完成提醒");
+                //finalPlanDetails.get("")
+                String text = "作业：" + stringObjectMap.get("operationRangeName") + stringObjectMap.get("operationName") + "业务未生成！";
+                sendMap.put("content",text);
+                HashMap<String, Object> mapData = new HashMap<>();
+                mapData.put("text",text);
+                sendMap.put("data",mapData);
+                sendMapList.add(sendMap);
+            }catch (Exception e){
+                log.error("消息推送失败：{}",e);
+                e.printStackTrace();
+            }
+        }
+        objectObjectHashMap.put("list",sendMapList);
+        RESTfulResult resTfulResult = websocketFeign.pushUniMessageList(objectObjectHashMap);
+
+    }
+
+    //查询小号不为空的调拨过磅数据去进行重复匹配
+    //@Scheduled(fixedDelay = 1000 * 60 * 120)
+    @PostMapping("restartSyncProductionInner")
+    public void restartSyncProductionInner() {
+        Properties props = System.getProperties(); // 系统属性
+        if(props.getProperty("os.name").contains("Windows")){
+            //windows系统不执行
+            log.debug("windows系统不执行");
+            return;
+        }
+        //首先是获取未匹配到的调拨数据
+        List<String> stringList = omsTransOrderMapper.getInnerNoMatchList();
+        for(String s : stringList) {
+            JSONObject jsonObject = JSON.parseObject(s);
+            omsTransOrderService.syncProductionResult(jsonObject);
+        }
+    }
+
+    @Autowired
+    TaskDispatchOptimized taskDispatchOptimized;
+
+    //@PostMapping("dispatchTasksDcAll")
+    //public void dispatchTasksDcAll() {
+    //    taskDispatchOptimized.dispatchTasks();
+    //}
+
+}

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

@@ -0,0 +1,107 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsAddenergyResult;
+import com.steerinfo.dil.service.ITmsAddenergyResultService;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+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.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * TmsAddenergyResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2024-09-06 09:21
+ * 类描述
+ * 修订历史：
+ * 日期：2024-09-06
+ * 作者：generator
+ * 参考：
+ * 描述：TmsAddenergyResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsaddenergyresults")
+public class TmsAddenergyResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmsAddenergyResultService tmsAddenergyResultService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmsaddenergyresult:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<TmsAddenergyResult> list = tmsAddenergyResultService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmsaddenergyresult:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<TmsAddenergyResult> list = tmsAddenergyResultService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据TmsAddenergyResult对象创建")
+    @ApiImplicitParam(name = "tmsAddenergyResult", value = "详细实体tmsAddenergyResult", required = true, dataType = "TmsAddenergyResult")
+    //@RequiresPermissions("tmsaddenergyresult:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute TmsAddenergyResult model){
+        TmsAddenergyResult tmsAddenergyResult = tmsAddenergyResultService.add(model);
+        return success(tmsAddenergyResult);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("tmsaddenergyresult:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable BigDecimal id){
+        TmsAddenergyResult tmsAddenergyResult = tmsAddenergyResultService.getById(id);
+        return success(tmsAddenergyResult);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的tmsAddenergyResult信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+        @ApiImplicitParam(name = "tmsAddenergyResult", value = "详细实体tmsAddenergyResult", required = true, dataType = "TmsAddenergyResult")
+    })
+    //@RequiresPermissions("tmsaddenergyresult:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable BigDecimal id, @RequestBody TmsAddenergyResult model){
+        model.setId(id);
+        TmsAddenergyResult tmsAddenergyResult = tmsAddenergyResultService.modify(model);
+        return success(tmsAddenergyResult);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("tmsaddenergyresult:delete")
+    @DeleteMapping(value = "/{id}")//BigDecimal
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<BigDecimal> ids = ListUtils.convertList(list);
+			  tmsAddenergyResultService.delete(ids);
+    	}
+      return success();
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmsArrivalResultServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.dil.model.TmsArrivalResult;
+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.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * TmsArrivalResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-11-03 09:50
+ * 类描述
+ * 修订历史：
+ * 日期：2023-11-03
+ * 作者：generator
+ * 参考：
+ * 描述：TmsArrivalResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsarrivalresults")
+public class TmsArrivalResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsArrivalResultServiceImpl tmsArrivalResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "查询抵达")
+    @PostMapping("/getArrivalResultList")
+    public RESTfulResult getArrivalResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsArrivalResultService.getArrivalResultList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value="抵达", notes="")
+    @PostMapping("/arrival")
+    public RESTfulResult arrival(@RequestBody Map<String,Object> map){
+        try{
+            String result = tmsArrivalResultService.arrival(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,383 @@
+package com.steerinfo.dil.controller;
+
+import com.baomidou.mybatisplus.extension.api.R;
+import com.steerinfo.dil.feign.RmsFeign;
+import com.steerinfo.dil.feign.WebsocketFeign;
+import com.steerinfo.dil.mapper.OmsTransOrderMapper;
+import com.steerinfo.dil.mapper.TmsAddenergyResultMapper;
+import com.steerinfo.dil.mapper.TmsComprehensiveResultMapper;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DaZongUtil;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.dil.model.TmsComprehensiveResult;
+import com.steerinfo.dil.service.ITmsComprehensiveResultService;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.web.bind.annotation.*;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.math.BigDecimal;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * TmsComprehensiveResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-28 02:59
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-28
+ * 作者：generator
+ * 参考：
+ * 描述：TmsComprehensiveResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmscomprehensiveresults")
+public class TmsComprehensiveResultController extends BaseRESTfulController {
+
+    private static final Logger log = LoggerFactory.getLogger(TmsComprehensiveResultController.class);
+    @Autowired
+    ITmsComprehensiveResultService tmsComprehensiveResultService;
+
+    @Autowired
+    private OmsTransOrderMapper omsTransOrderMapper;
+
+    @Autowired
+    private ColumnDataUtil columnDataUtil;
+
+    @Autowired
+    private TmsComprehensiveResultMapper tmsComprehensiveResultMapper;
+
+    @Autowired
+    private WebsocketFeign websocketFeign;
+
+    @Autowired
+    TmsAddenergyResultMapper tmsAddenergyResultMapper;
+
+    @Autowired
+    private DaZongUtil daZongUtil;
+    @Autowired
+    private RmsFeign rmsFeign;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmscomprehensiveresult:view")
+    @PostMapping(value = "/gettmscomprehensiveresult")
+    public RESTfulResult list(@RequestBody Map<String,Object> map, Integer apiId, Integer pageNum, Integer pageSize){
+
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String,Object>> personnels = tmsComprehensiveResultMapper.getPersonnelById(new BigDecimal(Optional.ofNullable(map.get("userId")).orElse("0").toString()));
+        Map<String,Object> personnel = new HashMap<>();
+        if(personnels!=null && personnels.size()>0){
+            personnel = personnels.get(0);
+        }
+        if(personnel != null && personnel.get("personnelPost")!=null && personnel.get("personnelPost").toString().equals("司机")){
+            map.put("personnelId",personnel.get("personnelId"));
+        }
+
+        if(personnel != null && personnel.get("personnelPost")!=null && personnel.get("personnelPost").toString().equals("组长")){
+            map.put("personnelTeam",personnel.get("personnelTeam"));
+        }
+        List<Map<String,Object>> list = new ArrayList<>();
+        if("加油".equals(map.get("resultType"))) {
+            list = tmsAddenergyResultMapper.selectAddEnergyResult(map);
+        }else{
+            list = tmsComprehensiveResultMapper.findListMaps(map);
+        }
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+
+
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的tmsComprehensiveResult信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+        @ApiImplicitParam(name = "tmsComprehensiveResult", value = "详细实体tmsComprehensiveResult", required = true, dataType = "TmsComprehensiveResult")
+    })
+    @PostMapping(value = "/tmscomprehensiveresultsupdate", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update( @RequestBody(required = false) TmsComprehensiveResult model){
+        if (model==null){
+            return failed("修改信息不能为空！");
+        }
+        Calendar calendar = Calendar.getInstance();
+        model.setUpdateUsername("admin");
+        model.setUpdateTime(DataChange.dataToDate(calendar.getTime()));
+        model.setAlternateFields7("admin");
+        if ("请假".equals(model.getResultType()) && model.getAlternateFields7() != null) {
+            //tmsComprehensiveResultMapper.updatePersonnelStatus(model.getPersonnelId(),new BigDecimal(3));
+            publishDriver(model,"请假");
+            BigDecimal personnelId = model.getPersonnelId();
+            if(model.getAlternateFields4() != null) {
+                String time = model.getAlternateFields4();
+                String startTime = time.split("--")[0];
+                String endTime = time.split("--")[1];
+                //将转换成时间
+                Date startTimeDate = DataChange.dataToDate(startTime);
+                Date endTimeDate = DataChange.dataToDate(endTime);
+                if(startTimeDate.compareTo(new Date(new Date().getTime() + 120 * 60 * 1000)) <= 0 && endTimeDate.compareTo(new Date()) >= 0) {
+                    //请假时间小于当前时间,则变更状态
+                    tmsComprehensiveResultMapper.updatePersonnelStatus(personnelId,new BigDecimal(3));
+                }
+            }else{
+                tmsComprehensiveResultMapper.updatePersonnelStatus(personnelId,new BigDecimal(3));
+            }
+
+        }
+        if ("请假".equals(model.getResultType()) && model.getAlternateFields9() != null) {
+            tmsComprehensiveResultMapper.updatePersonnelStatus(model.getPersonnelId(),new BigDecimal(0));
+        }
+        if ("维保".equals(model.getResultType()) && model.getAlternateFields6() != null && model.getAlternateFields7() != null && model.getAlternateFields8() == null) {
+            //更新车辆状态
+            tmsComprehensiveResultMapper.updateCapacityStatus(DataChange.dataToBigDecimal(model.getAlternateFields11()),new BigDecimal(3));
+            publishDriver(model,"维保");
+        }
+        if ("维保".equals(model.getResultType()) && model.getAlternateFields6() != null && model.getAlternateFields7() != null && model.getAlternateFields8() != null) {
+            //更新车辆状态
+            tmsComprehensiveResultMapper.updateCapacityStatus(DataChange.dataToBigDecimal(model.getAlternateFields11()),new BigDecimal(0));
+            publishDriver(model,"维保");
+        }
+        if ("借车".equals(model.getResultType()) && model.getAlternateFields8()!=null) {
+            //还车时删除排班记录
+            SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Map<String,Object> map = new HashMap<>();
+            map.put("capacityDriverId",model.getAlternateFields19());
+            map.put("deleted",1);
+            map.put("alternateFields1","还车");
+            model.setAlternateFields9(model.getAlternateFields7());
+            model.setAlternateFields20(model.getAlternateFields20()+"还车情况："+model.getAlternateFields8()+"于"+ simpleDateFormat.format(new Date())+"申请了还车");
+            model.setResultType(model.getResultType());
+            tmsComprehensiveResultMapper.updateCapacityStatus(DataChange.dataToBigDecimal(model.getAlternateFields11()),new BigDecimal(0));
+            //删除排班记录
+            tmsComprehensiveResultMapper.updateCapacityDriver(map);
+            publishDriver(model,"还车");
+        }
+        if("请假".equals(model.getResultType()) && model.getAlternateFields6() != null && model.getAlternateFields7()==null){
+            //推送主管
+            publishManager(model,"请假");
+        }
+        if("维保".equals(model.getResultType()) && model.getAlternateFields6() != null && model.getAlternateFields7()==null){
+            //推送主管
+            publishManager(model,"维保");
+        }
+        if("借车".equals(model.getResultType()) && model.getAlternateFields6() != null && model.getAlternateFields7()==null){
+            //推送主管
+            publishManager(model,"借车");
+        }
+
+        int tmsComprehensiveResult = tmsComprehensiveResultMapper.updateByPrimaryKeySelective(model);
+        return success(tmsComprehensiveResult);
+    }
+
+    @ApiOperation(value="批量更新更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的tmsComprehensiveResult信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+        @ApiImplicitParam(name = "tmsComprehensiveResult", value = "详细实体tmsComprehensiveResult", required = true, dataType = "TmsComprehensiveResult")
+    })
+    @PostMapping(value = "/batchUpdate", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update( @RequestBody(required = false) List<TmsComprehensiveResult> model){
+        try{
+            String result = tmsComprehensiveResultService.upload(model);
+            return success(result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(e.getMessage(),"操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+
+    @PutMapping(value = "/logicdelete")
+    public RESTfulResult logicDelete(@RequestBody Map<String,Object> map){
+        BigDecimal ids = DataChange.dataToBigDecimal(map.get("resultId"));
+        tmsComprehensiveResultMapper.logicDelete(ids);
+        return success();
+    }
+
+    //实绩新增
+    @PostMapping("/add")
+    public RESTfulResult insertAll(@RequestBody TmsComprehensiveResult model) throws Exception {
+        if (model==null){
+            return failed("新增信息不能输入为空！");
+        }
+        Calendar calendar = Calendar.getInstance();
+        DataChange.dataToDate( calendar.getTime());
+        model.setInsertTime(calendar.getTime());
+        model.setDeleted(new BigDecimal(0));
+        model.setResultId(tmsComprehensiveResultMapper.nextId());
+        if ("请假".equals(model.getResultType())){
+            if("是".equals(model.getAlternateFields22()) && model.getAlternateFields4() == null) {
+                throw new Exception("假期确定的时候请假时间必填！！！");
+            }
+            //推送班组长
+            publishTeamLeader(model,"请假");
+        }
+        if ("维保".equals(model.getResultType())){
+            //推送班组长
+            publishTeamLeader(model,"维保");
+        }
+        if ("借车".equals(model.getResultType())){
+            String time = model.getAlternateFields4();
+            String startTime = time.split("—")[0];
+            String endTime = time.split("—")[1];
+            //将转换成时间
+            Date startTimeDate = DataChange.dataToDate(startTime);
+            Date endTimeDate = DataChange.dataToDate(endTime);
+            if(!isValidShiftTime(startTimeDate,endTimeDate)){
+                throw new Exception("填报借车时间不符合班次要求！");
+            }
+            //借车新增排班信息
+            if(model.getAlternateFields12()!=null){
+                HashMap<String,Object> map = new HashMap<>();
+                map.put("personnelId",model.getPersonnelId());
+                map.put("capacityId",model.getAlternateFields12());
+                map.put("oldCapacityId",model.getAlternateFields11());
+                //新增排版记录
+                tmsComprehensiveResultService.insertCapacityDriver(model.getPersonnelId(),map,model);
+            }
+            //推送班组长
+            try {
+                publishTeamLeader(model,"借车");
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        Integer count = tmsComprehensiveResultMapper.insertSelective(model);
+        return success(count);
+    }
+
+    private void publishManager(TmsComprehensiveResult model,String type) {
+        //查询司机
+        Map<String, Object> driver = tmsComprehensiveResultMapper.getPersonnelById2(model.getPersonnelId());
+        //推送班组长
+        HashMap<String, Object> map = new HashMap<>();
+        //查询班组长
+        List<Map<String, Object>> listTeamLeader = tmsComprehensiveResultMapper.getPersonnelByManager();
+        if(listTeamLeader!=null&&listTeamLeader.size()>0){
+            map.put("personnelId",listTeamLeader.get(0).get("personnelId"));
+            map.put("title",type+"申请");
+            String text = "司机【"+ driver.get("personnelName")+"】发出一条"+type+"申请，"+type+"理由："+model.getAlternateFields3()+",班组长已审批";
+            map.put("content",text);
+            HashMap<String, Object> mapData = new HashMap<>();
+            mapData.put("text",text);
+            map.put("data",mapData);
+            try {
+                RESTfulResult resTfulResult = websocketFeign.pushUniMessage(map);
+                if(resTfulResult!=null){
+
+                }
+            } catch (Exception e) {
+                log.error("{}推送失败,", type, e);
+            }
+        }else {
+            log.error("推送失败，找不到主管信息");
+        }
+    }
+
+    private void publishTeamLeader(TmsComprehensiveResult model, String type) throws Exception {
+        //查询司机
+        Map<String, Object> driver = tmsComprehensiveResultMapper.getPersonnelById2(model.getPersonnelId());
+        //推送班组长
+        HashMap<String, Object> map = new HashMap<>();
+        //查询班组长
+        //if(driver.get("personnelTeam")==null){
+        //    throw new Exception("当前司机未配置班组，请联系管理员配置班组！");
+        //}
+        List<Map<String, Object>> listTeamLeader = tmsComprehensiveResultMapper.getPersonnelByTeam((String)driver.get("personnelTeam"));
+        if(listTeamLeader!=null&&listTeamLeader.size()>0){
+            map.put("personnelId",listTeamLeader.get(0).get("personnelId"));
+            map.put("title","理由为【"+model.getAlternateFields3()+"】的"+type+"申请");
+            String text = "司机【"+ driver.get("personnelName")+"】发出一条"+type+"申请，"+type+"理由："+model.getAlternateFields3();
+            map.put("content",text);
+            HashMap<String, Object> mapData = new HashMap<>();
+            mapData.put("text",text);
+            map.put("data",mapData);
+            try {
+                RESTfulResult resTfulResult = websocketFeign.pushUniMessage(map);
+            } catch (Exception e) {
+                log.error("{}推送失败,", type, e);
+            }
+        }else {
+            log.error("推送失败，找不到班组长信息");
+        }
+    }
+
+    private void publishDriver(TmsComprehensiveResult model, String type) {
+        //查询司机
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("personnelId",model.getPersonnelId());
+        map.put("title","审批通过");
+        String text = type+"申请审批通过";
+        map.put("content",text);
+        HashMap<String, Object> mapData = new HashMap<>();
+        mapData.put("text",text);
+        map.put("data",mapData);
+        try {
+            RESTfulResult resTfulResult = websocketFeign.pushUniMessage(map);
+        } catch (Exception e) {
+            log.error("{}推送失败,", type, e);
+        }
+    }
+
+    @PostMapping("/importComprehensiveResult")
+    public synchronized RESTfulResult importComprehensiveResult(@RequestBody(required = false) Map<String,Object> mapValue) throws Exception{
+        try{
+            String result = tmsComprehensiveResultService.importComprehensiveResult(mapValue);
+            return success(result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(e.getMessage());
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),"导入失败！请检查参数是否正确！");
+        }
+    }
+
+    private static boolean isValidShiftTime(Date start, Date end) {
+        Calendar startCal = Calendar.getInstance();
+        startCal.setTime(start);
+        Calendar endCal = Calendar.getInstance();
+        endCal.setTime(end);
+
+        int startHour = startCal.get(Calendar.HOUR_OF_DAY);
+        int endHour = endCal.get(Calendar.HOUR_OF_DAY);
+
+        // 白班情况：当日 8 点到 19 点
+        if (isSameDay(startCal, endCal) && startHour >= 8 && startHour < 19 && endHour > 8 && endHour <= 19) {
+            return true;
+        }
+
+        // 夜班情况：当日 19 点到次日 8 点
+        Calendar nextDayCal = (Calendar) startCal.clone();
+        nextDayCal.add(Calendar.DAY_OF_YEAR, 1);
+        if (isSameDay(nextDayCal, endCal) && startHour >= 19 && endHour <= 8) {
+            return true;
+        }
+
+        return false;
+    }
+
+    // 判断两个 Calendar 对象是否在同一天
+    private static boolean isSameDay(Calendar cal1, Calendar cal2) {
+        return cal1.get(Calendar.YEAR) == cal2.get(Calendar.YEAR) &&
+                cal1.get(Calendar.DAY_OF_YEAR) == cal2.get(Calendar.DAY_OF_YEAR);
+    }
+}

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

@@ -0,0 +1,66 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmsEnfactoryResultServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsEnfactoryResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-30 10:06
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-30
+ * 作者：generator
+ * 参考：
+ * 描述：TmsEnfactoryResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsenfactoryresults")
+public class TmsEnfactoryResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsEnfactoryResultServiceImpl tmsEnfactoryResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "查询进厂")
+    @PostMapping("/getEnfactoryResultList")
+    public RESTfulResult getEnfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsEnfactoryResultService.getEnfactoryResultList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value="同步进厂实绩", notes="不允许修改")
+    @PostMapping("/syncEnfactoryResult")
+    public RESTfulResult syncEnfactoryResult(@RequestBody Map<String,Object> map){
+        try{
+            String result = tmsEnfactoryResultService.syncEnfactoryResult(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(map,"同步失败，缺乏必要参数");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,224 @@
+package com.steerinfo.dil.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.config.WebExceptionHandler;
+import com.steerinfo.dil.service.impl.TmsLoadResultServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.log4j.Logger;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * TmsLoadResult RESTful接口：
+ *
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-30 10:06
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-30
+ * 作者：generator
+ * 参考：
+ * 描述：TmsLoadResult RESTful接口
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsloadresults")
+public class TmsLoadResultController extends BaseRESTfulController {
+
+    static final Logger log = Logger.getLogger(TmsLoadResultController.class);
+
+    @Autowired
+    TmsLoadResultServiceImpl tmsLoadResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "查询装货")
+    @PostMapping("/getLoadResultList")
+    public RESTfulResult getLoadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> list = tmsLoadResultService.getLoadResultList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "装货", notes = "")
+    @PostMapping("/load")
+    public RESTfulResult load(@RequestBody Map<String, Object> map) {
+        try {
+            String result = tmsLoadResultService.load(map);
+            return success(map, result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！", "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "装货修改", notes = "")
+    @PostMapping("/loadUpd")
+    public RESTfulResult loadUpd(@RequestBody Map<String, Object> map) {
+        try {
+            String result = tmsLoadResultService.loadUpd(map);
+            return success(map, result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！", "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "采购火运装车", notes = "")
+    @PostMapping("/purchaseTrainLoad")
+    public RESTfulResult purchaseTrainLoad(@RequestBody Map<String, Object> map) {
+        try {
+            String result = tmsLoadResultService.purchaseTrainLoad(map);
+            return success(map, result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "查询采购火运装车", notes = "")
+    @PostMapping("/purchaseTrainLoadList")
+    public RESTfulResult purchaseTrainLoadList(@RequestBody Map<String, Object> map,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> list = tmsLoadResultService.purchaseTrainLoadList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "查询采购火运装车", notes = "")
+    @PostMapping("/purchaseTrainLoadReport")
+    public RESTfulResult purchaseTrainLoadReport(@RequestBody Map<String, Object> map,
+                                               Integer apiId,
+                                               Integer pageNum,
+                                               Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String, Object>> list = tmsLoadResultService.purchaseTrainLoadReport(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @PostMapping("/updateTrainLoad")
+    public RESTfulResult updateTrainLoad(@RequestBody Map<String, Object> map) throws Exception {
+        String result = tmsLoadResultService.updateTrainLoad(map);
+        return success(result);
+    }
+
+    @PostMapping("/deleteTrainLoad")
+    public RESTfulResult deleteTrainLoad(@RequestBody Map<String, Object> map) throws Exception {
+        String result = tmsLoadResultService.deleteTrainLoad(map);
+        return success(map,result);
+    }
+
+    @PostMapping("/updateTrainLoadSeq")
+    public RESTfulResult updateTrainLoadSeq(@RequestBody Map<String, Object> map) throws Exception {
+        try {
+            String result = tmsLoadResultService.updateTrainLoadSeq(map);
+            return success(map, result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation("接收转库单信息")
+    @PostMapping("/receiveTranferInfo")
+    public RESTfulResult receiveTranferInfo(@RequestBody Map<String, Object> map) throws Exception {
+        String result = tmsLoadResultService.receiveTranferInfo(map);
+        return success(result);
+    }
+
+    @ApiOperation(value = "保存WMS传递的内转出库数据", notes = "保存WMS传递的内转出库数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/preserveMoveListIn")
+    public RESTfulResult preserveMoveListIn(@RequestBody Map<String, Object> mapList) throws Exception {
+        log.info(new JSONObject(mapList));
+        try {
+            tmsLoadResultService.preserveMoveListIn(mapList);
+            return success();
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return success();
+            //return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return success();
+            //return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "保存WMS传递的内转撤销出库数据", notes = "保存WMS传递的内撤销转出库数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/preserveMoveListRevokeIn")
+    public RESTfulResult preserveMoveListRevokeIn(@RequestBody Map<String, Object> mapList) throws Exception {
+        log.info(new JSONObject(mapList));
+        try {
+            tmsLoadResultService.preserveMoveListRevokeIn(mapList);
+            return success();
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return success();
+            //return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return success();
+            //return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation("disposeHandling")
+    @PostMapping("disposeHandling")
+    public RESTfulResult disposeHandling(@RequestBody Map<String,Object> map) {
+        log.info(new JSONObject(map));
+        Object object = null;
+        try {
+            object = tmsLoadResultService.disposeHandling(map);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+        return success(object);
+    }
+}

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

@@ -0,0 +1,107 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsMaintenanceResult;
+import com.steerinfo.dil.service.ITmsMaintenanceResultService;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+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.Arrays;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * TmsMaintenanceResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2024-09-06 09:21
+ * 类描述
+ * 修订历史：
+ * 日期：2024-09-06
+ * 作者：generator
+ * 参考：
+ * 描述：TmsMaintenanceResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsmaintenanceresults")
+public class TmsMaintenanceResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmsMaintenanceResultService tmsMaintenanceResultService;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmsmaintenanceresult:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<TmsMaintenanceResult> list = tmsMaintenanceResultService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmsmaintenanceresult:view")
+    @GetMapping(value = "/like/")
+    public RESTfulResult listLike(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<TmsMaintenanceResult> list = tmsMaintenanceResultService.queryLikeForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+    
+    @ApiOperation(value="创建", notes="根据TmsMaintenanceResult对象创建")
+    @ApiImplicitParam(name = "tmsMaintenanceResult", value = "详细实体tmsMaintenanceResult", required = true, dataType = "TmsMaintenanceResult")
+    //@RequiresPermissions("tmsmaintenanceresult:create")
+    @PostMapping(value = "/")
+    public RESTfulResult add(@ModelAttribute TmsMaintenanceResult model){
+        TmsMaintenanceResult tmsMaintenanceResult = tmsMaintenanceResultService.add(model);
+        return success(tmsMaintenanceResult);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("tmsmaintenanceresult:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable BigDecimal id){
+        TmsMaintenanceResult tmsMaintenanceResult = tmsMaintenanceResultService.getById(id);
+        return success(tmsMaintenanceResult);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的tmsMaintenanceResult信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+        @ApiImplicitParam(name = "tmsMaintenanceResult", value = "详细实体tmsMaintenanceResult", required = true, dataType = "TmsMaintenanceResult")
+    })
+    //@RequiresPermissions("tmsmaintenanceresult:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable BigDecimal id, @RequestBody TmsMaintenanceResult model){
+        model.setId(id);
+        TmsMaintenanceResult tmsMaintenanceResult = tmsMaintenanceResultService.modify(model);
+        return success(tmsMaintenanceResult);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("tmsmaintenanceresult:delete")
+    @DeleteMapping(value = "/{id}")//BigDecimal
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<BigDecimal> ids = ListUtils.convertList(list);
+			  tmsMaintenanceResultService.delete(ids);
+    	}
+      return success();
+    }
+}

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

@@ -0,0 +1,72 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmsOutfactoryResultServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * TmsOutfactoryResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-30 10:06
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-30
+ * 作者：generator
+ * 参考：
+ * 描述：TmsOutfactoryResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsoutfactoryresults")
+public class TmsOutfactoryResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsOutfactoryResultServiceImpl tmsOutfactoryResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "查询出厂")
+    @PostMapping("/getOutfactoryResultList")
+    public RESTfulResult getOutfactoryResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                    Integer apiId,
+                                                    Integer pageNum,
+                                                    Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsOutfactoryResultService.getOutfactoryResultList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value="同步出厂实绩", notes="不允许修改")
+    @PostMapping("/syncOutfactoryResult")
+    public RESTfulResult syncOutfactoryResult(@RequestBody Map<String,Object> map){
+        try{
+            String result = tmsOutfactoryResultService.syncOutfactoryResult(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(map,"同步失败，缺乏必要参数");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,75 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.mapper.TmsPleaseApproveMapper;
+import com.steerinfo.dil.model.TmsPleaseApprove;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsPleaseApprove RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2024-07-26 10:17
+ * 类描述
+ * 修订历史：
+ * 日期：2024-07-26
+ * 作者：generator
+ * 参考：
+ * 描述：TmsPleaseApprove RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmspleaseapproves")
+public class TmsPleaseApproveController extends BaseRESTfulController {
+    @Autowired
+    private TmsPleaseApproveMapper tmsPleaseApproveMapper;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @PostMapping("/getPleaseApproveList")
+    public RESTfulResult getTmsPleaseApproveList(@RequestBody(required = false) Map<String, Object> map,
+                                              Integer apiId,
+                                              Integer pageNum,
+                                              Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsPleaseApproveMapper.getTmsPleaseApproveList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @PostMapping("/addPleaseApprove")
+    public RESTfulResult addPleaseApprove(@RequestBody(required = false)TmsPleaseApprove tmsPleaseApprove) {
+        tmsPleaseApprove.setResultId(tmsPleaseApproveMapper.nextId());
+        tmsPleaseApprove.setInsertTime(new Date());
+        tmsPleaseApprove.setInsertUsername(tmsPleaseApprove.userName);
+        tmsPleaseApprove.setDeleted(0);
+        tmsPleaseApproveMapper.insertSelective(tmsPleaseApprove);
+        return success("OK");
+    }
+
+    @PostMapping("/updPleaseApprove")
+    public RESTfulResult updPleaseApprove(@RequestBody(required = false)TmsPleaseApprove tmsPleaseApprove) {
+        tmsPleaseApprove.setUpdateTime(new Date());
+        tmsPleaseApprove.setUpdateUsername(tmsPleaseApprove.userName);
+        tmsPleaseApproveMapper.updateByPrimaryKeySelective(tmsPleaseApprove);
+        return success("OK");
+    }
+
+    @PostMapping("/delPleaseApprove")
+    public RESTfulResult delPleaseApprove(@RequestBody(required = false)TmsPleaseApprove tmsPleaseApprove) {
+        tmsPleaseApproveMapper.deleteByPrimaryKey(tmsPleaseApprove.getResultId());
+        return success("OK");
+    }
+}

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

@@ -0,0 +1,74 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmsQualityResultServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.dil.model.TmsQualityResult;
+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.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * TmsQualityResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-11-03 09:50
+ * 类描述
+ * 修订历史：
+ * 日期：2023-11-03
+ * 作者：generator
+ * 参考：
+ * 描述：TmsQualityResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsqualityresults")
+public class TmsQualityResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsQualityResultServiceImpl tmsQualityResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "查询质检")
+    @PostMapping("/getQualityResultList")
+    public RESTfulResult getQualityResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                 Integer apiId,
+                                                 Integer pageNum,
+                                                 Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsQualityResultService.getQualityResultList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "采样质检")
+    @PostMapping("/syncQualityResult")
+    public RESTfulResult signIn(@RequestBody(required = false) Map<String, Object> map) {
+        try{
+            String result = tmsQualityResultService.syncQualityResult(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,133 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsQueueGrid;
+import com.steerinfo.dil.service.ITmsQueueGridService;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsQueueGrid RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2024-08-09 09:39
+ * 类描述
+ * 修订历史：
+ * 日期：2024-08-09
+ * 作者：generator
+ * 参考：
+ * 描述：TmsQueueGrid RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsqueuegrids")
+public class TmsQueueGridController extends BaseRESTfulController {
+
+    @Autowired
+    ITmsQueueGridService tmsQueueGridService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmsqueuegrid:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<TmsQueueGrid> list = tmsQueueGridService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmsqueuegrid:view")
+    @PostMapping(value = "/likeQueueGrid")
+    public RESTfulResult listLike(@RequestBody Map<String,Object> parmas,
+                                  Integer apiId,
+                                  Integer pageNum,
+                                  Integer pageSize){
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String,Object>> dataList = tmsQueueGridService.selectQueueGrid(parmas);
+        PageListAdd pageListAdd = columnDataUtil.tableColumnDataByUserId(apiId,null,dataList,parmas.get("userId").toString());
+        return success(pageListAdd);
+    }
+    
+    @ApiOperation(value="创建", notes="根据TmsQueueGrid对象创建")
+    @ApiImplicitParam(name = "tmsQueueGrid", value = "详细实体tmsQueueGrid", required = true, dataType = "TmsQueueGrid")
+    //@RequiresPermissions("tmsqueuegrid:create")
+    @PostMapping(value = "/disposeQueueGrid")
+    public RESTfulResult disposeQueueGrid(@RequestBody Map<String,Object> map)  {
+        int i = 0;
+        try {
+            i = tmsQueueGridService.disposeQueueGrid(map);
+        } catch (Exception e) {
+            return failed(e.getMessage(),e.getMessage());
+        }
+        return success(i);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("tmsqueuegrid:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable BigDecimal id){
+        TmsQueueGrid tmsQueueGrid = tmsQueueGridService.getById(id);
+        return success(tmsQueueGrid);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的tmsQueueGrid信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+        @ApiImplicitParam(name = "tmsQueueGrid", value = "详细实体tmsQueueGrid", required = true, dataType = "TmsQueueGrid")
+    })
+    //@RequiresPermissions("tmsqueuegrid:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable BigDecimal id, @RequestBody TmsQueueGrid model){
+        model.setId(id);
+        TmsQueueGrid tmsQueueGrid = tmsQueueGridService.modify(model);
+        return success(tmsQueueGrid);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("tmsqueuegrid:delete")
+    @DeleteMapping(value = "/{id}")//BigDecimal
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<BigDecimal> ids = ListUtils.convertList(list);
+			  tmsQueueGridService.delete(ids);
+    	}
+      return success();
+    }
+
+
+    @ApiOperation("getGridAllData")
+    @PostMapping("getGridAllData")
+    public RESTfulResult getGridAllData(@RequestBody Map<String,Object> map) {
+        Map<String,Object> resMap = tmsQueueGridService.getGridAllData(map);
+        return success(resMap);
+    }
+}

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

@@ -0,0 +1,123 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.model.TmsQueueResult;
+import com.steerinfo.dil.service.ITmsQueueResultService;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+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.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsQueueResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2024-08-09 09:39
+ * 类描述
+ * 修订历史：
+ * 日期：2024-08-09
+ * 作者：generator
+ * 参考：
+ * 描述：TmsQueueResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsqueueresults")
+public class TmsQueueResultController extends BaseRESTfulController {
+
+    @Autowired
+    ITmsQueueResultService tmsQueueResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmsqueueresult:view")
+    @GetMapping(value = "/")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<TmsQueueResult> list = tmsQueueResultService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmsqueueresult:view")
+    @PostMapping(value = "/likeQueueResult")
+    public RESTfulResult listLike(@RequestBody Map<String,Object> parmas,
+                                  Integer apiId,
+                                  Integer pageNum, Integer pageSize){
+        PageHelper.startPage(pageNum, pageSize);
+        List<Map<String,Object>> dataList = tmsQueueResultService.likeQueueResult(parmas);
+        PageListAdd pageListAdd = columnDataUtil.tableColumnDataByUserId(apiId,null,dataList,parmas.get("userId").toString());
+        return success(pageListAdd);
+    }
+    
+    @ApiOperation(value="创建", notes="根据TmsQueueResult对象创建")
+    @ApiImplicitParam(name = "tmsQueueResult", value = "详细实体tmsQueueResult", required = true, dataType = "TmsQueueResult")
+    //@RequiresPermissions("tmsqueueresult:create")
+    @PostMapping(value = "/disposeQueueResult")
+    public RESTfulResult disposeQueueResult(@RequestBody Map<String,Object> map)  {
+        int i = 0;
+        try {
+            i = tmsQueueResultService.disposeQueueResult(map);
+        } catch (Exception e) {
+            return failed(e.getMessage(),e.getMessage());
+        }
+        return success(i);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("tmsqueueresult:view")
+    @GetMapping(value = "/{id}")
+    public RESTfulResult get(@PathVariable BigDecimal id){
+        TmsQueueResult tmsQueueResult = tmsQueueResultService.getById(id);
+        return success(tmsQueueResult);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的tmsQueueResult信息来更新详细信息")
+    @ApiImplicitParams({
+        @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal"),
+        @ApiImplicitParam(name = "tmsQueueResult", value = "详细实体tmsQueueResult", required = true, dataType = "TmsQueueResult")
+    })
+    //@RequiresPermissions("tmsqueueresult:update")
+    @PutMapping(value = "/{id}", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@PathVariable BigDecimal id, @RequestBody TmsQueueResult model){
+        model.setId(id);
+        TmsQueueResult tmsQueueResult = tmsQueueResultService.modify(model);
+        return success(tmsQueueResult);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(paramType = "path", name = "id", value = "ID", required = true, dataType = "BigDecimal")
+    //@RequiresPermissions("tmsqueueresult:delete")
+    @DeleteMapping(value = "/{id}")//BigDecimal
+    public RESTfulResult delete(@PathVariable String id){
+    	List<String> list = Arrays.asList(id.split(","));
+    	if(ListUtils.isNotEmpty(list)) {
+	    	List<BigDecimal> ids = ListUtils.convertList(list);
+			  tmsQueueResultService.delete(ids);
+    	}
+      return success();
+    }
+}

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

@@ -0,0 +1,89 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmsReceiptResultServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import com.steerinfo.dil.model.TmsReceiptResult;
+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.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * TmsReceiptResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-11-03 09:50
+ * 类描述
+ * 修订历史：
+ * 日期：2023-11-03
+ * 作者：generator
+ * 参考：
+ * 描述：TmsReceiptResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsreceiptresults")
+public class TmsReceiptResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsReceiptResultServiceImpl tmsReceiptResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "查询签收")
+    @PostMapping("/getReceiptResultList")
+    public RESTfulResult getReceiptResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                      Integer apiId,
+                                                      Integer pageNum,
+                                                      Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsReceiptResultService.getReceiptResultList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value="签收", notes="")
+    @PostMapping("/receipt")
+    public RESTfulResult receipt(@RequestBody Map<String,Object> map){
+        try{
+            String result = tmsReceiptResultService.receipt(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value="实收吨数", notes="")
+    @PostMapping("/updateWeight")
+    public RESTfulResult updateWeight(@RequestBody Map<String, Object> map) {
+        try{
+            String result = tmsReceiptResultService.updateWeight(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmsReplaceFrontResultServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+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.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsReplaceFrontResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-11-13 10:00
+ * 类描述
+ * 修订历史：
+ * 日期：2023-11-13
+ * 作者：generator
+ * 参考：
+ * 描述：TmsReplaceFrontResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsreplacefrontresults")
+public class TmsReplaceFrontResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsReplaceFrontResultServiceImpl tmsReplaceFrontResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "查询换车头")
+    @PostMapping("/getReplaceFrontResultList")
+    public RESTfulResult getReplaceFrontResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsReplaceFrontResultService.getReplaceFrontResultList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "换车头")
+    @PostMapping("/replaceFront")
+    public RESTfulResult replaceFront(@RequestBody(required = false) Map<String, Object> map) {
+        try{
+            String result = tmsReplaceFrontResultService.replaceFront(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,52 @@
+package com.steerinfo.dil.controller;
+
+
+import com.steerinfo.dil.service.impl.TmsRouteResultServiceImpl;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+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.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 查询自己记录的路径，主要是厂内路径
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsrouteresults")
+public class TmsRouteResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsRouteResultServiceImpl tmsRouteResultService;
+
+    @ApiOperation(value = "查询路径")
+    @PostMapping("/getPathByOrder")
+    public RESTfulResult getPathByOrder(@RequestBody(required = false) Map<String, Object> map) throws Exception{
+       return success(tmsRouteResultService.getPathByOrder(map));
+    }
+
+    @ApiOperation(value = "上传定位，更新路径")
+    @PostMapping("/uploadLocation")
+    public RESTfulResult uploadLocation(@RequestBody(required = false) Map<String, Object> map) {
+        try{
+            String result = tmsRouteResultService.uploadLocation(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,90 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmsSignInResultServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+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.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * TmsSignInResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-11-14 02:50
+ * 类描述
+ * 修订历史：
+ * 日期：2023-11-14
+ * 作者：generator
+ * 参考：
+ * 描述：TmsSignInResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmssigninresults")
+public class TmsSignInResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsSignInResultServiceImpl tmsSignInResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "查询签到")
+    @PostMapping("/getSignInResultList")
+    public RESTfulResult getSignInResultList(@RequestBody(required = false) Map<String, Object> map,
+                                                Integer apiId,
+                                                Integer pageNum,
+                                                Integer pageSize) {
+        if(pageNum != null && pageSize != null) {
+            PageHelper.startPage(pageNum, pageSize);
+        }
+        //分页查询数据
+        List<Map<String,Object>> list = tmsSignInResultService.getSignInResultList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "签到")
+    @PostMapping("/signIn")
+    public RESTfulResult signIn(@RequestBody(required = false) Map<String, Object> map) {
+        try{
+            String result = tmsSignInResultService.signIn(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "校验签到是否过期（定时调用）")
+    @PostMapping("/signInExpireCheck")
+    public RESTfulResult signInExpireCheck() {
+        try{
+            String result = tmsSignInResultService.signInExpireCheck();
+            return success(result,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,314 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.feign.EmsFeign;
+import com.steerinfo.dil.mapper.OmsOrderChildMapper;
+import com.steerinfo.dil.mapper.OmsTransOrderMapper;
+
+import com.steerinfo.dil.mapper.TmsTimingResultMapper;
+import com.steerinfo.dil.model.OmsOrderChild;
+import com.steerinfo.dil.model.OmsTransOrder;
+import com.steerinfo.dil.service.impl.OmsTransOrderServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.cache.server.redis.RedisCache;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+
+import com.steerinfo.dil.model.TmsTimingResult;
+import com.steerinfo.dil.service.ITmsTimingResultService;
+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.scheduling.annotation.Scheduled;
+import org.springframework.web.bind.annotation.*;
+
+
+import javax.xml.crypto.Data;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.math.BigDecimal;
+import java.util.concurrent.*;
+import java.util.stream.Collectors;
+import java.util.zip.ZipEntry;
+
+
+/**
+ * TmsTimingResult RESTful接口：
+ *
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-11-14 04:51
+ * 类描述
+ * 修订历史：
+ * 日期：2023-11-14
+ * 作者：generator
+ * 参考：
+ * 描述：TmsTimingResult RESTful接口
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ * @see null
+ */
+@RestController
+@RequestMapping("/${api.version}/tmstimingresults")
+public class TmsTimingResultController extends BaseRESTfulController {
+    @Autowired
+    OmsTransOrderMapper omsTransOrderMapper;
+
+    @Autowired
+    ITmsTimingResultService tmsTimingResultService;
+
+    @Autowired
+    OmsTransOrderServiceImpl omsTransOrderService;
+
+    @Autowired
+    TmsTimingResultMapper TmsTimingResultMapper;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @Autowired
+    private RedisCache redisCache;
+    @Autowired
+    private TmsTimingResultMapper tmsTimingResultMapper;
+
+    @Autowired
+    private EmsFeign emsFeign;
+
+    @Autowired
+    OmsOrderChildMapper omsOrderChildMapper;
+
+    @ApiOperation(value = "获取列表", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmstimingresult:view")
+    @PostMapping(value = "/tmstimingresultsList")
+    public RESTfulResult list(@RequestBody Map<String,Object> map, Integer apiId, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
+        List<Map<String,Object>> list = TmsTimingResultMapper.tmstimingresultsList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId,null,list,map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "获取列表", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmstimingresult:view")
+    @PostMapping(value = "/getOrderTimeList")
+    public RESTfulResult getOrderTimeList(@RequestBody Map<String,Object> map, Integer apiId, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
+        map.put("workFlag","计时");
+        List<Map<String,Object>> list = tmsTimingResultMapper.getOrderTimeList(map);
+        for (Map<String, Object> stringObjectMap : list) {
+            HashMap<String,Object> map2 = new HashMap<>();
+            map2.put("transOrderId",stringObjectMap.get("TRANS_ORDER_ID"));
+            stringObjectMap.put("timeResult",TmsTimingResultMapper.getByParameters(map2));
+        }
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId,null,list,map.get("userId").toString());
+        return success(pageList);
+    }
+
+
+    @ApiOperation(value = "获取列表", notes = "分页查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmstimingresult:view")
+    @PostMapping(value = "/getTimeList")
+    public RESTfulResult getTimeList(@RequestBody Map<String,Object> map) {
+        List<Map<String,Object>> list = TmsTimingResultMapper.getByParameters(map);
+        return success(list);
+    }
+
+
+    @PostMapping(value = "/tmstimingresultsUpdate")
+    public RESTfulResult tmstimingresultsUpdate(@RequestBody Map<String,Object> map) throws Exception {
+
+        if (!"计时结束".equals(map.get("orderStatus").toString())) {
+            return failed("只能修改计时结束的记录！");
+        }
+        Map<String,Object>transorders = new HashMap<>();
+        transorders.put("transOrderId",DataChange.dataToBigDecimal(map.get("transOrderId")));
+        transorders.put("timeType",2);
+        List<TmsTimingResult> list = tmsTimingResultMapper.selectByParameters(transorders);
+        List<TmsTimingResult> tmsTimingList = list.stream().sorted(Comparator.comparing(TmsTimingResult::getInsertTime).reversed()).collect(Collectors.toList());
+        TmsTimingResult tmsTimingResult=tmsTimingList.get(0);
+        Calendar time = Calendar.getInstance();
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        simpleDateFormat.format(time.getTime());
+        BigDecimal actualDuration = DataChange.dataToBigDecimal(map.get("actualDuration"));
+        tmsTimingResult.setResultId(tmsTimingResult.getResultId());
+        tmsTimingResult.setActualDuration(actualDuration.multiply(new BigDecimal(60)));
+        tmsTimingResult.setInsertUpdateRemark(map.get("userName").toString() + "于" + simpleDateFormat.format(time.getTime()) + "修改了实际时长！");
+        TmsTimingResultMapper.updateByPrimaryKeySelective(tmsTimingResult);
+        emsFeign.upadateEmsDetailsOrder(map);
+        //根据transOrderId查询该订单详细信息
+        Map<String, Object> omsTransOrder = omsTransOrderMapper.getTransOrder(map);
+        //查询日报数据
+        Map<String, Object> reportMap = new HashMap<>();
+        reportMap.put("transOrderId", omsTransOrder.get("transOrderId"));
+        List<Map<String, Object>> updatevalue = tmsTimingResultMapper.getReportOperateDaily(reportMap);
+        if (updatevalue.size()>1||updatevalue.size()==0) {
+            return failed("没有可修改的数据或数据大于两条，请联系运维人员排查解决。");
+        }
+        //修改日报数据
+        int moneyValue = Integer.parseInt(updatevalue.get(0).get("TIME_UTIL_PRICE").toString()) * Integer.parseInt(actualDuration.toString());
+        updatevalue.get(0).put("TIME_OPERATIONAL_VALUE",moneyValue);
+        updatevalue.get(0).put("TIME_PERFORMANCE_VALUE",moneyValue);
+        updatevalue.get(0).put("TOTAL_PERFORMANCE_VALUE",moneyValue);
+        updatevalue.get(0).put("TOTAL_OPERATIONAL_VALUE",moneyValue);
+        tmsTimingResultMapper.updateReportOperateDaily(updatevalue.get(0));
+        return success();
+    }
+
+
+    @PostMapping("/startend")
+    public RESTfulResult start(@RequestBody Map<String, Object> map) {
+        try {
+            String result = tmsTimingResultService.timingResult(map);
+            //关闭订单
+            if("计时结束".equals(result)){
+                omsTransOrderService.updateTimeOrderStatus(DataChange.dataToBigDecimal(map.get("transOrderId")),"计时结束",map.get("userName").toString());
+            }
+            return success(map,result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(map,"计时失败，缺乏必要参数");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(map,e.getMessage());
+        }
+    }
+
+    @PostMapping("/updCountResult")
+    public RESTfulResult updCountResult(@RequestBody Map<String, Object> map) {
+        try {
+            String result = tmsTimingResultService.updCountResult(map);
+            return success(map,result);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(map, "计次失败，缺乏必要参数");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @PostMapping(value = "/approveTimeResult")
+    public RESTfulResult approveTimeResult(@RequestBody Map<String,Object> map){
+        ArrayList<Map<String,Object>> list = (ArrayList) map.get("list");
+        for(Map<String,Object> item:list){
+            if(item.get("endResultId") == null || DataChange.dataToBigDecimal(item.get("endResultId")).compareTo(BigDecimal.ZERO) == 0){
+                return failed("计时未结束，不能审核","计时未结束，不能审核");
+            }
+        }
+        int result = TmsTimingResultMapper.approveTimeResult(map);
+        return success(map,"操作成功:"+result+"条");
+    }
+
+
+    @PostMapping(value = "/resendTimeResult")
+    public RESTfulResult resendTimeResult(@RequestBody Map<String,Object> map){
+        if(map.get("endResultId") != null) {
+            TmsTimingResult tmsTimingResult = TmsTimingResultMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("endResultId").toString()));
+            tmsTimingResult.setActualDuration(DataChange.dataToBigDecimal(map.get("actualDuration").toString()));
+            tmsTimingResult.setAlternateFields1("重新申报");
+            tmsTimingResult.setInsertUsername(map.get("userName").toString());
+            tmsTimingResult.setInsertTime(new Date());
+            tmsTimingResult.setUpdateUsername(map.get("userName").toString());
+            tmsTimingResult.setUpdateTime(new Date());
+            if(tmsTimingResult.getActualDuration().compareTo(BigDecimal.ZERO) < 0){
+                return failed("实际用时不能小于0","实际用时不能小于0");
+            }
+            // 根据运单号查询业务
+            Map<String,Object> stringObjectMap = omsOrderChildMapper.getMessageInfo(tmsTimingResult.getTransOrderId());
+            int result = TmsTimingResultMapper.updateByPrimaryKeySelective(tmsTimingResult);
+            //查询日报数据
+            //更新子表计时时长及结束时长
+            tmsTimingResultMapper.updateTimeResult(tmsTimingResult.getTransOrderId(),tmsTimingResult.getActualDuration());
+            threadPool.execute(()->{
+                try {
+                    Thread.sleep(200);
+                    //传递transOrderId
+                    try {
+                        omsTransOrderService.updateTimeOrderStatus(tmsTimingResult.getTransOrderId(),"计时结束",map.get("userName").toString());
+                        String message = map.get("userName").toString() + "修改了：" +stringObjectMap.get("issueTime") + stringObjectMap.get("capacityInnerNumber") + stringObjectMap.get("operationName") + "业务";
+                        omsTransOrderService.sendMessageToHr("业务数据修改",message);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            });
+            return success(map,"复报成功:"+result+"条");
+        }else{
+            //根据运单ID及子表id
+            if(DataChange.dataToBigDecimal(map.get("actualDuration")).compareTo(BigDecimal.ZERO) < 0) {
+                return failed("实际用时不能小于0","实际用时不能小于0");
+            }
+            Map<String, Object> searchMap = new HashMap<>();
+            searchMap.put("transOrderId",DataChange.dataToBigDecimal(map.get("transOrderId")));
+            searchMap.put("transOrderChildId",DataChange.dataToBigDecimal(map.get("transOrderChildId")));
+            searchMap.put("timeType",2);
+            List<TmsTimingResult> tmsTimingResultList = tmsTimingResultMapper.selectByParameters(searchMap);
+            OmsTransOrder omsTransOrder = omsTransOrderMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("transOrderId")));
+            if(omsTransOrder.getBusinessTypeName() != null && !omsTransOrder.getBusinessTypeName().contains("计时")) {
+                return failed("该单据类型不支持计时复报","该单据类型不支持计时复报");
+            }
+            if(tmsTimingResultList.size() > 0) {
+                tmsTimingResultList.get(0).setActualDuration(DataChange.dataToBigDecimal(map.get("actualDuration").toString()));
+                tmsTimingResultList.get(0).setAlternateFields1("重新申报");
+                tmsTimingResultList.get(0).setInsertUsername(map.get("userName").toString());
+                tmsTimingResultList.get(0).setInsertTime(new Date());
+                tmsTimingResultList.get(0).setUpdateUsername(map.get("userName").toString());
+                tmsTimingResultList.get(0).setUpdateTime(new Date());
+                int result = TmsTimingResultMapper.updateByPrimaryKeySelective(tmsTimingResultList.get(0));
+            }
+            OmsOrderChild omsOrderChild = omsOrderChildMapper.selectByPrimaryKey(DataChange.dataToBigDecimal(map.get("transOrderChildId")));
+            omsOrderChild.setActualDuration(DataChange.dataToBigDecimal(map.get("actualDuration").toString()));
+            omsOrderChild.setTimingDuration(DataChange.dataToBigDecimal(map.get("actualDuration").toString()));
+            omsOrderChildMapper.updateByPrimaryKeySelective(omsOrderChild);
+            Map<String,Object> stringObjectMap = omsOrderChildMapper.getMessageInfo(omsOrderChild.getTransOrderId());
+            threadPool.execute(()->{
+                try {
+                    Thread.sleep(200);
+                    //传递transOrderId
+                    try {
+                        omsTransOrderService.updateTimeOrderStatus(omsOrderChild.getTransOrderId(),"计时结束",map.get("userName").toString());
+                        String message = map.get("userName").toString() + "修改了：" +stringObjectMap.get("issueTime") + stringObjectMap.get("capacityInnerNumber") + stringObjectMap.get("operationName") + "业务";
+                        omsTransOrderService.sendMessageToHr("业务数据修改",message);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+            });
+            //查询日报数据
+            //更新子表计时时长及结束时长
+            return success(map,"复报成功");
+
+        }
+    }
+    @PostMapping(value = "/resartStartTimming")
+    public RESTfulResult startTimming(@RequestBody Map<String,Object> map) throws Exception {
+        String result = tmsTimingResultService.startTimming(map);
+        return success(map,"操作成功:"+result);
+    }
+
+
+
+    ExecutorService threadPool = new ThreadPoolExecutor(2,5,
+            1L, TimeUnit.SECONDS,
+            new LinkedBlockingQueue<>(3),
+            Executors.defaultThreadFactory(),
+            new ThreadPoolExecutor.AbortPolicy());
+}

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

@@ -0,0 +1,444 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.mapper.TmsTransitOrderMapper;
+import com.steerinfo.dil.model.TmsTransitOrder;
+import com.steerinfo.dil.service.ITmsTransitOrderService;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.DaZongUtil;
+import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.dil.util.util;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.lang.reflect.Array;
+import java.rmi.MarshalledObject;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import static java.util.stream.Collectors.toList;
+
+/**
+ * TmsTransitOrder RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2024-07-15 08:47
+ * 类描述
+ * 修订历史：
+ * 日期：2024-07-15
+ * 作者：generator
+ * 参考：
+ * 描述：TmsTransitOrder RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmstransitorders")
+public class TmsTransitOrderController extends BaseRESTfulController {
+
+    @Autowired
+    ITmsTransitOrderService tmsTransitOrderService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @Autowired
+    TmsTransitOrderMapper tmsTransitOrderMapper;
+
+    @Autowired
+    DaZongUtil daZongUtil;
+
+
+
+    @ApiOperation(value="获取列表", notes="分页查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmstransitorder:view")
+    @GetMapping(value = "/selectTmsTransitOrder")
+    public RESTfulResult list(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
+        PageList<TmsTransitOrder> list = tmsTransitOrderService.queryForPage(parmas, pageNum, pageSize);
+        return success(list);
+    }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+        @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("tmstransitorder:view")
+    @PostMapping(value = "/likeTransitOrders")
+    public RESTfulResult listLike(@RequestBody(required = false) HashMap parmas,
+                                  Integer apiId,
+                                  Integer pageNum,
+                                  Integer pageSize){
+        PageHelper.startPage(pageNum, pageSize);
+        parmas.put("deletedList", Arrays.asList(-1,0));
+        if(!parmas.get("roleCodes").toString().contains("radmin")) {
+            parmas.put("insertUsername",parmas.get("userName"));
+        }
+        List<Map<String,Object>> dataList = tmsTransitOrderMapper.selectTransitOrders(parmas);
+        PageListAdd pageListAdd = columnDataUtil.tableColumnDataByUserId(apiId,null,dataList,parmas.get("userId").toString());
+        return success(pageListAdd);
+    }
+    
+    @ApiOperation(value="创建", notes="根据TmsTransitOrder对象创建")
+    @ApiImplicitParam(name = "tmsTransitOrder", value = "详细实体tmsTransitOrder", required = true, dataType = "TmsTransitOrder")
+    @PostMapping(value = "/insertTmsTransitOrder")
+    public synchronized RESTfulResult add(@RequestBody TmsTransitOrder model){
+        Map<String, Object> params = new HashMap<>();
+        List<TmsTransitOrder> tmsTransitOrders = new ArrayList<>();
+        if(model.getDeleted() == 1) {
+            //删除
+            params.put("rjhh",model.getSerialNo());
+            params.put("username",model.getInsertUsername());
+            params.put("note",model.getInsertUpdateRemark());
+            params.put("action",3);
+            try {
+                daZongUtil.execute("30010000016",new Map[]{params});
+            } catch (Exception e) {
+                e.printStackTrace();
+                return failed("大宗推送异常:" + e.getMessage());
+            }
+            model.setAlternateFields3(model.getInsertUsername());
+            tmsTransitOrderMapper.updateByPrimaryKeySelective(model);
+            return success(model);
+        }
+        if (model.getCapacityNumber() != null) {
+            //校验车牌号
+            if(!util.checkPlateCapacityNumber(model.getCapacityNumber())) {
+                return failed("车牌号不符合规则");
+            }
+            if(model.getGatepostName() == null || model.getGatepostName() == "") {
+                return failed("请填写门岗信息！");
+            }
+            String gatepostName = model.getGatepostName();
+            String[] gatepostNameList;
+            if(!"非计量运输车辆".equals(model.getTransitOrderType())) {
+                gatepostNameList = gatepostName.split(",");
+            }else{
+                gatepostNameList = gatepostName.split("w");
+            }
+            for (String gatepost : gatepostNameList) {
+                Map<String, Object> objectObjectHashMap = new HashMap<>();
+                objectObjectHashMap.put("capacityNumber",model.getCapacityNumber());
+                objectObjectHashMap.put("deleted",0);
+                objectObjectHashMap.put("gatepostName",gatepost);
+                List<TmsTransitOrder> tmsTransitOrderList = tmsTransitOrderMapper.selectByParameters(objectObjectHashMap);
+                if (tmsTransitOrderList != null && tmsTransitOrderList.size() > 0) {
+                    tmsTransitOrderList.get(0).setInsertTime(new Date());
+                    tmsTransitOrderList.get(0).setUpdateTime(new Date());
+                    tmsTransitOrderList.get(0).setGatepostName(gatepost);
+                    tmsTransitOrderList.get(0).setInsertTime(new Date());
+                    tmsTransitOrderList.get(0).setUpdateTime(new Date());
+                    tmsTransitOrderList.get(0).setInsertUpdateRemark(model.getInsertUpdateRemark());
+                    tmsTransitOrderList.get(0).setInsertUsername(model.getInsertUsername());
+                    tmsTransitOrderList.get(0).setStartTime(model.getStartTime());
+                    tmsTransitOrderList.get(0).setEndTime(model.getEndTime());
+                    tmsTransitOrderList.get(0).setTelPhone(model.getTelPhone());
+                    tmsTransitOrderList.get(0).setIdentifyCard(model.getIdentifyCard());
+                    tmsTransitOrderList.get(0).setCapacityType(model.getCapacityType());
+                    tmsTransitOrderList.get(0).setAlternateFields1(model.getAlternateFields1());
+                    tmsTransitOrderList.get(0).setDriverName(model.getDriverName());
+                    tmsTransitOrderList.get(0).setTransitOrderType(model.getTransitOrderType());
+                    tmsTransitOrderList.get(0).setAlternateFields5(model.getAlternateFields5());
+                    tmsTransitOrderList.get(0).setAlternateFields6(model.getInsertUsername());
+                    tmsTransitOrders.add(tmsTransitOrderList.get(0));
+                }else{
+                    TmsTransitOrder tmsTransitOrder = new TmsTransitOrder();
+                    tmsTransitOrder.setTransitOrderId(tmsTransitOrderMapper.getTransitOrderId().toString());
+                    tmsTransitOrder.setSerialNo(DataChange.generateEightDigitsNumber("txdd",Integer.parseInt(tmsTransitOrder.getTransitOrderId())));
+                    tmsTransitOrder.setCapacityNumber(model.getCapacityNumber());
+                    tmsTransitOrder.setUpdateTime(new Date());
+                    tmsTransitOrder.setInsertTime(new Date());
+                    tmsTransitOrder.setGatepostName(gatepost);
+                    tmsTransitOrder.setInsertUpdateRemark(model.getInsertUpdateRemark());
+                    tmsTransitOrder.setInsertUsername(model.getInsertUsername());
+                    tmsTransitOrder.setStartTime(model.getStartTime());
+                    tmsTransitOrder.setEndTime(model.getEndTime());
+                    tmsTransitOrder.setTelPhone(model.getTelPhone());
+                    tmsTransitOrder.setIdentifyCard(model.getIdentifyCard());
+                    tmsTransitOrder.setCapacityType(model.getCapacityType());
+                    tmsTransitOrder.setAlternateFields1(model.getAlternateFields1());
+                    tmsTransitOrder.setDriverName(model.getDriverName());
+                    tmsTransitOrder.setTransitOrderType(model.getTransitOrderType());
+                    tmsTransitOrder.setAlternateFields5(model.getAlternateFields5());
+                    tmsTransitOrder.setDeleted(0);
+
+                    tmsTransitOrders.add(tmsTransitOrder);
+                }
+            }
+        }else {
+            return failed("车牌号为空");
+        }
+        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Map[] maps = new Map[tmsTransitOrders.size()];
+        int i = 0;
+        for(TmsTransitOrder tmsTransitOrder : tmsTransitOrders) {
+            Map<String, Object> params1 = new HashMap<>();
+            params1.put("rjhh",tmsTransitOrder.getSerialNo());
+            params1.put("mjbh",tmsTransitOrder.getGatepostName()== null ? "" :tmsTransitOrder.getGatepostName());
+            params1.put("qssj",dateFormat.format(tmsTransitOrder.getStartTime()));
+            params1.put("zzsj",dateFormat.format(tmsTransitOrder.getEndTime()));
+            params1.put("txlx",tmsTransitOrder.getTransitOrderType()== null ? "" :tmsTransitOrder.getTransitOrderType());
+            params1.put("note",tmsTransitOrder.getInsertUpdateRemark()== null ? "" :tmsTransitOrder.getInsertUpdateRemark());
+            params1.put("sfzhid","");
+            params1.put("clbh",tmsTransitOrder.getCapacityNumber()== null ? "" :tmsTransitOrder.getCapacityNumber());
+            params1.put("cllx",tmsTransitOrder.getCapacityType()== null ? "" :tmsTransitOrder.getCapacityType());
+            params1.put("sjxm",tmsTransitOrder.getDriverName()== null ? "" :tmsTransitOrder.getDriverName());
+            params1.put("sfzh",tmsTransitOrder.getIdentifyCard()== null ? "" :tmsTransitOrder.getIdentifyCard());
+            params1.put("tel",tmsTransitOrder.getTelPhone() == null ? "" :tmsTransitOrder.getTelPhone());
+            params1.put("wlbh",tmsTransitOrder.getAlternateFields5() == null ? "":tmsTransitOrder.getAlternateFields5());
+            params1.put("username",tmsTransitOrder.getInsertUsername());
+            maps[i] = params1;
+            i++;
+        }
+        try {
+            daZongUtil.execute("30010000070", maps);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed("大宗推送异常:" + e.getMessage());
+        }
+        for(TmsTransitOrder tmsTransitOrder : tmsTransitOrders) {
+            try {
+                tmsTransitOrderMapper.insertSelective(tmsTransitOrder);
+            } catch (Exception e) {
+                tmsTransitOrderMapper.updateByPrimaryKeySelective(tmsTransitOrder);
+            }
+        }
+        return success(model);
+    }
+
+    @ApiOperation(value="获取详细信息", notes="根据url的id来获取详细信息")
+    @ApiImplicitParam(name = "model", value = "详细实体tmsTransitOrder的id值", required = true, dataType = "TmsTransitOrder")
+    //@RequiresPermissions("tmstransitorder:view")
+    @GetMapping(value = "/getById")
+    public RESTfulResult get(@ModelAttribute TmsTransitOrder model){
+        TmsTransitOrder tmsTransitOrder = tmsTransitOrderService.getById(model);
+        return success(tmsTransitOrder);
+    }
+
+    @ApiOperation(value="更新详细信息", notes="根据url的id来指定更新对象，并根据传过来的tmsTransitOrder信息来更新详细信息")
+    @ApiImplicitParam(name = "tmsTransitOrder", value = "详细实体tmsTransitOrder", required = true, dataType = "TmsTransitOrder")
+    //@RequiresPermissions("tmstransitorder:update")
+    @PutMapping(value = "/", produces  = "application/json;charset=UTF-8")
+    public RESTfulResult update(@RequestBody TmsTransitOrder model){
+        TmsTransitOrder tmsTransitOrder = tmsTransitOrderService.modify(model);
+        return success(tmsTransitOrder);
+    }
+
+    @ApiOperation(value="删除", notes="根据url的id来指定删除对象")
+    @ApiImplicitParam(name = "models", value = "详细实体tmsTransitOrder", required = true, dataType = "TmsTransitOrder")
+    //@RequiresPermissions("tmstransitorder:delete")
+    @DeleteMapping(value = "/")//TmsTransitOrder
+    public RESTfulResult delete(@RequestBody List<TmsTransitOrder> models){
+    	if(ListUtils.isNotEmpty(models)) {
+			  tmsTransitOrderService.delete(models);
+    	}
+      return success();
+    }
+
+    @ApiOperation(value = "批量导入")
+    @PostMapping("/batchInsert")
+    public RESTfulResult batchInsert() {
+        Map<String, Object> objectObjectHashMap = new HashMap<>();
+        objectObjectHashMap.put("deleted",-1);
+        objectObjectHashMap.put("insertUsername","蔺晓杰");
+
+        List<TmsTransitOrder> tmsTransitOrders = tmsTransitOrderMapper.selectByParameters(objectObjectHashMap);
+        for (TmsTransitOrder model:tmsTransitOrders) {
+            Map<String, Object> params = new HashMap<>();
+            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            params.put("rjhh",model.getSerialNo());
+            params.put("mjbh",model.getGatepostName()== null ? "" :model.getGatepostName());
+            params.put("qssj",dateFormat.format(model.getStartTime()));
+            params.put("zzsj",dateFormat.format(model.getEndTime()));
+            params.put("txlx",model.getTransitOrderType()== null ? "" :model.getTransitOrderType());
+            params.put("note",model.getInsertUpdateRemark()== null ? "" :model.getInsertUpdateRemark());
+            params.put("sfzhid","");
+            params.put("clbh",model.getCapacityNumber()== null ? "" :model.getCapacityNumber());
+            params.put("cllx",model.getCapacityType()== null ? "" :model.getCapacityType());
+            params.put("sjxm",model.getDriverName()== null ? "" :model.getDriverName());
+            params.put("sfzh",model.getIdentifyCard()== null ? "" :model.getIdentifyCard());
+            params.put("tel",model.getTelPhone() == null ? "" :model.getTelPhone());
+            params.put("username",model.getInsertUsername());
+            try {
+                daZongUtil.execute("30010000070", new Map[]{params});
+                System.out.println(params.get("clbh"));
+            } catch (Exception e) {
+                e.printStackTrace();
+                System.out.println(params.get("clbh"));
+                model.setDeleted(-1);
+                tmsTransitOrderMapper.updateByPrimaryKey(model);
+                continue;
+                //return failed("大宗推送异常:" + e.getMessage());
+            }
+            model.setDeleted(0);
+            tmsTransitOrderMapper.updateByPrimaryKeySelective(model);
+        }
+        return success();
+    }
+
+    @PostMapping("/importTrasitOrder")
+    public synchronized RESTfulResult importTrasitOrder(@RequestBody(required = false) Map<String,Object> mapValue) {
+        try{
+            String result = tmsTransitOrderService.importTrasitOrder(mapValue);
+            return success(mapValue,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("导入失败！缺乏必要参数！","导入失败！缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),"导入失败！请检查参数是否正确！");
+        }
+    }
+
+    @PostMapping("disposeError")
+    public synchronized int disposeError() {
+
+        return 1;
+    }
+
+
+    //批量删除
+    @PostMapping("batchDelete")
+    public RESTfulResult batchDelete(){
+        Map<String, Object> map = new HashMap<>();
+        map.put("deleted",-1);
+        List<TmsTransitOrder> tmsTransitOrders = tmsTransitOrderMapper.selectByParameters(map);
+        for(TmsTransitOrder model : tmsTransitOrders) {
+            Map<String, Object> params = new HashMap<>();
+            params.put("rjhh",model.getSerialNo());
+            params.put("username",model.getInsertUsername());
+            params.put("note",model.getInsertUpdateRemark());
+            try {
+                daZongUtil.execute("30010000016",new Map[]{params});
+            } catch (Exception e) {
+                e.printStackTrace();
+                continue;
+            }
+            model.setDeleted(1);
+        }
+        tmsTransitOrderMapper.batchUpdate(tmsTransitOrders);
+        return success();
+    }
+
+    @PostMapping("gatepostTransitManager")
+    public synchronized RESTfulResult gatepostTransitManager(@RequestBody Map<String,Object> map) throws Exception {
+        tmsTransitOrderService.gatepostTransitManager(map);
+        return success();
+    }
+
+
+    @PostMapping("disposeTransitOrder")
+    public int disposeTransitOrder(@RequestBody(required = false) Map<String,Object> map) {
+        //首先获取所有通行登记单
+        //map.put("serialNo","txdd2024072200020002");
+        map.put("deleted",-1);
+        map.put("insertUsername","蔺晓杰");
+        List<TmsTransitOrder> tmsTransitOrderLists = tmsTransitOrderMapper.selectByParameters(map);
+        for(TmsTransitOrder model : tmsTransitOrderLists) {
+            if(model.getGatepostName() == null) {
+                continue;
+            }
+            //获取门岗信息
+            String gatepostName = model.getGatepostName();
+            String[] gatepostNameList = gatepostName.split(",");
+            if(gatepostNameList.length == 1) {
+                continue;
+            }
+            List<TmsTransitOrder> tmsTransitOrders = new ArrayList<>();
+            for(String gatepost : gatepostNameList) {
+                Map<String, Object> objectObjectHashMap = new HashMap<>();
+                objectObjectHashMap.put("capacityNumber",model.getCapacityNumber());
+                objectObjectHashMap.put("deleted",0);
+                objectObjectHashMap.put("gatepostName",gatepost);
+                List<TmsTransitOrder> tmsTransitOrderList = tmsTransitOrderMapper.selectByParameters(objectObjectHashMap);
+                if (tmsTransitOrderList != null && tmsTransitOrderList.size() > 0) {
+                    continue;
+                }else{
+                    TmsTransitOrder tmsTransitOrder = new TmsTransitOrder();
+                    tmsTransitOrder.setTransitOrderId(tmsTransitOrderMapper.getTransitOrderId().toString());
+                    tmsTransitOrder.setSerialNo(DataChange.generateEightDigitsNumber("txdd",Integer.parseInt(tmsTransitOrder.getTransitOrderId())));
+                    tmsTransitOrder.setCapacityNumber(model.getCapacityNumber());
+                    tmsTransitOrder.setUpdateTime(new Date());
+                    tmsTransitOrder.setInsertTime(new Date());
+                    tmsTransitOrder.setGatepostName(gatepost);
+                    tmsTransitOrder.setInsertUpdateRemark(model.getInsertUpdateRemark());
+                    tmsTransitOrder.setInsertUsername(model.getInsertUsername());
+                    tmsTransitOrder.setStartTime(model.getStartTime());
+                    tmsTransitOrder.setEndTime(model.getEndTime());
+                    tmsTransitOrder.setTelPhone(model.getTelPhone());
+                    tmsTransitOrder.setIdentifyCard(model.getIdentifyCard());
+                    tmsTransitOrder.setCapacityType(model.getCapacityType());
+                    tmsTransitOrder.setAlternateFields1(model.getAlternateFields1());
+                    tmsTransitOrder.setDriverName(model.getDriverName());
+                    tmsTransitOrder.setTransitOrderType(model.getTransitOrderType());
+                    tmsTransitOrder.setDeleted(0);
+                    tmsTransitOrders.add(tmsTransitOrder);
+                }
+            }
+            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            Map[] maps = new Map[tmsTransitOrders.size()];
+            int i = 0;
+            for(TmsTransitOrder tmsTransitOrder : tmsTransitOrders) {
+                if(tmsTransitOrder.getSerialNo() == null) {
+                    continue;
+                }
+                Map<String, Object> params1 = new HashMap<>();
+                params1.put("rjhh",tmsTransitOrder.getSerialNo());
+                params1.put("mjbh",tmsTransitOrder.getGatepostName()== null ? "" :tmsTransitOrder.getGatepostName());
+                params1.put("qssj",dateFormat.format(tmsTransitOrder.getStartTime()));
+                params1.put("zzsj",dateFormat.format(tmsTransitOrder.getEndTime()));
+                params1.put("txlx",tmsTransitOrder.getTransitOrderType()== null ? "" :tmsTransitOrder.getTransitOrderType());
+                params1.put("note",tmsTransitOrder.getInsertUpdateRemark()== null ? "" :tmsTransitOrder.getInsertUpdateRemark());
+                params1.put("sfzhid","");
+                params1.put("clbh",tmsTransitOrder.getCapacityNumber()== null ? "" :tmsTransitOrder.getCapacityNumber());
+                params1.put("cllx",tmsTransitOrder.getCapacityType()== null ? "" :tmsTransitOrder.getCapacityType());
+                params1.put("sjxm",tmsTransitOrder.getDriverName()== null ? "" :tmsTransitOrder.getDriverName());
+                params1.put("sfzh",tmsTransitOrder.getIdentifyCard()== null ? "" :tmsTransitOrder.getIdentifyCard());
+                params1.put("tel",tmsTransitOrder.getTelPhone() == null ? "" :tmsTransitOrder.getTelPhone());
+                params1.put("username",tmsTransitOrder.getInsertUsername());
+                maps[i] = params1;
+                i++;
+            }
+            try {
+                daZongUtil.execute("30010000070", maps);
+            } catch (Exception e) {
+                e.printStackTrace();
+                continue;
+            }
+            tmsTransitOrderMapper.batchInsert(tmsTransitOrders);
+            model.setDeleted(2);
+            Map<String, Object> params = new HashMap<>();
+            //删除
+            params.put("rjhh",model.getSerialNo());
+            params.put("username",model.getInsertUsername());
+            params.put("note",model.getInsertUpdateRemark());
+            params.put("action",3);
+            try {
+                daZongUtil.execute("30010000016",new Map[]{params});
+            } catch (Exception e) {
+                e.printStackTrace();
+                continue;
+            }
+            tmsTransitOrderMapper.updateByPrimaryKeySelective(model);
+
+        }
+        return 1;
+    }
+
+
+}

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

@@ -0,0 +1,158 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmsUnloadResultServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * TmsUnloadResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-30 10:06
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-30
+ * 作者：generator
+ * 参考：
+ * 描述：TmsUnloadResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsunloadresults")
+public class TmsUnloadResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsUnloadResultServiceImpl tmsUnloadResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "查询卸货")
+    @PostMapping("/getUnloadResultList")
+    public RESTfulResult getUnloadResultList(@RequestBody(required = false) Map<String, Object> map,
+                                            Integer apiId,
+                                            Integer pageNum,
+                                            Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsUnloadResultService.getUnloadResultList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value="卸货", notes="")
+    @PostMapping("/unload")
+    public RESTfulResult unload(@RequestBody Map<String,Object> map){
+        try{
+            String result = tmsUnloadResultService.unload(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value="卸货", notes="")
+    @PostMapping("/unloadUpd")
+    public RESTfulResult unloadUpd(@RequestBody Map<String,Object> map){
+        try{
+            String result = tmsUnloadResultService.unloadUpd(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "查询采购火运卸货")
+    @PostMapping("/purchaseTrainUnloadList")
+    public RESTfulResult purchaseTrainUnloadList(@RequestBody(required = false) Map<String, Object> map,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsUnloadResultService.purchaseTrainUnloadList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value = "采购火运卸货")
+    @PostMapping("/purchaseTrainUnload")
+    public RESTfulResult purchaseTrainUnload(@RequestBody(required = false) Map<String, Object> map) {
+        try{
+            String result = tmsUnloadResultService.purchaseTrainUnload(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed("操作失败，缺乏必要参数！","操作失败，缺乏必要参数！");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation("接收转库单出庫信息")
+    @PostMapping("/receiveTranferInfo")
+    public RESTfulResult receiveTranferInfo(@RequestBody Map<String, Object> map) throws Exception {
+        String result = tmsUnloadResultService.receiveTranferInfo(map);
+        return success(result);
+    }
+
+    @ApiOperation(value = "保存WMS传递的内转入库数据", notes = "保存WMS传递的内转入库数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/preserveMoveListOut")
+    public RESTfulResult preserveMoveListOut(@RequestBody Map<String, Object> mapList) throws Exception {
+        try {
+            tmsUnloadResultService.preserveMoveListOut(mapList);
+            return success();
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "保存WMS传递的内转撤销入库数据", notes = "保存WMS传递的内转撤销入库数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "map", value = "json格式具体参数", required = true, dataType = "Map<String,Object>")
+    })
+    @PostMapping(value = "/preserveMoveListRevokeOut")
+    public RESTfulResult preserveMoveListRevokeOut(@RequestBody Map<String, Object> mapList) throws Exception {
+        try {
+            tmsUnloadResultService.preserveMoveListRevokeOut(mapList);
+            return success();
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), "操作失败，缺乏必要参数！");
+        } catch (Exception e) {
+            e.printStackTrace();
+            return failed(e.getMessage(), e.getMessage());
+        }
+    }
+}

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

@@ -0,0 +1,148 @@
+package com.steerinfo.dil.controller;
+
+import com.steerinfo.dil.service.impl.TmsWeightResultServiceImpl;
+import com.steerinfo.dil.util.ColumnDataUtil;
+import com.steerinfo.dil.util.PageListAdd;
+import com.steerinfo.framework.controller.BaseRESTfulController;
+import com.steerinfo.framework.controller.RESTfulResult;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
+import com.steerinfo.framework.utils.collection.ListUtils;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+import java.math.BigDecimal;
+
+/**
+ * TmsWeightResult RESTful接口：
+ * @author generator
+ * @version 1.0-SNAPSHORT 2023-10-30 10:06
+ * 类描述
+ * 修订历史：
+ * 日期：2023-10-30
+ * 作者：generator
+ * 参考：
+ * 描述：TmsWeightResult RESTful接口
+ * @see null
+ * @Copyright 湖南视拓信息技术股份有限公司. All rights reserved.
+ */
+@RestController
+@RequestMapping("/${api.version}/tmsweightresults")
+public class TmsWeightResultController extends BaseRESTfulController {
+
+    @Autowired
+    TmsWeightResultServiceImpl tmsWeightResultService;
+
+    @Autowired
+    ColumnDataUtil columnDataUtil;
+
+    @ApiOperation(value = "查询计量")
+    @PostMapping("/getWeightResultList")
+    public RESTfulResult getWeightResultList(@RequestBody(required = false) Map<String, Object> map,
+                                           Integer apiId,
+                                           Integer pageNum,
+                                           Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsWeightResultService.getWeightResultList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value="同步计量实绩", notes="允许修改")
+    @PostMapping("/syncWeightResult")
+    public RESTfulResult syncWeightResult(@RequestBody Map<String,Object> map){
+        try{
+            List<Map<String,Object>> mapList = tmsWeightResultService.addOrderWeight(map);
+            for(Map<String,Object> map1 : mapList) {
+                String result = tmsWeightResultService.syncWeightResult(map1);
+            }
+            return success(map,"同步成功");
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(map,"同步失败，缺乏必要参数");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "查询计量")
+    @PostMapping("/purchaseTrainWeightList")
+    public RESTfulResult purchaseTrainWeightList(@RequestBody(required = false) Map<String, Object> map,
+                                             Integer apiId,
+                                             Integer pageNum,
+                                             Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        //分页查询数据
+        List<Map<String,Object>> list = tmsWeightResultService.purchaseTrainWeightList(map);
+        PageListAdd pageList = columnDataUtil.tableColumnDataByUserId(apiId, null, list, map.get("userId").toString());
+        return success(pageList);
+    }
+
+    @ApiOperation(value="新增计量实绩", notes="允许修改")
+    @PostMapping("/purchaseTrainWeight")
+    public RESTfulResult purchaseTrainWeight(@RequestBody Map<String,Object> map){
+        try{
+            String result = tmsWeightResultService.purchaseTrainWeight(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(map,"上传失败，缺乏必要参数");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "审核计量实绩")
+    @PostMapping("/checkWeightResult")
+    public RESTfulResult checkWeightResult(@RequestBody(required = false) Map<String, Object> map) {
+        try{
+            String result = tmsWeightResultService.checkWeightResult(map);
+            return success(map.get("list"),result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(map,"上传失败，缺乏必要参数");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "同步理论重量")
+    @PostMapping("/syncTheoryWeight")
+    public RESTfulResult syncTheoryWeight(@RequestBody(required = false) Map<String, Object> map) {
+        try{
+            String result = tmsWeightResultService.syncTheoryWeight(map);
+            return success(map,result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(map,"上传失败，缺乏必要参数");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+
+    @ApiOperation(value = "补录采购实绩包装物重量")
+    @PostMapping("/buluBzwWeight")
+    public RESTfulResult buluBzwWeight() {
+        try{
+            String result = tmsWeightResultService.buluBzwWeight();
+            return success(result);
+        }catch (NullPointerException e){
+            e.printStackTrace();
+            return failed(e.getMessage(),"操作失败，缺乏必要参数");
+        }catch (Exception e){
+            e.printStackTrace();
+            return failed(e.getMessage(),e.getMessage());
+        }
+    }
+}

src/main/java/com/steerinfo/dil/feign/AmsFeign.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.*;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+
+@FeignClient(value = "ANTAI-AMS-API", url = "${openfeign.AmsFeign.url}")
+public interface AmsFeign {
+
+    @PostMapping(value = "api/v1/ams/amstransplans/purchaseTrainPlanAdd")
+    Map<String, Object> purchaseTrainPlanAdd(Map<String,Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/purchaseTrainToRequirement")
+    Map<String, Object> purchaseTrainToRequirement(Map<String,Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/transProductRequirementFromDz")
+    Map<String, Object> transProductRequirementFromDz(Map<String,Object> map);
+
+    @PostMapping(value = "api/v1/ams/amstransrequirements/transPurchaseRequirementFromDz")
+    Map<String, Object> transPurchaseRequirementFromDz(Map<String, Object> map);
+}

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

@@ -0,0 +1,24 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.stereotype.Service;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author zhangnan
+ * @Date 2021/6/23 9:58
+ * @Version 1.0
+ */
+@Service
+@FeignClient(value = "DIL-COLUMN-DATA-DEV",url = "${openfeign.ColumnDataFeign.url}")
+public interface ColumnDataFeign {
+    @RequestMapping("getColumnData")
+    List<Map<String,Object>> getColumnData(@RequestParam("apiId") Integer apiId);
+
+    @RequestMapping("getColumnData")
+    List<Map<String,Object>> getColumnDataByUserId(@RequestParam("apiId") Integer apiId,@RequestParam(required = false,value = "userId") String userId);
+}

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

@@ -0,0 +1,91 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "ANTAI-DZ-API", url = "${openfeign.DzFeign.url}")
+public interface DzFeign {
+    @PostMapping("/api/v1/dz/test/getUnloadDetails")
+    Map<String, Object> getUnloadDetails(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getLoadDetails")
+    Map<String, Object> getLoadDetails(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getUnUploadOrder")
+    Map<String, Object> getUnUploadOrder();
+
+    @PostMapping("/api/v1/dz/test/getCapacityDetails")
+    Map<String, Object> getCapacityDetails(@RequestBody(required = false) Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getTransOrderDz")
+    List<Map<String, Object>> getTransOrderDz();
+
+    @PostMapping("/api/v1/dz/test/getTransOrderBzw")
+    List<Map<String, Object>> getTransOrderBzw(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getTransResult")
+    Map<String,Object> getTransResult(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getTransResultList")
+    List<Map<String, Object>> getTransResultList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getSignList")
+    List<Map<String, Object>> getSignList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getInnerCode")
+    Map<String,Object> getInnerCode(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/getProductionResultList")
+    List<Map<String, Object>> getProductionResultList(@RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/restartWeightResult")
+    int restartWeightResult(@RequestBody List<String> ysddList);
+
+    @PostMapping("/api/v1/dz/test/getErrorRequirement")
+    Map<String,Object> getErrorRequirement( @RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/updWeightStatus")
+    String updWeightStatus( @RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/syncTheoryWeight")
+    Map<String, Object> syncTheoryWeight( @RequestBody Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/updateBfIcInfo")
+    int updateBfIcInfo(Map<String, Object> map);
+
+    @PostMapping("/api/v1/dz/test/modifyChange")
+    String modifyChange(Map<String, Object> map);
+
+    @GetMapping("/api/v1/dz/test/getInnerResult")
+    List<Map<String,Object>> getInnerResult();
+
+
+    @GetMapping("/api/v1/dz/test/getErrorResult")
+    List<String> getErrorResult();
+
+    @PostMapping("/api/v1/dz/test/getRightWeightInfo")
+    Map<String, Object> getRightWeightInfo(@RequestBody Map<String, Object> map);
+
+    @PostMapping("/api/v1/dz/test/getNetWeightResult")
+    List<Map<String, Object>> getNetWeightResult(Map<String, Object> map);
+
+    @PostMapping("/api/v1/dz/test/getIdcards")
+    Map<String, Object> getIdcards(Map<String, Object> map1);
+
+    @PostMapping("/api/v1/dz/test/getZxTime")
+    Map<String, Object> getZxTime(Map<String, Object> map1);
+
+    @PostMapping("/api/v1/dz/test/getDbInnerResult")
+    List<Map<String, Object>> getDbInnerResult(Map<String,Object> map);
+
+    @PostMapping("/api/v1/dz/test/updateYf")
+    int updateYf(Map<String, Object> resMap);
+
+    @PostMapping("/api/v1/dz/test/getBlueList")
+    Map<String, Object> getBlueList();
+}

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

@@ -0,0 +1,30 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.math.BigDecimal;
+import java.util.Map;
+
+/**
+ * @ author    :TXF
+ * @ time      :2021/9/28 9:30
+ */
+
+@FeignClient(name = "ANTAI-EMS-API", url = "${openfeign.EmsFeign.url}")
+public interface EmsFeign {
+
+    @PostMapping("api/v1/ems/emsdetailsorders/emsdetailsordersAdd")
+    Map<String, Object> emsdetailsordersAdd(@RequestBody(required = false) Map<String, Object> map);
+
+    @PostMapping("api/v1/ems/emsdetailsorders/upadateEmsDetailsOrder")
+    Map<String, Object> upadateEmsDetailsOrder(@RequestBody(required = false) Map<String, Object> map);
+
+
+}
+
+
+
+
+
+

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

@@ -0,0 +1,20 @@
+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;
+
+/**
+ * @ClassName ReportFeign
+ * @Description TODO
+ * @date 2024-08-30 14:34
+ * @Version 1.0
+ */
+@FeignClient(name = "ANTAI-RMS-API", url = "${openfeign.REPORTFeign.url}")
+public interface ReportFeign {
+    @PostMapping(value = "/api/v1/report/reportDaily/generateOperateDaily")
+    RESTfulResult generateOperateDaily(@RequestBody(required = false) Map<String, Object> mapValue);
+}

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

@@ -0,0 +1,22 @@
+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 org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "ANTAI-RMS-API", url = "${openfeign.RmsFeign.url}")
+public interface RmsFeign {
+    @PostMapping(value = "/api/v1/rms/rmscapacity/getCapacityList")
+    Map<String, Object> getCapacityList(@RequestBody(required = false) Map<String, Object> mapValue);
+
+    @PostMapping(value = "/api/v1/rms/rmscapacitydrivers/insertCapacityDriver")
+    RESTfulResult insertCapacityDriver(@RequestBody(required = false) Map<String, Object> mapValue);
+    @PostMapping(value = "/api/v1/rms/rmscapacitydrivers/deleteCapacityDriver")
+    RESTfulResult deleteCapacityDriver(@RequestBody(required = false) Map<String, Object> mapValue);
+
+}

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

@@ -0,0 +1,29 @@
+package com.steerinfo.dil.feign;
+
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+
+@FeignClient(value = "ANTAI-TMI-API", url = "${openfeign.TmiFeigh.url}")
+public interface TmiFeign {
+
+    @PostMapping(value = "/api/v1/tmi/test/addWmsCarNo")
+    Map<String,Object> addWmsCarNo(@RequestBody Map<String,Object> map);
+
+    @PostMapping(value = "/api/v1/tmi/test/deleteWmsCarNo")
+    Map<String,Object> deleteWmsCarNo(@RequestBody Map<String,Object> map);
+
+    @PostMapping(value = "/api/v1/tmi/test/syncWmsCarNo")
+    Map<String,Object> syncWmsCarNo(@RequestBody Map<String,Object> map);
+
+    @PostMapping(value = "/api/v1/tmi/test/getWmsData")
+    List<Map<String,Object>> getWmsData(@RequestBody Map<String,Object> map);
+
+    @PostMapping(value = "/api/v1/tmi/test/getBuWmsData")
+    List<Map<String,Object>> getBuWmsData(@RequestBody Map<String,Object> map);
+
+}

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

@@ -0,0 +1,35 @@
+package com.steerinfo.dil.feign;
+
+import com.steerinfo.framework.controller.RESTfulResult;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(name = "websocket-API", url = "${openfeign.WebSocketFeign.url}")
+public interface WebsocketFeign {
+
+    @PostMapping("api/v1/websocket/basewebsocketsends/readWebsocket/{id}")
+    RESTfulResult readWebsocket(@PathVariable("id") String sendId);
+
+    @PostMapping("api/v1/websocket/basewebsocketsends/sendWebsocket/{id}")
+    RESTfulResult sendWebsocket(@PathVariable("id") String webSocketId, @RequestBody HashMap<String,Object> map);
+
+    @GetMapping("api/v1/websocket/basewebsocketpushs/{id}")
+    RESTfulResult get(@PathVariable String id);
+    @GetMapping("api/v1/websocket/basewebsocketpushs/getUserByOrgCode/{orgCode}")//String
+    RESTfulResult getUserByOrgCode(@PathVariable("orgCode") String orgCode);
+    @PostMapping("/sendWebsocketByIds/{ids}")
+    RESTfulResult sendWebsocketByIds(@PathVariable("ids") String webSocketIds, @RequestBody HashMap<String,Object> map);
+
+    @PostMapping("api/v1/websocket/basewebsocketpushs/pushUniMessage")
+    RESTfulResult pushUniMessage(@RequestBody Map<String,Object> map);
+
+    @PostMapping("api/v1/websocket/basewebsocketpushs/pushUniMessageList")
+    RESTfulResult pushUniMessageList(@RequestBody Map<String,Object> map);
+}

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

@@ -0,0 +1,36 @@
+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 java.util.Map;
+
+
+@FeignClient(value = "ANTAI-WMS-API", url = "${openfeign.WmsFeign.url}")
+public interface WmsFeign {
+
+    @PostMapping(value = "api/v1/wms/wmsinboundresults/inbound")
+    RESTfulResult inbound(Map<String,Object> map);
+
+    @PostMapping(value = "api/v1/wms/wmsinboundresults/batchInbound")
+    RESTfulResult batchInbound(Map<String,Object> map);
+
+    @PostMapping(value = "api/v1/wms/wmsinboundresults/batchUpdInbound")
+    RESTfulResult batchUpdInbound(Map<String, Object> updInboundMap);
+
+    @PostMapping(value = "api/v1/wms/wmsoutboundresults/outbound")
+    RESTfulResult outbound(Map<String,Object> map);
+
+    @PostMapping(value = "api/v1/wms/wmsoutboundresults/updateOutbound")
+    RESTfulResult updateOutbound(Map<String,Object> map);
+
+    @PostMapping(value = "api/v1/wms/wmsoutboundresults/batchOutbound")
+    RESTfulResult batchOutbound(Map<String,Object> map);
+
+    @PostMapping(value = "api/v1/wms/wmsoutboundresults/batchUpdOutbound")
+    RESTfulResult batchUpdOutbound(Map<String, Object> updOutboundMap);
+
+    @PostMapping(value = "api/v1/wms/wmsinboundresults/updateInbound")
+    RESTfulResult updateInbound(Map<String,Object> map);
+}

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

@@ -0,0 +1,17 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsBindRequirement;
+import com.steerinfo.dil.model.AmsBindRequirement;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+
+@Mapper
+public interface AmsBindRequirementMapper extends IBaseMapper<AmsBindRequirement, BigDecimal> {
+
+    @Select("select seq_AMS_BIND_REQUIREMENT.nextval from dual")
+    BigDecimal nextId();
+}

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

@@ -0,0 +1,50 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsPlanChild;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface AmsPlanChildMapper extends IBaseMapper<AmsPlanChild, BigDecimal> {
+    @Select("select seq_AMS_PLAN_CHILD.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    //查询需求物资分录剩余数量、重量、车数
+    Map<String, Object> selectLeftByChildId(BigDecimal requirementChildId);
+
+    Map<String, Object> selectLeftByChildId1(Map<String, Object> map);
+    Map<String, Object> selectLeftByChildId2(Map<String, Object> map);
+
+
+    int countTransOrder(Map<String, Object> map);
+
+    //获取需求的剩余重量
+    BigDecimal overWeight(String dlivDirno);
+
+    Integer addBatch(List<AmsPlanChild> list);
+
+    List<Map<String, Object>> getMaterial(String prodCode);
+
+    //根据计划子表ID查询发运单物料信息
+    Map<String, Object> selectPlanChildById(String planChildId);
+
+    BigDecimal selectPlanIdBy(BigDecimal requirementChildId);
+
+    BigDecimal selectPlanChildId(BigDecimal stTdfl);
+
+    BigDecimal selectMaterialWeight(BigDecimal stTdfl);
+
+    int updateRequirementStatus(BigDecimal stTdfl);
+
+    Integer countExecuteTransOrder(Map<String, Object> map);
+
+    void updateUnExcuteOrder(Map<String, Object> map);
+
+}

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

@@ -0,0 +1,53 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsRequirementChild;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface AmsRequirementChildMapper extends IBaseMapper<AmsRequirementChild, BigDecimal> {
+    @Select("select SEQ_AMS_REQUIREMENT_CHILD.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+	
+	//根据发货单查询
+    AmsRequirementChild selectDlivDirNo(String dlivDirno);
+    //发货单第几次退库
+    String getcut(String dlivDirno);
+    //新增发货单退货记录
+    void insertRetrunLog(HashMap<String, Object> params);
+    //删除派车单退货记录
+    void deleteRevokeLog(String id);
+    //删除需求子表记录
+    void deleteDlivDirno(String dlivDirno);
+
+    Integer addBatch(List<AmsRequirementChild> list);
+
+    Integer addLogBatch(List<HashMap<String, Object>> list);
+
+    //查询WMS发货单修改状态需要的信息
+    List<Map<String, Object>> selectSlmDlivDirByStatus(List list);
+
+    //修改WMS发运单信息
+    Integer updateWMSSlmDlivDir(Map<String,Object> params);
+
+    //根据发运单号查询WMS发运单信息
+    Map<String, Object> selectWMSSlmDlivDirByDlivDirno(String dlivDirno);
+
+    //根据发运单查询派车单车数
+    Integer countSlmDlivDirListByDlivDirno(String dlivDirno);
+
+    //根据发货单号删除发货单
+    Integer deleteDlivDirnoByDlivDirno(String dlivDirno);
+
+    Date selectDueTime(BigDecimal requirementChildId);
+
+}

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

@@ -0,0 +1,42 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsTransPlan;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface AmsTransPlanMapper extends IBaseMapper<AmsTransPlan, BigDecimal> {
+    @Select("select seq_AMS_TRANS_PLAN.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String, Object>> getPurchasePlanList(Map<String, Object> map);
+
+    List<Map<String, Object>> getpproductionPlanList(Map<String, Object> map);
+
+    Integer logicDelete(Map<String, Object> map);
+
+    List<Map<String, Object>> getSalePlanList(Map<String, Object> map);
+
+    //查看有没有正在使用的派车单
+    Integer selectCount(BigDecimal planChildId);
+
+    Integer addBatch(List<AmsTransPlan> list);
+
+
+    //无差别删除计划下所有运单（采购火运用）
+    int deleteTranOrders(BigDecimal transPlanId);
+
+    HashMap<String, Object> findMaterialByProdCode(String prodCode);
+
+    int updateRequirementStatus(@Param("requirementChildId") BigDecimal requirementChildId, @Param("requirementStatus") int requirementStatus);
+
+}

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

@@ -0,0 +1,139 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.AmsTransRequirement;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface AmsTransRequirementMapper extends IBaseMapper<AmsTransRequirement, BigDecimal> {
+    @Select("select seq_AMS_TRANS_REQUIREMENT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+	//获取发货点序号
+    @Select("select seq_rms_operation_point.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal pointNextId();
+
+	
+    List<Map<String, Object>> getPurchaseRequirementList(Map<String, Object> map);
+
+    List<Map<String, Object>> getproductionRequirementList(Map<String, Object> map);
+
+    //查询需求子计划数量
+    int countPlan(Map<String, Object> map);
+
+    //根据分录修改需求状态
+    int changeByChildId(Map<String, Object> map);
+
+    List<Map<String, Object>> getProductiveRequirementList(Map<String, Object> map);
+
+    //生产需求改变状态
+    int updateStatus(Map<String, Object> map);
+	
+	//查询收货点
+    HashMap<String, Object> selectRmsOperationPoint(String operationPointName);
+
+    //查询最大发货单号
+    String selectMax();
+
+    //增加发运单
+    void insertDlivDirNO(HashMap<String, Object> params);
+
+    //查询发货单
+    List<Map<String, Object>> selectDlivDirNo(HashMap<String, Object> map);
+
+    //修改需求子表记录
+    void updatedlivDirNo(HashMap<String, Object> params);
+
+    //根据发货单号查询需求子表
+    HashMap<String, Object> selectByDlivDirNo(String dlivDirno);
+
+    int logicdelete(BigDecimal transRequirementId);
+
+    Integer addBatch(List<AmsTransRequirement> list);
+
+    //获取物资信息
+    List<HashMap<String, Object>> findMaterial(String materialCode);
+
+    //获取公司信息
+    List<HashMap<String, Object>> findCompany(String companyName, String companyType);
+
+    //获取装卸点信息
+    List<HashMap<String, Object>> findOperationPoint(String operationPointName);
+
+    //获取业务类型
+    Map<String,Object> getBusinessType(BigDecimal businessType);
+
+
+    Integer amstransrequirementapporves(@Param("ids") List<BigDecimal> ids, @Param("deleted")BigDecimal deleted);
+
+    //查询需求审批界面
+    List<Map<String, Object>> getproductionRequirementworkflowList(Map<String, Object> map);
+
+    //查询WMS需要的内容
+    Map<String, Object> selectDlivDirnoByWMS(String dlivDirno);
+
+    //新增wms中的发运单
+    int insertSlmDlivDirWms(Map<String, Object> params);
+
+    int deactivatedRequirement(List<Map<String, Object>> mapList);
+
+    int getApproveStatus(BigDecimal transRequirementId);
+
+    //查询业务类型
+    Map<String, Object> selectDilBusinessType(Map<String, Object> params);
+
+    List<Map<String, Object>> requirementApproveDetails(Map<String, Object> map);
+
+    Map<String, Object> selectRequirementStatus(BigDecimal transRequirementId);
+
+    Map<String, Object> getRequireInfo(Map<String, Object> map);
+
+    List<Map<String, Object>> getSaleTransRequirement(Map<String, Object> map);
+
+    //根据线路ID查询计量点
+    String findCalculateByLineId(@RequestParam("lineId") BigDecimal lineId);
+
+    List<Map<String, Object>> getUpdateDlivDirno(Map<String, Object> map);
+
+
+    String getMaterialVague(String materialId);
+
+    String selectBusinessType(BigDecimal businessType);
+
+    Map<String, Object> getNextInfo(Map<String, Object> map);
+
+    int selectWorkFlow(Map<String, Object> map);
+
+    //根据业务类型Id查询业务类型名
+    String selectBusinessTypeName(String businessTypeId);
+
+    //新增到货地点
+    int insertOperationPoint(Map<String, Object> params);
+
+    List<Map<String, Object>> selectOperationPoint(Map<String, Object> params);
+
+    Map<String, Object> selectStSearchMap(Map<String, Object> searchMap);
+
+    List<AmsTransRequirement> selectByParametersSt(Map<String, Object> map);
+
+    List<String> getCapacityDriverById(String capacityId, String[] driverIds);
+
+    List<BigDecimal> selectQingRequirementIds(@Param("time") Date time, @Param("time1") Date time1);
+
+    Map<String, Object> getInboundInfo(BigDecimal planChildId);
+
+    BigDecimal getOldGridMaterialId(Map<String, Object> inboundInfo);
+
+}

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

@@ -0,0 +1,124 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.OmsOrderChild;
+import com.sun.corba.se.spi.ior.ObjectKey;
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface CommonMapper {
+
+
+    Map<String,Object> getDriverInfo(BigDecimal driverId);
+
+    Map<String, Object> getCapacityInfo(BigDecimal capacityId);
+
+    Map<String, Object> getBussinessInfo(BigDecimal orderType);
+
+    Map<String, Object> getMaterialInfo(BigDecimal materialId);
+
+    Map<String, Object> getWeightMap(BigDecimal orderChildId);
+
+    Map<String, Object> getActualWeightMao(BigDecimal transOrderId);
+
+    Map<String, Object> getCompanyInfo(BigDecimal companyId);
+
+    Map<String, Object> getLineInfo(BigDecimal lineId);
+
+    Map<String, Object> getCapacityTypeInfo(BigDecimal capacityTypeId);
+
+    Map<String, Object> getMaterialTypeInfo(BigDecimal operationsNameId);
+
+    Map<String, Object> getOerationRangeInfo(String operationsRange);
+
+    Map<String, Object> getPointInfo(BigDecimal pointId);
+
+
+    List<Map<String, Object>> getHrInfo();
+
+    List<Map<String, Object>> getPinfo(Map<String, Object> map);
+
+    int updatePinfo(Map<String, Object> map);
+
+    void updatePinfo1(Map<String, Object> map);
+
+    String selectIdcard(String driverName1);
+
+    List<BigDecimal> getChildList(Map<String,Object> map);
+
+    List<BigDecimal> getPlanChildList();
+
+    List<Map<String,Object>> selectLeaveInfo();
+
+    void updatePersonnelStatus(@Param("personnelId") BigDecimal personnelId, @Param("deleted") Integer deleted);
+
+    List<Map<String, Object>> selectFgInfo();
+
+    List<Map<String, Object>> selectJcInfo();
+
+    List<Map<String, Object>> selectNoDispatchRequirement();
+
+    List<Map<String, Object>> getCapacityMes(Map<String, Object> objectObjectHashMap);
+
+
+    List<Map<String, Object>> getCbbCapacityMes(Map<String, Object> objectObjectHashMap);
+
+    Map<String,Object> getZhiHuiGongId(@Param("capacityId") Object capacityId);
+
+
+    List<Map<String,Object>> getDiaoGuaGongIds(@Param("capacityId") Object capacityId, @Param("personnelNumber") BigDecimal personnelNumber);
+
+    List<BigDecimal> getOrderListByChild(BigDecimal requirementChildId);
+
+    List<Map<String, Object>> selectQingRequirement(String requirementType);
+
+    List<Map<String, Object>> selectQingPersonnelId(Integer sort, String requirementType1);
+
+    List<BigDecimal> getChildListOrder(Map<String, Object> map);
+
+    List<Map<String, Object>> getAddPMes(@Param("flag") String flag,@Param("addPNum") Integer addPNum);
+
+    List<String> selectGpTzd();
+
+    List<Map<String, Object>> selectAbnormalCapacityDriverList(Map<String,Object> map);
+
+    List<Map<String, Object>> selectNoDispatchRequirementZtZx();
+
+    Map<String, Object> getLastCarInfo(String clFlag);
+
+    Map<String, Object> getZcpLastCarInfo(String clFlag);
+
+    int getCapacityStatus(BigDecimal capacityId);
+
+    int getCapacityStatusZcp(BigDecimal capacityId);
+
+    int getWcCapacityStatus(BigDecimal capacityId);
+
+    Map<String, Object> getLastCarInfoJx(String clFlag);
+
+    int getDriverStatus(BigDecimal driverId);
+
+    int getDriverStatusZcp(BigDecimal driverId);
+
+    int getWcDriverStatus(BigDecimal driverId);
+
+    List<Map<String, Object>> selectZcpNoDispatchRequirementZtZx();
+
+    Map<String, Object> getLastQingCar(String requirementType);
+
+    List<Map<String, Object>> selectCgNeedUpdateList(@Param("mapCgList") List<Map<String, Object>> mapCgList);
+
+    List<Map<String, Object>> getNoSignMesList();
+
+    List<Map<String, Object>> getNoTimeStartMesList();
+
+    List<Map<String, Object>> getNoFinishStartMesList();
+
+    String getAutoFlag();
+
+}

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

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.DilContrastingRelation;
+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 DilContrastingRelationMapper extends IBaseMapper<DilContrastingRelation, BigDecimal> {
+
+    @Select("select SEQ_DIL_CONTRASTING_RELATION.nextval from dual")
+    BigDecimal nextId();
+
+    List<DilContrastingRelation> selectInfoMap(String serialNumber);
+
+    List<DilContrastingRelation> selectDbMap(@Param("businessRange") String businessRange, @Param("materialName")String materialName);
+
+}

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

@@ -0,0 +1,93 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.OmsOrderChild;
+import com.steerinfo.dil.model.OmsTransOrder;
+import com.steerinfo.dil.model.TmsQueueGrid;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface OmsOrderChildMapper extends IBaseMapper<OmsOrderChild, BigDecimal> {
+    @Select("select SEQ_OMS_ORDER_CHILD.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    @Select("select SEQ_OMS_ORDER_CHILD.nextval from dual CONNECT BY LEVEL <= #{length}")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    List<BigDecimal> nextIds(int length);
+
+    //查询已派单的运单分录
+    List<Map<String,Object>> findOrderChild(Map<String,Object> map);
+
+    //查询计划分录
+    Map<String,Object> findPlanChild(Map<String,Object> map);
+
+    //查询销售计划分录
+    Map<String,Object> findPlanChild2(Map<String,Object> map);
+
+
+    //查询线路详情
+    List<Map<String,Object>> findLineDetails(BigDecimal lineId);
+
+    //查询排班详情
+    List<BigDecimal> findDriverDetails(Map<String,Object> map);
+
+    //查询最大派单单号
+    String selectMax(Integer num);
+
+    Map<String, Object> getBusinessTypeByChildId(BigDecimal transOrderChildId);
+
+    List<Map<String,Object>> getRequireLoads(BigDecimal planChildId);
+
+    //查询计划分录
+    Map<String,Object> findPlanChild1(Map<String,Object> map);
+
+    BigDecimal selectNewOrderChildId(BigDecimal transOrderId);
+
+    List<OmsOrderChild> selectByOms();
+
+    List<Map<String,Object>> selectOrderInfo(TmsQueueGrid tmsQueueGrid);
+
+    OmsOrderChild selectInwardTransOrderId(Map<String, Object> stSearchMap);
+
+    Map<String,Object> selectWeightTransOrderId(Map<String, Object> searchMap);
+
+    BigDecimal selectAllWeight(BigDecimal oldTransOrderId);
+
+    BigDecimal getRequirementChildId(BigDecimal transOrderId);
+
+    Map<String,Object> getPlanChildId(Map<String, Object> stringObjectMap);
+
+    List<Map<String,Object>> getDzOrderIds();
+
+    void updateNetWeightInfo(Map<String, Object> stringObjectMap);
+
+    void updateWeightResultInfo(Map<String, Object> stringObjectMap);
+
+    BigDecimal getGridId(Map<String, Object> map);
+
+    List<OmsOrderChild> getGpWeightData(OmsTransOrder daCheOmsTransOrder);
+
+    Map<String,Object> selectBusinessRange(BigDecimal planChildId);
+
+    List<String> selectMaterialName();
+
+    int updateReciptDate(@Param("orderChildId") BigDecimal orderChildId,@Param("guoDuDate") Date guoDuDate);
+
+    BigDecimal getNextPrice(Map<String, Object> map);
+
+    BigDecimal getTotalTonnageValue(BigDecimal orderChildId);
+
+    BigDecimal getDzOmsOrderChildId(Map<String, Object> objectObjectHashMap1);
+
+    Map<String, Object> getMessageInfo(BigDecimal transOrderId);
+
+}

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

@@ -0,0 +1,363 @@
+package com.steerinfo.dil.mapper;
+
+import java.math.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.steerinfo.dil.model.OmsTransOrder;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import io.swagger.models.auth.In;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface OmsTransOrderMapper extends IBaseMapper<OmsTransOrder, BigDecimal> {
+    @Select("select SEQ_OMS_TRANS_ORDER.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    @Select("select SEQ_OMS_TRANS_ORDER.nextval from dual CONNECT BY LEVEL <= #{length}")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    List<BigDecimal> nextIds(int length);
+
+    List<Map<String, Object>> getTransOrderList(Map<String, Object> map);
+
+    int closeTransOrderByPlan(Map<String, Object> map);
+
+    List<BigDecimal> getTransOrderIdByNumber(Map<String, Object> map);
+
+    BigDecimal getOperationPointId(@Param("operationPointName") String operationPointName,
+                                   @Param("operationPointCode") String operationPointCode);
+
+    BigDecimal getOperationPointBySourceId(String sourceId);
+
+    BigDecimal getMaterialId(@Param("materialName") String materialName,
+                                   @Param("materialCode") String materialCode);
+
+    BigDecimal getMaterialIdByCode( @Param("materialCode") String materialCode);
+
+    BigDecimal getPersonnelId(@Param("personnelName") String personnelName);
+
+    Map<String, Object> getPersonnelById(@Param("personnelId") BigDecimal personnelId);
+
+    BigDecimal getPersonnelIdByUserId(@Param("userId") String userId);
+
+    BigDecimal getCapacityId(@Param("capacityNumber") String capacityNumber);
+
+    Map<String, Object> getCapacityById(@Param("capacityId") BigDecimal capacityId);
+
+    Map<String, Object> getBusinessType(BigDecimal businessTypeId);
+
+    Map<String, Object> getTransOrder(Map<String, Object> map);
+
+
+    List<Map<String, Object>> getSaleTransOrderList(Map<String, Object> map);
+
+
+    BigDecimal getCountEnfactory(Map<String, Object> map);
+
+    Integer selectDlivDirnoSeqCount(String dlivDirnoSeq);
+
+    String findOperationByOperationName(String operationName);
+
+    Map<String,Object> getConfigByName(String configName);
+
+    List<Map<String, Object>> getDriverTotalResult(Map<String, Object> map);
+
+
+    List<Map<String, Object>> getCapacityTotalResult(Map<String, Object> map);
+
+    //查询WMS派车单需要信息
+    List<Map<String, Object>> selectDlivDirnolistByWMS(List list);
+
+    //新增WMS派车单需要信息
+    int insertSlmDlivDirListByWMS(Map<String, Object> map);
+
+
+    //根据派车单号删除WMS中的派车单
+    Integer deleteSlmDlivDirListByDlivDirnoSeq(String dlivDirnoSeq);
+
+    //根据派车单号查询WMS中是否有派车单
+    Integer selectSlmDlivDir(String dlivDirnoSeq);
+
+    int updatePlanStatus(Map<String, Object> planDetails);
+
+    List<BigDecimal> getTransOrderByDriver(BigDecimal driverId);
+
+    int getTransOrderByDriverOne(BigDecimal driverId);
+
+    Map<String, Object> getDlivDirnoSeqList(String dlivDirnoSeq);
+
+    List<Map<String, Object>> selectDlivDirnoSeqDetails(Map<String, Object> map);
+
+    Integer selectCountByOmsOrderChild(BigDecimal planChildId);
+
+    Map<String, Object> getCompanyById(BigDecimal companyId);
+
+
+    String getTransModeByRequirementChildId(BigDecimal requirementChildId);
+
+    String getIdCardCode(Map<String, Object> map);
+
+
+    BigDecimal matchLineId(@Param("businessTypeId") BigDecimal businessTypeId,
+                           @Param("materialTypeId") BigDecimal materialTypeId,
+                           @Param("businessNameId") BigDecimal businessNameId,
+                           @Param("materialId") BigDecimal materialId,
+                           @Param("loadPointId") BigDecimal loadPointId,
+                           @Param("unloadPointId") BigDecimal unloadPointId,
+                           @Param("consigneeId") BigDecimal consigneeId);
+
+
+
+    String selectBusinessScene(BigDecimal businessType);
+
+    Map<String, Object> getMaterialInfo(Map<String, Object> map);
+
+    Map<String,Object> getMaterialGridById(@Param("materialId") BigDecimal materialId,
+                                           @Param("gridId") BigDecimal gridId);
+
+    Integer updateOrderSeqAddOne(@Param("transOrderId") BigDecimal transOrderId);
+
+    List<Map<String, Object>> getDriverById(BigDecimal driverId, BigDecimal driverId2);
+
+    //查询最大派单单号
+    String selectMax(Integer num);
+
+    BigDecimal findSpeacialByCapacityId(BigDecimal capacity);
+
+    Map<String, Object> selectRequirementIdByPlanChild(String orderChildId);
+
+    Map<String,Object> findCapacityMes(BigDecimal capacityId);
+
+    Map<String,Object> findDriverMes(BigDecimal driverId);
+
+    List<Map<String,Object>> getExistList(@Param("driverId") BigDecimal driverId,
+                         @Param("personnelCard") String personnelCard,
+                           @Param("businessScence") String businessScene);
+
+    Map<String, Object> findCompanyById(String string);
+    int closeDz(Map<String,Object> map);
+
+    List<String> getTransOrderIds();
+
+    int updateCapacity(Map<String,Object> map);
+
+    int updateDriver(Map<String,Object> map);
+
+    Map<String,Object> findPlanChildByPlanNo(Map<String,Object> map);
+
+    List<BigDecimal> selectUnloadOrdersIds();
+
+    List<BigDecimal> selectSignOrdersIds();
+
+    String getTdlsByBhdh(@Param("list") String[] list);
+
+    String getBhdhById(@Param("list")ArrayList<BigDecimal> list);
+
+    int closeExpireTransOrder();
+
+    OmsTransOrder findProductionOrder(Map<String, Object> map);
+
+    List<Map<String, Object>> selectDriverDayJobByTime(Map<String, Object> map);
+
+    List<Map<String, Object>> selectDriverDayJobByWeight(Map<String, Object> map);
+
+    Map<String,Object> findTransPlan(Map<String, Object> map);
+
+    BigDecimal selectDriverId(Map<String, Object> map);
+
+    BigDecimal selectOrderInfoByDB(Map<String,Object> map);
+
+    List<String> restartWeightResult();
+
+    List<String> getPersonnelBySSOId(String alternateFields26);
+
+    List<OmsTransOrder> selectByOms(Map<String, Object> objectObjectHashMap);
+
+    List<Map<String, Object>> getSigningOrder();
+
+    List<BigDecimal> selectLoadOrderIds();
+
+    BigDecimal selectCapacityId(String capacityNo);
+
+    BigDecimal nextTrainSeq(Map<String,Object> map);
+
+    Map<String, Object> getOutResult(Map<String, Object> map);
+
+    Map<String, Object> getInResult(Map<String, Object> map);
+
+    int batchUpdateOrderStatus(Map<String, Object> map);
+
+    List<OmsTransOrder> selectNoNetWeight();
+
+    int isLoadSeq(@Param("loadDate") String loadDate,@Param("sendStation") String sendStation,@Param("seq") BigDecimal seq);
+
+    int updateLoadSeq(Map<String, Object> map);
+
+    String selectInwardFlag(BigDecimal transOrderId);
+
+    List<OmsTransOrder> selectByMonitor();
+
+    List<Map<String,Object>> selectPlanIsCapacityDriver(BigDecimal planChildId, BigDecimal capacityId, BigDecimal driverId);
+
+    int closeExpireOrder();
+
+    List<Map<String, Object>> getTimeTransOrderList(Map<String, Object> map);
+
+    List<Map<String, Object>> loadingOperation(Map<String, Object> map);
+
+    void updateTrainOrderSeq(Map<String, Object> map);
+
+    List<Map<String, Object>> purchaseTrainsOrderList(Map<String, Object> map);
+
+
+    List<Map<String, Object>> getDzTransOrderList(Map<String, Object> map);
+
+    List<Map<String, Object>>  getTrainResultForSend(@Param("companyName") String companyName);
+
+    int closeExpireOrder1();
+
+    List<Map<String, Object>> getSijiTransOrder(Map<String, Object> map);
+
+    int closeExpireOrder2();
+
+    List<OmsTransOrder> getExpireOrder();
+
+    //获取发运计划总重量
+    String sumWeightToTransPlan(BigDecimal requirementChildId);
+
+    //获取运输订单总重量
+    String sumWeightToTransOrder(BigDecimal requirementChildId);
+
+    void updateSumWeightToRequirementChild(Map<String, Object> map);
+
+    OmsTransOrder getDzOrderByCapacityId(Map<String,Object> capacityId);
+
+    BigDecimal getNineTransOrder(Map<String, Object> map);
+
+    int updateNineOrder(BigDecimal nineTransOrderId);
+
+    List<String> selectDzTransOrder();
+
+    Map<String,Object> getStandardDuration(BigDecimal transOrderId);
+
+    BigDecimal getConfigByMaterialName(String materialName);
+
+    List<Map<String, Object>> getTransOrderNoNetWeight(Map<String, Object> params);
+
+    Map<String,Object> selectCurrentOrder(Map<String, Object> map);
+
+    String selectCapcityInnerNumber(BigDecimal transOrderId);
+
+    List<OmsTransOrder> selectUnInfoOrder();
+
+    List<Map<String, Object>> getNoTimeStarted();
+
+    List<Map<String,Object>> getTimeExpireOrder();
+
+    int closeAbnormalOrder();
+
+    String getIdCardNo(String driverName);
+
+    List<BigDecimal> getNeedOrderIds();
+
+    BigDecimal selectTransOrderChildId(Object transOrderNumber);
+
+    List<Map<String, Object>> selectWmsCarNo();
+
+    List<Map<String, Object>> selectDeleteWmsCarNo();
+
+    int closeExpireOrder3();
+
+    List<BigDecimal> selectPlanChildIds();
+
+    Map<String, Object> selectNumInfo(BigDecimal planChildId);
+
+    void updateNumInfo(Map<String, Object> info);
+
+    List<OmsTransOrder> selectUpdateRemark();
+
+    String selectListAggCapacity(BigDecimal planChildId);
+
+    int updateCapacityNumbers(@Param("planChildId") BigDecimal planChildId, @Param("listAggCapacity") String listAggCapacity);
+
+    List<String> getNoWeightOrderIds(String businessScene);
+
+    List<Map<String, Object>> getInnerGpTransOrder(Map<String, Object> map);
+
+    List<OmsTransOrder> selectInnerOrder();
+
+    String selectOperateName(BigDecimal transOrderChildId);
+
+    int closeExpireOrder4();
+
+    List<String> selectBluList();
+
+    List<Map<String, Object>> getOriginData(Map<String, Object> map);
+
+    Map<String,Object> getRequirementChildId(String requirementNo);
+
+    OmsTransOrder selectUpdateOmsOrder(Map<String, Object> map);
+
+    List<Map<String, Object>> getInnerGpData(Map<String, Object> transOrder);
+
+    void updateOtherStatus(@Param("transOrderId") BigDecimal transOrderId,@Param("deleted") BigDecimal deleted);
+
+    List<Map<String, Object>> getXcData(Map<String, Object> map);
+
+    Map<String, Object> getOrderInfo(Map<String, Object> map);
+
+    List<Map<String, Object>> getZtZxShiji(Map<String, Object> map);
+
+    List<BigDecimal> selectLoaderCapacityOrderIds(Map<String, Object> map);
+
+
+    List<Map<String, Object>> selectWuyanmei();
+
+
+    List<Map<String, Object>> selectMonthOrder();
+
+    List<BigDecimal> getCxExpireOrder();
+
+    int closeExpireByTransOrder(@Param("orderIds") List<BigDecimal> orderIds);
+
+    List<BigDecimal> getRequirementChildIdByOrderIds(@Param("orderIds") List<BigDecimal> orderIds);
+
+    String selectCarrierName(BigDecimal transOrderId);
+
+    int closeExpireOrder5();
+
+    String selectPersonnelPost(BigDecimal driverId);
+
+    int clearNetWeight();
+
+    List<Map<String,Object>> getCapacityInnerNoSignList();
+
+    List<Map<String,Object>> getCapacityInnerNoTimeList();
+
+    List<Map<String,Object>> getCapacityNoFinishList();
+
+    BigDecimal getTotalTonnageValue(Map<String, Object> map);
+
+    List<Map<String, Object>> getGpData(Map<String, Object> map);
+
+    List<Map<String, Object>> getBGpData(Map<String, Object> map);
+
+    int updateOtherPauseStatus(@Param("transOrderId") BigDecimal transOrderId, @Param("pauseOrderStatus") String pauseOrderStatus);
+
+    List<Map<String, Object>> getBXcData(Map<String, Object> map);
+
+    List<BigDecimal> selectDacheCapacityIds(Map<String, Object> objectObjectHashMap);
+
+
+    List<BigDecimal> selectLoaderCapacityIds(Map<String, Object> objectObjectHashMap);
+
+    List<String> getInnerNoMatchList();
+
+    void updateIdcardsInfo(Map<String, Object> capacity);
+
+}

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

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

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

@@ -0,0 +1,36 @@
+package com.steerinfo.dil.mapper;
+
+
+import com.steerinfo.dil.model.RmsOperationPoint;
+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 RmsOperationPointMapper extends IBaseMapper<RmsOperationPoint, BigDecimal> {
+    @Select("select seq_RMS_OPERATION_POINT.nextval from dual")
+    BigDecimal getOperationPointId();
+
+    Map<String, Object> selectOperationPointById(BigDecimal id);
+
+    List<Map<String, Object>> getOperationPointList(Map<String, Object> mapVal);
+
+    //获取AddressId
+    BigDecimal getAddressIdByAddress(Map<String, Object> mapVal);
+    //获取PlaceId
+    BigDecimal getPlaceIdByAddress(Map<String, Object> mapVal);
+    @Select("select seq_RMS_RECEIVE_ADDRESS.nextval from dual")
+    BigDecimal nextAddressId();
+    @Select("select seq_RMS_OPERATION_POINT.nextval from dual")
+    BigDecimal nextPlaceId();
+    //新增address
+    int insertAddress(Map<String, Object> mapVal);
+    //新增place
+    int insertPlace(Map<String, Object> mapVal);
+
+    List<String> findExist(List<String> list);
+}

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.SyncProductList;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface SyncProductListMapper extends IBaseMapper<SyncProductList, BigDecimal> {
+
+    @Select("select SEQ_SYNC_PRODUCT_LIST.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> getFailedList();
+
+}

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

@@ -0,0 +1,17 @@
+package com.steerinfo.dil.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TestMapper {
+
+    List<Map<String, Object>> getNoTimeStarted();
+
+    List<Map<String,Object>> getTimeExpireOrder();
+
+    int closeAbnormalOrder();
+
+}

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

@@ -0,0 +1,28 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsAddenergyResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TmsAddenergyResultMapper extends IBaseMapper<TmsAddenergyResult, BigDecimal> {
+
+    @Select("select SEQ_TMS_ADDENERGY_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> selectAddEnergyResult(Map<String,Object> map);
+
+    List<TmsAddenergyResult> selectByCapacityIdIsNull();
+
+    List<TmsAddenergyResult> selectByParametersSt(Map<String, Object> searchMap);
+
+    Map<String, Object> selectCapacityMes(String capacityNo);
+
+}

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsArrivalResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsArrivalResultMapper extends IBaseMapper<TmsArrivalResult, BigDecimal> {
+    @Select("select SEQ_TMS_ARRIVAL_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> getTmsArrivalResultList(Map<String,Object> map);
+
+    List<Map<String,Object>> getTmsArrivalResultList2(Map<String,Object> map);
+}

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

@@ -0,0 +1,53 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsComprehensiveResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsComprehensiveResultMapper extends IBaseMapper<TmsComprehensiveResult, BigDecimal> {
+
+    List<Map<String,Object>> findListMaps (Map<String,Object> map);
+
+    Integer insertAll(TmsComprehensiveResult model);
+
+    Integer logicDelete(BigDecimal id);
+
+    @Select("select SEQ_TMS_COMPREHENSIVE_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    int updatePersonnelStatus(BigDecimal personnelId,BigDecimal deleted);
+
+    List<Map<String, Object>> getPersonnelById(BigDecimal userId);
+
+    int updateCapacityStatus(BigDecimal alternateFields11, BigDecimal bigDecimal);
+
+    Map<String, Object> getPersonnelById2(BigDecimal personnelId);
+
+    List<Map<String, Object>> getPersonnelByTeam(String personnelTeam);
+
+    List<Map<String, Object>> getPersonnelByManager();
+
+    BigDecimal selectCapacityId(@Param("capacityNumber") String capacityNumber);
+
+    Integer insertCapacityDriver(Map<String,Object> map);
+
+    List<Map<String, Object>> selectrmsCapacityDriver(Map<String, Object>map);
+
+    @Select("select SEQ_RMS_CAPACITY_DRIVER.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal rcdNextId();
+
+    Integer updateCapacityDriver(Map<String, Object>map);
+
+    int updateCapacityDriverStatus(@Param("dataToBigDecimal") BigDecimal dataToBigDecimal, @Param("status") String status);
+
+}

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

@@ -0,0 +1,28 @@
+package com.steerinfo.dil.mapper;
+
+
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import com.steerinfo.dil.model.TmsEnfactoryResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsEnfactoryResultMapper extends IBaseMapper<TmsEnfactoryResult, BigDecimal> {
+    @Select("select SEQ_TMS_ENFACTORY_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> getTmsEnfactoryResultList(Map<String,Object> map);
+
+    List<Map<String,Object>> getTmsEnfactoryResultList2(Map<String,Object> map);
+
+    int isEnfactory(BigDecimal transOrderId);
+
+
+    List<TmsEnfactoryResult> selectWeightMap(Map<String, Object> searchMap);
+}

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

@@ -0,0 +1,95 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.OmsTransOrder;
+import com.steerinfo.dil.model.TmsLoadResult;
+import com.steerinfo.dil.model.TmsWeightResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsLoadResultMapper extends IBaseMapper<TmsLoadResult, BigDecimal> {
+    @Select("select SEQ_TMS_LOAD_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    @Select("select seq_movelist.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal moveListId();
+
+    @Select("select SEQ_TMS_LOAD_RESULT.nextval from dual CONNECT BY LEVEL <= #{length}")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    List<BigDecimal> nextIds(int length);
+
+    List<Map<String,Object>> getTmsLoadResultList(Map<String,Object> map);
+
+    List<Map<String,Object>> getTmsLoadResultList2(Map<String,Object> map);
+
+    //查询未装货的订单分录
+    List<Map<String,Object>> getTransOrderChildNotLoad(@Param("transOrderId") BigDecimal transOrderId,
+                                                       @Param("transOrderChildId") BigDecimal transOrderChildId);
+
+    List<Map<String, Object>> purchaseTrainLoadList(Map<String, Object> map);
+
+    List<Map<String, Object>> purchaseTrainLoadReport(Map<String, Object> map);
+
+    List<Map<String, Object>> getTransOrderChild(@Param("transOrderId")BigDecimal bigDecimal,
+                                                 @Param("transOrderChildId") BigDecimal transOrderChildId);
+
+    BigDecimal getCapacityId(String capacityNumber, String capacityNumber1);
+
+    Map<String, Object> getOrderMesByLoad(@Param("capacityId") BigDecimal capacityId, @Param("requirementId") BigDecimal requirementId);
+
+    //写入转库出库实绩
+    void insertMoveList(Map<String, Object> params);
+
+    //查询转库实绩
+    List<Map<String, Object>> selectMoveList(Map<String, Object> params);
+
+    //修改转库实绩
+    void updateWmsMoveList(Map<String, Object> params);
+
+    //根据转库车单号查询总重量
+    BigDecimal selectSumWightByMoveCarno(String moveCarno);
+
+    Map<String, Object> selectMoveListById(String id);
+
+    void deleteMoveListById(String id);
+
+    Map<String, Object> getOrderByWmsCode(BigDecimal capacityId, String wmsCode1, String wmsCode2);
+
+    Map<String, Object> getMaterialByCode(String materialCode);
+
+    BigDecimal selectTransOrderId(String transOrderNumber);
+
+    BigDecimal selectOrderInfo(BigDecimal capacityId);
+
+    TmsLoadResult getLoadResultByOne(BigDecimal transOrderId);
+
+    List<TmsLoadResult> selectByParametersDesc(Map<String, Object> loadMap);
+
+    int updateRequirementMaterialId(Map<String, Object> map);
+
+    int updateOrderMaterialId(Map<String, Object> map);
+
+    TmsLoadResult getLastLoadResult(Map<String, Object> objectObjectHashMap1);
+
+    String getCapacityInnerNumber(BigDecimal loadCapacityId);
+
+    List<TmsWeightResult> getGpWeightData(OmsTransOrder daCheOmsTransOrder);
+
+    List<TmsLoadResult> selectWagonNoTitle(String wagonNo);
+
+    String getCapacityInnerNumberByOrderId(BigDecimal transOrderId);
+
+    List<TmsLoadResult> selectMoveCarNoTitle(String moveCarNo);
+
+    List<Map<String, Object>> selectTrainLoadResult();
+
+}

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

@@ -0,0 +1,19 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.OmsTransOrder;
+import com.steerinfo.dil.model.TmsMaintenanceResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.MapKey;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TmsMaintenanceResultMapper extends IBaseMapper<TmsMaintenanceResult, BigDecimal> {
+    List<TmsMaintenanceResult> selectByCapacityIdIsNull();
+
+    List<Map<String,Object>> getDzOrder( String shift);
+}

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

@@ -0,0 +1,25 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsOutfactoryResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsOutfactoryResultMapper extends IBaseMapper<TmsOutfactoryResult, BigDecimal> {
+    @Select("select SEQ_TMS_OUTFACTORY_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> getTmsOutfactoryResultList(Map<String,Object> map);
+
+    List<Map<String,Object>> getTmsOutfactoryResultList2(Map<String,Object> map);
+
+    List<TmsOutfactoryResult> selectWeightMap(Map<String, Object> searchMap);
+
+}

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

@@ -0,0 +1,21 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsPleaseApprove;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsPleaseApproveMapper extends IBaseMapper<TmsPleaseApprove, BigDecimal> {
+    @Select("select SEQ_TMS_Please_Approve.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String, Object>> getTmsPleaseApproveList(Map<String, Object> map);
+
+}

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsQualityResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsQualityResultMapper extends IBaseMapper<TmsQualityResult, BigDecimal> {
+    @Select("select SEQ_TMS_QUALITY_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> getTmsQualityResultList(Map<String,Object> map);
+
+    List<Map<String,Object>> getTmsQualityResultList2(Map<String,Object> map);
+}

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsQueueGrid;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TmsQueueGridMapper extends IBaseMapper<TmsQueueGrid, BigDecimal> {
+
+    @Select("SELECT SEQ_TMS_QUEUE_GRID.NEXTVAL FROM DUAL")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+
+    List<Map<String, Object>> selectQueueGrid(Map<String, Object> parmas);
+}

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

@@ -0,0 +1,30 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsQueueResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TmsQueueResultMapper extends IBaseMapper<TmsQueueResult, BigDecimal> {
+
+    @Select("SELECT SEQ_TMS_QUEUE_RESULT.NEXTVAL FROM DUAL")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String, Object>> likeQueueResult(Map<String, Object> map);
+
+    Integer selectGridStatus(BigDecimal gridId);
+
+    Integer getReleasedNumber(BigDecimal gridId);
+
+    Integer getFactoryNumber(BigDecimal gridId);
+
+    BigDecimal selectQueueResultId(Map<String, Object> map);
+
+}

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

@@ -0,0 +1,22 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsReceiptResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsReceiptResultMapper extends IBaseMapper<TmsReceiptResult, BigDecimal> {
+    @Select("select SEQ_TMS_RECEIPT_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> getTmsReceiptResultList(Map<String,Object> map);
+
+    List<Map<String,Object>> getTmsReceiptResultList2(Map<String,Object> map);
+}

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

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsReplaceFrontResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TmsReplaceFrontResultMapper extends IBaseMapper<TmsReplaceFrontResult, BigDecimal> {
+    @Select("select SEQ_TMS_REPLACE_FRONT_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> getTmsReplaceFrontResultList(Map<String,Object> map);
+
+    //运输执行拼接，信息去重
+    List<Map<String,Object>> getTmsReplaceFrontResultList2(Map<String,Object> map);
+}

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

@@ -0,0 +1,15 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsRouteResult;
+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.Map;
+
+@Mapper
+public interface TmsRouteResultMapper extends IBaseMapper<TmsRouteResult, BigDecimal> {
+    @Select("SELECT SEQ_TMS_ROUTE_RESULT.NEXTVAL FROM DUAL")
+    BigDecimal nextId();
+}

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

@@ -0,0 +1,28 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsSignInResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TmsSignInResultMapper extends IBaseMapper<TmsSignInResult, BigDecimal> {
+    @Select("select SEQ_TMS_SIGN_IN_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> getTmsSignInResultList(Map<String,Object> map);
+
+    //运输执行拼接，信息去重
+    List<Map<String,Object>> getTmsSignInResultList2(Map<String,Object> map);
+
+    List<TmsSignInResult> getSignInExpireList();
+
+    String getCapacityInnerNumber(BigDecimal capacityId);
+
+}

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

@@ -0,0 +1,54 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsTimingResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsTimingResultMapper extends IBaseMapper<TmsTimingResult, BigDecimal> {
+
+     TmsTimingResult getMaxResultTime(@Param("transOrderId") BigDecimal transOrderId);
+
+    TmsTimingResult getMinResultTime(@Param("transOrderId") BigDecimal transOrderId);
+
+
+
+    List<Map<String,Object>> tmstimingresultsList (Map<String,Object> map);
+
+    @Select("select SEQ_TMS_TIMING_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+
+    Long getCountTime(Map<String,Object> map);
+
+    List<Map<String, Object>> getOrderTimeList(Map<String, Object> map);
+
+    List<Map<String,Object>> getByParameters(Map<String, Object> map);
+
+
+    int approveTimeResult(Map<String, Object> map);
+
+    Map<String,Object> getConfigId(String qrCodeContent);
+
+    Map<String, Object> getRequirementTimeMap(BigDecimal transOrderId);
+
+    String getAbnormalFlag(BigDecimal transOrderId);
+
+
+    List<Map<String, Object>> getReportOperateDaily(Map<String,Object>map);
+
+    int updateReportOperateDaily(Map<String,Object>map);
+
+    Map<String,Object> getSumactualDuration(Map<String,Object>map);
+
+    void updateTimeResult(@Param("transOrderId") BigDecimal transOrderId, @Param("actualDuration") BigDecimal actualDuration);
+
+}

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

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

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

@@ -0,0 +1,23 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsTransitOrder;
+import com.steerinfo.framework.mapper.ICBaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Select;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TmsTransitOrderMapper extends ICBaseMapper<TmsTransitOrder, String> {
+
+    List<Map<String, Object>> selectTransitOrders(HashMap parmas);
+
+    @Select("select SEQ_TRANSIT_ORDER.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal getTransitOrderId();
+
+}

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

@@ -0,0 +1,37 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsUnloadResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsUnloadResultMapper extends IBaseMapper<TmsUnloadResult, BigDecimal> {
+    @Select("select SEQ_TMS_UNLOAD_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> getTmsUnloadResultList(Map<String,Object> map);
+
+    List<Map<String,Object>> getTmsUnloadResultList2(Map<String,Object> map);
+
+    //查询未卸货的订单分录
+    List<Map<String,Object>> getTransOrderChildNotUnload(@Param("transOrderId") BigDecimal transOrderId,
+                                                    @Param("transOrderChildId") BigDecimal transOrderChildId);
+
+    List<Map<String, Object>> purchaseTrainUnloadList(Map<String, Object> map);
+
+    List<Map<String, Object>> getTransOrderChild(@Param("transOrderId")BigDecimal bigDecimal,
+                                                 @Param("transOrderChildId") BigDecimal transOrderChildId);
+
+    List<Map<String, Object>> getQualitingResult();
+
+    String selectFylx(BigDecimal transOrderChildId);
+
+}

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

@@ -0,0 +1,55 @@
+package com.steerinfo.dil.mapper;
+
+import com.steerinfo.dil.model.TmsWeightResult;
+import com.steerinfo.framework.mapper.IBaseMapper;
+import java.math.*;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Options;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface TmsWeightResultMapper extends IBaseMapper<TmsWeightResult, BigDecimal> {
+    @Select("select SEQ_TMS_WEIGHT_RESULT.nextval from dual")
+    @Options(flushCache = Options.FlushCachePolicy.TRUE)
+    BigDecimal nextId();
+
+    List<Map<String,Object>> getTmsWeightResultList(Map<String,Object> map);
+
+    List<Map<String,Object>> getTmsWeightResultList2(Map<String,Object> map);
+
+    //查询未计量完成的分录
+    List<Map<String,Object>> getTransOrderChildNotWeight(@Param("transOrderId") BigDecimal transOrderId,
+                                                         @Param("transOrderChildId") BigDecimal transOrderChildId);
+
+    List<Map<String, Object>> purchaseTrainWeightList(Map<String, Object> map);
+
+    List<BigDecimal> getTransOrderChildId(BigDecimal bigDecimal);
+
+    int isWeight(BigDecimal transOrderId);
+
+    Map<String, Object> selectMesInfo(BigDecimal transOrderChildId);
+
+    BigDecimal selectStTdfl(String tdls, String tdfl);
+
+    Map<String, Object> selectTareWeightMap(BigDecimal transOrderId);
+
+    List<BigDecimal> selectNetWeightId(BigDecimal transOrderChildId);
+
+    List<Map<String, Object>> getErrorRequirement();
+
+    String selectCksl(BigDecimal tdfl);
+
+    List<TmsWeightResult> selectWeightMap(Map<String,Object> weightMap);
+
+    List<TmsWeightResult> selectByParametersSt(Map<String, Object> searchMap);
+
+    Map<String, Object> getBoundResult(BigDecimal transOrderChildId);
+
+    List<Map<String, Object>> syncTheoryWeight(Map<String, Object> map);
+
+    List<TmsWeightResult>  selectForBzw();
+}

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

@@ -0,0 +1,379 @@
+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 AmsBindRequirement implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PRIMARY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal primaryId;
+
+    /**
+     * 大宗需求ID(DZ_REQUIREMENT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="大宗需求ID",required=false)
+    private BigDecimal dzRequirementId;
+
+    /**
+     * 视拓需求ID(ST_REQUIREMENT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="视拓需求ID",required=false)
+    private BigDecimal stRequirementId;
+
+    /**
+     * 大宗物料ID(DZ_MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="大宗物料ID",required=false)
+    private BigDecimal dzMaterialId;
+
+    /**
+     * 视拓物料ID(ST_MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="视拓物料ID",required=false)
+    private BigDecimal stMaterialId;
+
+    /**
+     * 视拓业务名称(ST_MATERIAL_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="视拓业务名称",required=false)
+    private String stMaterialType;
+
+    /**
+     * 视拓车型ID(ST_CAPACITY_TYPE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="视拓车型ID",required=false)
+    private BigDecimal stCapacityTypeId;
+
+    /**
+     * 大宗业务区间名称(DZ_TRANS_RANGE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="大宗业务区间名称",required=false)
+    private String dzTransRange;
+
+    /**
+     * 视拓业务区间名称(ST_TRANS_RANGE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="视拓业务区间名称",required=false)
+    private String stTransRange;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.primaryId;
+    }
+
+    @Override
+    public void setId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public BigDecimal getPrimaryId() {
+        return primaryId;
+    }
+
+    public void setPrimaryId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public BigDecimal getDzRequirementId() {
+        return dzRequirementId;
+    }
+
+    public void setDzRequirementId(BigDecimal dzRequirementId) {
+        this.dzRequirementId = dzRequirementId;
+    }
+
+    public BigDecimal getStRequirementId() {
+        return stRequirementId;
+    }
+
+    public void setStRequirementId(BigDecimal stRequirementId) {
+        this.stRequirementId = stRequirementId;
+    }
+
+    public BigDecimal getDzMaterialId() {
+        return dzMaterialId;
+    }
+
+    public void setDzMaterialId(BigDecimal dzMaterialId) {
+        this.dzMaterialId = dzMaterialId;
+    }
+
+    public BigDecimal getStMaterialId() {
+        return stMaterialId;
+    }
+
+    public void setStMaterialId(BigDecimal stMaterialId) {
+        this.stMaterialId = stMaterialId;
+    }
+
+    public String getStMaterialType() {
+        return stMaterialType;
+    }
+
+    public void setStMaterialType(String stMaterialType) {
+        this.stMaterialType = stMaterialType == null ? null : stMaterialType.trim();
+    }
+
+    public BigDecimal getStCapacityTypeId() {
+        return stCapacityTypeId;
+    }
+
+    public void setStCapacityTypeId(BigDecimal stCapacityTypeId) {
+        this.stCapacityTypeId = stCapacityTypeId;
+    }
+
+    public String getDzTransRange() {
+        return dzTransRange;
+    }
+
+    public void setDzTransRange(String dzTransRange) {
+        this.dzTransRange = dzTransRange == null ? null : dzTransRange.trim();
+    }
+
+    public String getStTransRange() {
+        return stTransRange;
+    }
+
+    public void setStTransRange(String stTransRange) {
+        this.stTransRange = stTransRange == null ? null : stTransRange.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", primaryId=").append(primaryId);
+        sb.append(", dzRequirementId=").append(dzRequirementId);
+        sb.append(", stRequirementId=").append(stRequirementId);
+        sb.append(", dzMaterialId=").append(dzMaterialId);
+        sb.append(", stMaterialId=").append(stMaterialId);
+        sb.append(", stMaterialType=").append(stMaterialType);
+        sb.append(", stCapacityTypeId=").append(stCapacityTypeId);
+        sb.append(", dzTransRange=").append(dzTransRange);
+        sb.append(", stTransRange=").append(stTransRange);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,423 @@
+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 AmsPlanChild implements IBasePO<BigDecimal> {
+    /**
+     * 计划子表（主键ID）(PLAN_CHILD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计划子表（主键ID）",required=true)
+    private BigDecimal planChildId;
+
+    /**
+     * 计划ID(TRANS_PLAN_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计划ID",required=true)
+    private BigDecimal transPlanId;
+
+    /**
+     * 需求子表ID(REQUIREMENT_CHILD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="需求子表ID",required=true)
+    private BigDecimal requirementChildId;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 物资重量(MATERIAL_WEIGHT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资重量",required=false)
+    private BigDecimal materialWeight;
+
+    /**
+     * 物资数量(MATERIAL_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资数量",required=false)
+    private BigDecimal materialNumber;
+
+    /**
+     * 承运车数(TRANS_TRUCK_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="承运车数",required=false)
+    private BigDecimal transTruckNumber;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 备用字段1（已出数量）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（已出数量）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 物资名字(MATERIAL_NAME,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资名字",required=false)
+    private String materialName;
+
+    /**
+     * 物资编号(MATERIAL_CODE,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资编号",required=false)
+    private String materialCode;
+
+    /**
+     * 物资规格(MATERIAL_SPECIFICATION,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资规格",required=false)
+    private String materialSpecification;
+
+    /**
+     * 物资型号(MATERIAL_MODEL,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资型号",required=false)
+    private String materialModel;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.planChildId;
+    }
+
+    @Override
+    public void setId(BigDecimal planChildId) {
+        this.planChildId = planChildId;
+    }
+
+    public BigDecimal getPlanChildId() {
+        return planChildId;
+    }
+
+    public void setPlanChildId(BigDecimal planChildId) {
+        this.planChildId = planChildId;
+    }
+
+    public BigDecimal getTransPlanId() {
+        return transPlanId;
+    }
+
+    public void setTransPlanId(BigDecimal transPlanId) {
+        this.transPlanId = transPlanId;
+    }
+
+    public BigDecimal getRequirementChildId() {
+        return requirementChildId;
+    }
+
+    public void setRequirementChildId(BigDecimal requirementChildId) {
+        this.requirementChildId = requirementChildId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getMaterialWeight() {
+        return materialWeight;
+    }
+
+    public void setMaterialWeight(BigDecimal materialWeight) {
+        this.materialWeight = materialWeight;
+    }
+
+    public BigDecimal getMaterialNumber() {
+        return materialNumber;
+    }
+
+    public void setMaterialNumber(BigDecimal materialNumber) {
+        this.materialNumber = materialNumber;
+    }
+
+    public BigDecimal getTransTruckNumber() {
+        return transTruckNumber;
+    }
+
+    public void setTransTruckNumber(BigDecimal transTruckNumber) {
+        this.transTruckNumber = transTruckNumber;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.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 getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName == null ? null : materialName.trim();
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode == null ? null : materialCode.trim();
+    }
+
+    public String getMaterialSpecification() {
+        return materialSpecification;
+    }
+
+    public void setMaterialSpecification(String materialSpecification) {
+        this.materialSpecification = materialSpecification == null ? null : materialSpecification.trim();
+    }
+
+    public String getMaterialModel() {
+        return materialModel;
+    }
+
+    public void setMaterialModel(String materialModel) {
+        this.materialModel = materialModel == null ? null : materialModel.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", planChildId=").append(planChildId);
+        sb.append(", transPlanId=").append(transPlanId);
+        sb.append(", requirementChildId=").append(requirementChildId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", materialWeight=").append(materialWeight);
+        sb.append(", materialNumber=").append(materialNumber);
+        sb.append(", transTruckNumber=").append(transTruckNumber);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", materialName=").append(materialName);
+        sb.append(", materialCode=").append(materialCode);
+        sb.append(", materialSpecification=").append(materialSpecification);
+        sb.append(", materialModel=").append(materialModel);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,873 @@
+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 AmsRequirementChild implements IBasePO<BigDecimal> {
+    /**
+     * 需求子表ID(REQUIREMENT_CHILD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="需求子表ID",required=true)
+    private BigDecimal requirementChildId;
+
+    /**
+     * 需求ID(TRANS_REQUIREMENT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="需求ID",required=true)
+    private BigDecimal transRequirementId;
+
+    /**
+     * 源单据子表ID(SOURCE_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="源单据子表ID",required=false)
+    private BigDecimal sourceOrderId;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 发货点（装货点）ID(SHIPPING_POINT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="发货点（装货点）ID",required=false)
+    private BigDecimal shippingPointId;
+
+    /**
+     * 收货点（卸货点）ID(RECEIVING_POINT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="收货点（卸货点）ID",required=false)
+    private BigDecimal receivingPointId;
+
+    /**
+     * 业务名称(OPERATIONS_NAME_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="业务名称",required=false)
+    private BigDecimal operationsNameId;
+
+    /**
+     * 业务区间(OPERATIONS_RANGE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="业务区间",required=false)
+    private String operationsRange;
+
+    /**
+     * 物资吨位(MATERIAL_WEIGHT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资吨位",required=false)
+    private BigDecimal materialWeight;
+
+    /**
+     * 物资件数(MATERIAL_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资件数",required=false)
+    private BigDecimal materialNumber;
+
+    /**
+     * 承运车数(TRANS_TRUCK_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="承运车数",required=false)
+    private BigDecimal transTruckNumber;
+
+    /**
+     * 控制率(CONTROL_RATE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="控制率",required=true)
+    private BigDecimal controlRate;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除，4余款审核，5现款审核，6未允许发货，7允许发货，8正在执行，9执行完毕）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除，4余款审核，5现款审核，6未允许发货，7允许发货，8正在执行，9执行完毕）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 备用字段1(发运单号)(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1(发运单号)",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(业务类型)(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2(业务类型)",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(运输路线)(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3(运输路线)",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4（计费类型）(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4（计费类型）",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5（运力类型）(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5（运力类型）",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(实际转运吨位)(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6(实际转运吨位)",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7（已完成数量）(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7（已完成数量）",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8（已完成车数）(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8（已完成车数）",required=false)
+    private String alternateFields8;
+
+    /**
+     * 备用字段9（TDFL:大宗的通知单子表主键）(ALTERNATE_FIELDS9,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段9（TDFL:大宗的通知单子表主键）",required=false)
+    private String alternateFields9;
+
+    /**
+     * 备用字段10（允差下限%）(ALTERNATE_FIELDS10,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段10（允差下限%）",required=false)
+    private String alternateFields10;
+
+    /**
+     * 备用字段11（允差上限%）(ALTERNATE_FIELDS11,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段11（允差上限%）",required=false)
+    private String alternateFields11;
+
+    /**
+     * 备用字段12（退货重量）(ALTERNATE_FIELDS12,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段12（退货重量）",required=false)
+    private String alternateFields12;
+
+    /**
+     * 备用字段13（已出重量）(ALTERNATE_FIELDS13,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段13（已出重量）",required=false)
+    private String alternateFields13;
+
+    /**
+     * 备用字段14（运费单价）(ALTERNATE_FIELDS14,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段14（运费单价）",required=false)
+    private String alternateFields14;
+
+    /**
+     * 备用字段15（运费金额）(ALTERNATE_FIELDS15,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段15（运费金额）",required=false)
+    private String alternateFields15;
+
+    /**
+     * 备用字段16（实际运费单价）(ALTERNATE_FIELDS16,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段16（实际运费单价）",required=false)
+    private String alternateFields16;
+
+    /**
+     * 备用字段17(ALTERNATE_FIELDS17,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段17",required=false)
+    private String alternateFields17;
+
+    /**
+     * 备用字段18(ALTERNATE_FIELDS18,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段18",required=false)
+    private String alternateFields18;
+
+    /**
+     * 备用字段19(ALTERNATE_FIELDS19,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段19",required=false)
+    private String alternateFields19;
+
+    /**
+     * 备用字段20(ALTERNATE_FIELDS20,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段20",required=false)
+    private String alternateFields20;
+
+    /**
+     * 备用字段21(ALTERNATE_FIELDS21,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段21",required=false)
+    private String alternateFields21;
+
+    /**
+     * 备用字段22(ALTERNATE_FIELDS22,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段22",required=false)
+    private String alternateFields22;
+
+    /**
+     * 备用字段23(ALTERNATE_FIELDS23,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段23",required=false)
+    private String alternateFields23;
+
+    /**
+     * 备用字段24(ALTERNATE_FIELDS24,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段24",required=false)
+    private String alternateFields24;
+
+    /**
+     * 备用字段25(ALTERNATE_FIELDS25,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段25",required=false)
+    private String alternateFields25;
+
+    /**
+     * 物资名字(MATERIAL_NAME,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资名字",required=false)
+    private String materialName;
+
+    /**
+     * 物资编号(MATERIAL_CODE,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资编号",required=false)
+    private String materialCode;
+
+    /**
+     * 物资规格(MATERIAL_SPECIFICATION,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资规格",required=false)
+    private String materialSpecification;
+
+    /**
+     * 物资型号(MATERIAL_MODEL,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资型号",required=false)
+    private String materialModel;
+
+    /**
+     * 发货作业点名字(SHIPPING_POINT_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="发货作业点名字",required=false)
+    private String shippingPointName;
+
+    /**
+     * 收货作业点名字(RECEIVING_POINT_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="收货作业点名字",required=false)
+    private String receivingPointName;
+
+    /**
+     * 发货作业点编码(SHIPPING_POINT_CODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="发货作业点编码",required=false)
+    private String shippingPointCode;
+
+    /**
+     * 收货作业点编码(REVEIVING_POINT_CODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="收货作业点编码",required=false)
+    private String reveivingPointCode;
+
+    /**
+     * 业务名称(OPERATION_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="业务名称",required=false)
+    private String operationName;
+
+    /**
+     * 业务区间名称(OPERATION_RANGE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="业务区间名称",required=false)
+    private String operationRangeName;
+
+    /**
+     * 备用字段26(ALTERNATE_FIELDS26,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段26",required=false)
+    private String alternateFields26;
+
+    /**
+     * 备用字段27(ALTERNATE_FIELDS27,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段27",required=false)
+    private String alternateFields27;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.requirementChildId;
+    }
+
+    @Override
+    public void setId(BigDecimal requirementChildId) {
+        this.requirementChildId = requirementChildId;
+    }
+
+    public BigDecimal getRequirementChildId() {
+        return requirementChildId;
+    }
+
+    public void setRequirementChildId(BigDecimal requirementChildId) {
+        this.requirementChildId = requirementChildId;
+    }
+
+    public BigDecimal getTransRequirementId() {
+        return transRequirementId;
+    }
+
+    public void setTransRequirementId(BigDecimal transRequirementId) {
+        this.transRequirementId = transRequirementId;
+    }
+
+    public BigDecimal getSourceOrderId() {
+        return sourceOrderId;
+    }
+
+    public void setSourceOrderId(BigDecimal sourceOrderId) {
+        this.sourceOrderId = sourceOrderId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getShippingPointId() {
+        return shippingPointId;
+    }
+
+    public void setShippingPointId(BigDecimal shippingPointId) {
+        this.shippingPointId = shippingPointId;
+    }
+
+    public BigDecimal getReceivingPointId() {
+        return receivingPointId;
+    }
+
+    public void setReceivingPointId(BigDecimal receivingPointId) {
+        this.receivingPointId = receivingPointId;
+    }
+
+    public BigDecimal getOperationsNameId() {
+        return operationsNameId;
+    }
+
+    public void setOperationsNameId(BigDecimal operationsNameId) {
+        this.operationsNameId = operationsNameId;
+    }
+
+    public String getOperationsRange() {
+        return operationsRange;
+    }
+
+    public void setOperationsRange(String operationsRange) {
+        this.operationsRange = operationsRange == null ? null : operationsRange.trim();
+    }
+
+    public BigDecimal getMaterialWeight() {
+        return materialWeight;
+    }
+
+    public void setMaterialWeight(BigDecimal materialWeight) {
+        this.materialWeight = materialWeight;
+    }
+
+    public BigDecimal getMaterialNumber() {
+        return materialNumber;
+    }
+
+    public void setMaterialNumber(BigDecimal materialNumber) {
+        this.materialNumber = materialNumber;
+    }
+
+    public BigDecimal getTransTruckNumber() {
+        return transTruckNumber;
+    }
+
+    public void setTransTruckNumber(BigDecimal transTruckNumber) {
+        this.transTruckNumber = transTruckNumber;
+    }
+
+    public BigDecimal getControlRate() {
+        return controlRate;
+    }
+
+    public void setControlRate(BigDecimal controlRate) {
+        this.controlRate = controlRate;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public String getAlternateFields9() {
+        return alternateFields9;
+    }
+
+    public void setAlternateFields9(String alternateFields9) {
+        this.alternateFields9 = alternateFields9 == null ? null : alternateFields9.trim();
+    }
+
+    public String getAlternateFields10() {
+        return alternateFields10;
+    }
+
+    public void setAlternateFields10(String alternateFields10) {
+        this.alternateFields10 = alternateFields10 == null ? null : alternateFields10.trim();
+    }
+
+    public String getAlternateFields11() {
+        return alternateFields11;
+    }
+
+    public void setAlternateFields11(String alternateFields11) {
+        this.alternateFields11 = alternateFields11 == null ? null : alternateFields11.trim();
+    }
+
+    public String getAlternateFields12() {
+        return alternateFields12;
+    }
+
+    public void setAlternateFields12(String alternateFields12) {
+        this.alternateFields12 = alternateFields12 == null ? null : alternateFields12.trim();
+    }
+
+    public String getAlternateFields13() {
+        return alternateFields13;
+    }
+
+    public void setAlternateFields13(String alternateFields13) {
+        this.alternateFields13 = alternateFields13 == null ? null : alternateFields13.trim();
+    }
+
+    public String getAlternateFields14() {
+        return alternateFields14;
+    }
+
+    public void setAlternateFields14(String alternateFields14) {
+        this.alternateFields14 = alternateFields14 == null ? null : alternateFields14.trim();
+    }
+
+    public String getAlternateFields15() {
+        return alternateFields15;
+    }
+
+    public void setAlternateFields15(String alternateFields15) {
+        this.alternateFields15 = alternateFields15 == null ? null : alternateFields15.trim();
+    }
+
+    public String getAlternateFields16() {
+        return alternateFields16;
+    }
+
+    public void setAlternateFields16(String alternateFields16) {
+        this.alternateFields16 = alternateFields16 == null ? null : alternateFields16.trim();
+    }
+
+    public String getAlternateFields17() {
+        return alternateFields17;
+    }
+
+    public void setAlternateFields17(String alternateFields17) {
+        this.alternateFields17 = alternateFields17 == null ? null : alternateFields17.trim();
+    }
+
+    public String getAlternateFields18() {
+        return alternateFields18;
+    }
+
+    public void setAlternateFields18(String alternateFields18) {
+        this.alternateFields18 = alternateFields18 == null ? null : alternateFields18.trim();
+    }
+
+    public String getAlternateFields19() {
+        return alternateFields19;
+    }
+
+    public void setAlternateFields19(String alternateFields19) {
+        this.alternateFields19 = alternateFields19 == null ? null : alternateFields19.trim();
+    }
+
+    public String getAlternateFields20() {
+        return alternateFields20;
+    }
+
+    public void setAlternateFields20(String alternateFields20) {
+        this.alternateFields20 = alternateFields20 == null ? null : alternateFields20.trim();
+    }
+
+    public String getAlternateFields21() {
+        return alternateFields21;
+    }
+
+    public void setAlternateFields21(String alternateFields21) {
+        this.alternateFields21 = alternateFields21 == null ? null : alternateFields21.trim();
+    }
+
+    public String getAlternateFields22() {
+        return alternateFields22;
+    }
+
+    public void setAlternateFields22(String alternateFields22) {
+        this.alternateFields22 = alternateFields22 == null ? null : alternateFields22.trim();
+    }
+
+    public String getAlternateFields23() {
+        return alternateFields23;
+    }
+
+    public void setAlternateFields23(String alternateFields23) {
+        this.alternateFields23 = alternateFields23 == null ? null : alternateFields23.trim();
+    }
+
+    public String getAlternateFields24() {
+        return alternateFields24;
+    }
+
+    public void setAlternateFields24(String alternateFields24) {
+        this.alternateFields24 = alternateFields24 == null ? null : alternateFields24.trim();
+    }
+
+    public String getAlternateFields25() {
+        return alternateFields25;
+    }
+
+    public void setAlternateFields25(String alternateFields25) {
+        this.alternateFields25 = alternateFields25 == null ? null : alternateFields25.trim();
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName == null ? null : materialName.trim();
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode == null ? null : materialCode.trim();
+    }
+
+    public String getMaterialSpecification() {
+        return materialSpecification;
+    }
+
+    public void setMaterialSpecification(String materialSpecification) {
+        this.materialSpecification = materialSpecification == null ? null : materialSpecification.trim();
+    }
+
+    public String getMaterialModel() {
+        return materialModel;
+    }
+
+    public void setMaterialModel(String materialModel) {
+        this.materialModel = materialModel == null ? null : materialModel.trim();
+    }
+
+    public String getShippingPointName() {
+        return shippingPointName;
+    }
+
+    public void setShippingPointName(String shippingPointName) {
+        this.shippingPointName = shippingPointName == null ? null : shippingPointName.trim();
+    }
+
+    public String getReceivingPointName() {
+        return receivingPointName;
+    }
+
+    public void setReceivingPointName(String receivingPointName) {
+        this.receivingPointName = receivingPointName == null ? null : receivingPointName.trim();
+    }
+
+    public String getShippingPointCode() {
+        return shippingPointCode;
+    }
+
+    public void setShippingPointCode(String shippingPointCode) {
+        this.shippingPointCode = shippingPointCode == null ? null : shippingPointCode.trim();
+    }
+
+    public String getReveivingPointCode() {
+        return reveivingPointCode;
+    }
+
+    public void setReveivingPointCode(String reveivingPointCode) {
+        this.reveivingPointCode = reveivingPointCode == null ? null : reveivingPointCode.trim();
+    }
+
+    public String getOperationName() {
+        return operationName;
+    }
+
+    public void setOperationName(String operationName) {
+        this.operationName = operationName == null ? null : operationName.trim();
+    }
+
+    public String getOperationRangeName() {
+        return operationRangeName;
+    }
+
+    public void setOperationRangeName(String operationRangeName) {
+        this.operationRangeName = operationRangeName == null ? null : operationRangeName.trim();
+    }
+
+    public String getAlternateFields26() {
+        return alternateFields26;
+    }
+
+    public void setAlternateFields26(String alternateFields26) {
+        this.alternateFields26 = alternateFields26 == null ? null : alternateFields26.trim();
+    }
+
+    public String getAlternateFields27() {
+        return alternateFields27;
+    }
+
+    public void setAlternateFields27(String alternateFields27) {
+        this.alternateFields27 = alternateFields27 == null ? null : alternateFields27.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", requirementChildId=").append(requirementChildId);
+        sb.append(", transRequirementId=").append(transRequirementId);
+        sb.append(", sourceOrderId=").append(sourceOrderId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", shippingPointId=").append(shippingPointId);
+        sb.append(", receivingPointId=").append(receivingPointId);
+        sb.append(", operationsNameId=").append(operationsNameId);
+        sb.append(", operationsRange=").append(operationsRange);
+        sb.append(", materialWeight=").append(materialWeight);
+        sb.append(", materialNumber=").append(materialNumber);
+        sb.append(", transTruckNumber=").append(transTruckNumber);
+        sb.append(", controlRate=").append(controlRate);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", alternateFields9=").append(alternateFields9);
+        sb.append(", alternateFields10=").append(alternateFields10);
+        sb.append(", alternateFields11=").append(alternateFields11);
+        sb.append(", alternateFields12=").append(alternateFields12);
+        sb.append(", alternateFields13=").append(alternateFields13);
+        sb.append(", alternateFields14=").append(alternateFields14);
+        sb.append(", alternateFields15=").append(alternateFields15);
+        sb.append(", alternateFields16=").append(alternateFields16);
+        sb.append(", alternateFields17=").append(alternateFields17);
+        sb.append(", alternateFields18=").append(alternateFields18);
+        sb.append(", alternateFields19=").append(alternateFields19);
+        sb.append(", alternateFields20=").append(alternateFields20);
+        sb.append(", alternateFields21=").append(alternateFields21);
+        sb.append(", alternateFields22=").append(alternateFields22);
+        sb.append(", alternateFields23=").append(alternateFields23);
+        sb.append(", alternateFields24=").append(alternateFields24);
+        sb.append(", alternateFields25=").append(alternateFields25);
+        sb.append(", materialName=").append(materialName);
+        sb.append(", materialCode=").append(materialCode);
+        sb.append(", materialSpecification=").append(materialSpecification);
+        sb.append(", materialModel=").append(materialModel);
+        sb.append(", shippingPointName=").append(shippingPointName);
+        sb.append(", receivingPointName=").append(receivingPointName);
+        sb.append(", shippingPointCode=").append(shippingPointCode);
+        sb.append(", reveivingPointCode=").append(reveivingPointCode);
+        sb.append(", operationName=").append(operationName);
+        sb.append(", operationRangeName=").append(operationRangeName);
+        sb.append(", alternateFields26=").append(alternateFields26);
+        sb.append(", alternateFields27=").append(alternateFields27);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,348 @@
+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 AmsTransPlan implements IBasePO<BigDecimal> {
+    /**
+     * 计划ID(TRANS_PLAN_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计划ID",required=true)
+    private BigDecimal transPlanId;
+
+    /**
+     * 计划编号(SERIAL_NUMBER,VARCHAR,255)
+     */
+    @ApiModelProperty(value="计划编号",required=true)
+    private String serialNumber;
+
+    /**
+     * 承运商ID(CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="承运商ID",required=false)
+    private BigDecimal carrierId;
+
+    /**
+     * 次级承运商ID(SECONDARY_CARRIER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="次级承运商ID",required=false)
+    private BigDecimal secondaryCarrierId;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除&计划状态（0正常，1已下发，2删除，3停用，4，已派车）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除&计划状态（0正常，1已下发，2删除，3停用，4，已派车）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 备用字段1（isToOrder,是否转为待派运单，如果是则无法继续分解计划）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（isToOrder,是否转为待派运单，如果是则无法继续分解计划）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2（装货仓库）(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2（装货仓库）",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3（运输路径）(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3（运输路径）",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(上传文件id)(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5(上传文件id)",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6（序号）(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6（序号）",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=true)
+    private String tableName;
+
+    /**
+     * 截止时间(DUE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="截止时间",required=false)
+    private Date dueTime;
+
+    /**
+     * 承运商名称(CARRIER_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="承运商名称",required=false)
+    private String carrierName;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.transPlanId;
+    }
+
+    @Override
+    public void setId(BigDecimal transPlanId) {
+        this.transPlanId = transPlanId;
+    }
+
+    public BigDecimal getTransPlanId() {
+        return transPlanId;
+    }
+
+    public void setTransPlanId(BigDecimal transPlanId) {
+        this.transPlanId = transPlanId;
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber == null ? null : serialNumber.trim();
+    }
+
+    public BigDecimal getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(BigDecimal carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    public BigDecimal getSecondaryCarrierId() {
+        return secondaryCarrierId;
+    }
+
+    public void setSecondaryCarrierId(BigDecimal secondaryCarrierId) {
+        this.secondaryCarrierId = secondaryCarrierId;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public Date getDueTime() {
+        return dueTime;
+    }
+
+    public void setDueTime(Date dueTime) {
+        this.dueTime = dueTime;
+    }
+
+    public String getCarrierName() {
+        return carrierName;
+    }
+
+    public void setCarrierName(String carrierName) {
+        this.carrierName = carrierName == null ? null : carrierName.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", transPlanId=").append(transPlanId);
+        sb.append(", serialNumber=").append(serialNumber);
+        sb.append(", carrierId=").append(carrierId);
+        sb.append(", secondaryCarrierId=").append(secondaryCarrierId);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", dueTime=").append(dueTime);
+        sb.append(", carrierName=").append(carrierName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,1353 @@
+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 AmsTransRequirement implements IBasePO<BigDecimal> {
+    /**
+     * 需求ID(TRANS_REQUIREMENT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="需求ID",required=true)
+    private BigDecimal transRequirementId;
+
+    /**
+     * 源订单ID（采购订单、销售订单、调拨订单）(SOURCE_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="源订单ID（采购订单、销售订单、调拨订单）",required=false)
+    private BigDecimal sourceOrderId;
+
+    /**
+     * 需求编号;（采购、销售、调拨应有不同的编号便于区分(SERIAL_NUMBER,VARCHAR,255)
+     */
+    @ApiModelProperty(value="需求编号;（采购、销售、调拨应有不同的编号便于区分",required=true)
+    private String serialNumber;
+
+    /**
+     * 审批号;用于汇总单据(AUDIT_NUMBER,VARCHAR,255)
+     */
+    @ApiModelProperty(value="审批号;用于汇总单据",required=false)
+    private String auditNumber;
+
+    /**
+     * 运输方式（0：汽运，1：火运）(TRANS_MODE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运输方式（0：汽运，1：火运）",required=false)
+    private BigDecimal transMode;
+
+    /**
+     * 业务类型（DIL_BUSINESS_TYPE外键）(BUSINESS_TYPE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="业务类型（DIL_BUSINESS_TYPE外键）",required=false)
+    private BigDecimal businessType;
+
+    /**
+     * 业务员(BUSINESS_EMPLOYEE,VARCHAR,38)
+     */
+    @ApiModelProperty(value="业务员",required=false)
+    private String businessEmployee;
+
+    /**
+     * 业务单位ID;指向company表(BUSINESS_COMPANY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="业务单位ID;指向company表",required=true)
+    private BigDecimal businessCompanyId;
+
+    /**
+     * 发货单位ID;指向company表(SHIPPING_COMPANY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="发货单位ID;指向company表",required=false)
+    private BigDecimal shippingCompanyId;
+
+    /**
+     * 收货单位ID;指向company表(RECEIVING_COMPANY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="收货单位ID;指向company表",required=false)
+    private BigDecimal receivingCompanyId;
+
+    /**
+     * 作业路径ID(LINE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="作业路径ID",required=false)
+    private BigDecimal lineId;
+
+    /**
+     * 控制方式（0：不控制，1：数量控制，2：金额控制，3：车数控制））(CONTROL_MODE,DECIMAL,8)
+     */
+    @ApiModelProperty(value="控制方式（0：不控制，1：数量控制，2：金额控制，3：车数控制））",required=true)
+    private Integer controlMode;
+
+    /**
+     * 磅单打印（0：不打印，1：打印）(PRINT_STAMP_LIST,DECIMAL,8)
+     */
+    @ApiModelProperty(value="磅单打印（0：不打印，1：打印）",required=true)
+    private Integer printStampList;
+
+    /**
+     * 核载控制（0：不控制，1：控制）(NUCLEAR_LOAD_CONTROL,DECIMAL,8)
+     */
+    @ApiModelProperty(value="核载控制（0：不控制，1：控制）",required=true)
+    private Integer nuclearLoadControl;
+
+    /**
+     * 理重控制（0：不控制，1：型钢控制，2：线材控制）(THEORY_WEIGHT,VARCHAR,255)
+     */
+    @ApiModelProperty(value="理重控制（0：不控制，1：型钢控制，2：线材控制）",required=false)
+    private String theoryWeight;
+
+    /**
+     * 是否内销（0：否，1：是）(IS_DOMESTIC,DECIMAL,8)
+     */
+    @ApiModelProperty(value="是否内销（0：否，1：是）",required=false)
+    private Integer isDomestic;
+
+    /**
+     * 转运类型（计重、计时、计次）(TRAN_SHIPMENT_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="转运类型（计重、计时、计次）",required=false)
+    private String tranShipmentType;
+
+    /**
+     * 计费类型（计重、计时、计次）(BILLING_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="计费类型（计重、计时、计次）",required=false)
+    private String billingType;
+
+    /**
+     * 截止时间(DUE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="截止时间",required=false)
+    private Date dueTime;
+
+    /**
+     * 用车时间(REQUIREMENT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="用车时间",required=false)
+    private Date requirementTime;
+
+    /**
+     * 运力类型ID(CAPACITY_TYPE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运力类型ID",required=false)
+    private BigDecimal capacityTypeId;
+
+    /**
+     * 联系人(REQUIREMENT_CONTACT,VARCHAR,255)
+     */
+    @ApiModelProperty(value="联系人",required=false)
+    private String requirementContact;
+
+    /**
+     * 联系电话(REQUIREMENT_CONTACT_PHONE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="联系电话",required=false)
+    private String requirementContactPhone;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 申报用户(UPLOAD_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="申报用户",required=false)
+    private String uploadName;
+
+    /**
+     * 申报时间(UPLOAD_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="申报时间",required=false)
+    private Date uploadTime;
+
+    /**
+     * 逻辑删除&需求状态（0：待申报，1：已申报，2：拒绝，3：已审批，4：已制订计划，5：删除，6: 关闭，100开始流程控制）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除&需求状态（0：待申报，1：已申报，2：拒绝，3：已审批，4：已制订计划，5：删除，6: 关闭，100开始流程控制）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2（当前审批进度）(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2（当前审批进度）",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(备注）(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4(备注）",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5（运输需求，启用、停用状态）(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5（运输需求，启用、停用状态）",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(顶级单位名称)(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6(顶级单位名称)",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(顶级单位ID)(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7(顶级单位ID)",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(人员数)(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8(人员数)",required=false)
+    private String alternateFields8;
+
+    /**
+     * 备用字段9（采购火运计划ID）(ALTERNATE_FIELDS9,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段9（采购火运计划ID）",required=false)
+    private String alternateFields9;
+
+    /**
+     * 备用字段10 (转库单号)(ALTERNATE_FIELDS10,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段10 (转库单号)",required=false)
+    private String alternateFields10;
+
+    /**
+     * 备用字段11（司磅地点ID）(ALTERNATE_FIELDS11,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段11（司磅地点ID）",required=false)
+    private String alternateFields11;
+
+    /**
+     * 备用字段12（业务员ID）(ALTERNATE_FIELDS12,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段12（业务员ID）",required=false)
+    private String alternateFields12;
+
+    /**
+     * 备用字段13（收发地点）(ALTERNATE_FIELDS13,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段13（收发地点）",required=false)
+    private String alternateFields13;
+
+    /**
+     * 备用字段14（司磅地点-直接传大宗）(ALTERNATE_FIELDS14,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段14（司磅地点-直接传大宗）",required=false)
+    private String alternateFields14;
+
+    /**
+     * 备用字段15（需求类型：0：常规需求，1：固定需求,2:已生成的需求，3：当天已生成）(ALTERNATE_FIELDS15,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段15（需求类型：0：常规需求，1：固定需求,2:已生成的需求，3：当天已生成）",required=false)
+    private String alternateFields15;
+
+    /**
+     * 备用字段16（需求固定车号id）(ALTERNATE_FIELDS16,VARCHAR,1000)
+     */
+    @ApiModelProperty(value="备用字段16（需求固定车号id）",required=false)
+    private String alternateFields16;
+
+    /**
+     * 用车起始时间(REQUIREMENT_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="用车起始时间",required=false)
+    private Date requirementStartTime;
+
+    /**
+     * 用车结束时间(REQUIREMENT_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="用车结束时间",required=false)
+    private Date requirementEndTime;
+
+    /**
+     * 是否收取卸车费（0,不收取;1，收取）(UNLOAD_FEE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="是否收取卸车费（0,不收取;1，收取）",required=false)
+    private String unloadFee;
+
+    /**
+     * 申报用户id(UPLOAD_ID,VARCHAR,255)
+     */
+    @ApiModelProperty(value="申报用户id",required=false)
+    private String uploadId;
+
+    /**
+     * 备用字段17（需求固定展示车号）(ALTERNATE_FIELDS17,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段17（需求固定展示车号）",required=false)
+    private String alternateFields17;
+
+    /**
+     * 备用字段18（是否出库，0：否，1：是）(ALTERNATE_FIELDS18,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段18（是否出库，0：否，1：是）",required=false)
+    private String alternateFields18;
+
+    /**
+     * 备用字段19（TDLS:大宗的通知单主键）(ALTERNATE_FIELDS19,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段19（TDLS:大宗的通知单主键）",required=false)
+    private String alternateFields19;
+
+    /**
+     * 备用字段20（是否换车头：0-否，1-是）(ALTERNATE_FIELDS20,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段20（是否换车头：0-否，1-是）",required=false)
+    private String alternateFields20;
+
+    /**
+     * 备用字段21（结算方式：0-余款、1-现款、2-余款、现款）(ALTERNATE_FIELDS21,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段21（结算方式：0-余款、1-现款、2-余款、现款）",required=false)
+    private String alternateFields21;
+
+    /**
+     * 备用字段22（固定需求对应司机id）(ALTERNATE_FIELDS22,VARCHAR,1000)
+     */
+    @ApiModelProperty(value="备用字段22（固定需求对应司机id）",required=false)
+    private String alternateFields22;
+
+    /**
+     * 备用字段23（单价)(ALTERNATE_FIELDS23,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段23（单价)",required=false)
+    private String alternateFields23;
+
+    /**
+     * 备用字段24（结算备注）(ALTERNATE_FIELDS24,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段24（结算备注）",required=false)
+    private String alternateFields24;
+
+    /**
+     * 备用字段25（金额）(ALTERNATE_FIELDS25,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段25（金额）",required=false)
+    private String alternateFields25;
+
+    /**
+     * 备用字段26（提报人id）(ALTERNATE_FIELDS26,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段26（提报人id）",required=false)
+    private String alternateFields26;
+
+    /**
+     * 备用字段27（是否带人）(ALTERNATE_FIELDS27,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段27（是否带人）",required=false)
+    private String alternateFields27;
+
+    /**
+     * 备用字段28(节臂)(ALTERNATE_FIELDS28,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段28(节臂)",required=false)
+    private String alternateFields28;
+
+    /**
+     * 备用字段29（宏瑞拉运：采购计划号）(ALTERNATE_FIELDS29,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段29（宏瑞拉运：采购计划号）",required=false)
+    private String alternateFields29;
+
+    /**
+     * 备用字段30（是否已派车1：未派车，0：已派车）(ALTERNATE_FIELDS30,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段30（是否已派车1：未派车，0：已派车）",required=false)
+    private String alternateFields30;
+
+    /**
+     * 备用字段31(固定需求是否当天新增标识0：否，1：是)(ALTERNATE_FIELDS31,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段31(固定需求是否当天新增标识0：否，1：是)",required=false)
+    private String alternateFields31;
+
+    /**
+     * 备用字段32（吊车吨位）(ALTERNATE_FIELDS32,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段32（吊车吨位）",required=false)
+    private String alternateFields32;
+
+    /**
+     * 备用字段33(固定需求序号)(ALTERNATE_FIELDS33,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段33(固定需求序号)",required=false)
+    private String alternateFields33;
+
+    /**
+     * 备用字段34（发运类型：fylx）(ALTERNATE_FIELDS34,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段34（发运类型：fylx）",required=false)
+    private String alternateFields34;
+
+    /**
+     * 备用字段35(是否清洁运单：1-清洁订单，0-非清洁订单)(ALTERNATE_FIELDS35,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段35(是否清洁运单：1-清洁订单，0-非清洁订单)",required=false)
+    private String alternateFields35;
+
+    /**
+     * 备用字段36（固定需求id）(ALTERNATE_FIELDS36,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段36（固定需求id）",required=false)
+    private String alternateFields36;
+
+    /**
+     * 备用字段37（是否火运采购国内矿 0、否 1、是）(ALTERNATE_FIELDS37,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段37（是否火运采购国内矿 0、否 1、是）",required=false)
+    private String alternateFields37;
+
+    /**
+     * 备用字段38（标记为火运回传清洁能源）(ALTERNATE_FIELDS38,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段38（标记为火运回传清洁能源）",required=false)
+    private String alternateFields38;
+
+    /**
+     * 业务单位名称(BUSINESS_COMPANY_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="业务单位名称",required=false)
+    private String businessCompanyName;
+
+    /**
+     * 业务单位编码(BUSINESS_COMPANY_CODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="业务单位编码",required=false)
+    private String businessCompanyCode;
+
+    /**
+     * 发货单位名称(SHIPPING_COMPANY_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="发货单位名称",required=false)
+    private String shippingCompanyName;
+
+    /**
+     * 发货单位编码(SHIPPING_COMPANY_CODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="发货单位编码",required=false)
+    private String shippingCompanyCode;
+
+    /**
+     * 收货单位名称(RECEIVING_COMPANY_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="收货单位名称",required=false)
+    private String receivingCompanyName;
+
+    /**
+     * 收货单位编码(RECEIVING_COMPANY_CODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="收货单位编码",required=false)
+    private String receivingCompanyCode;
+
+    /**
+     * 线路名称(LINE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="线路名称",required=false)
+    private String lineName;
+
+    /**
+     * 线路步骤(LINE_STEPS,VARCHAR,255)
+     */
+    @ApiModelProperty(value="线路步骤",required=false)
+    private String lineSteps;
+
+    /**
+     * 运力类型名称(CAPACITY_TYPE_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="运力类型名称",required=false)
+    private String capacityTypeName;
+
+    /**
+     * 业务场景(BUSINESS_SCENE,VARCHAR,50)
+     */
+    @ApiModelProperty(value="业务场景",required=false)
+    private String businessScene;
+
+    /**
+     * 业务类型名称(BUSINESS_TYPE_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="业务类型名称",required=false)
+    private String businessTypeName;
+
+    /**
+     * 需求用时类型（白班、夜班、临时）(REQUIREMENT_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="需求用时类型（白班、夜班、临时）",required=false)
+    private String requirementType;
+
+    /**
+     * 用车单位父级ID(PARENT_BUSINESS_COMPANY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="用车单位父级ID",required=false)
+    private BigDecimal parentBusinessCompanyId;
+
+    /**
+     * 用车单位父级名称(PARENT_BUSINESS_COMPANY_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="用车单位父级名称",required=false)
+    private String parentBusinessCompanyName;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.transRequirementId;
+    }
+
+    @Override
+    public void setId(BigDecimal transRequirementId) {
+        this.transRequirementId = transRequirementId;
+    }
+
+    public BigDecimal getTransRequirementId() {
+        return transRequirementId;
+    }
+
+    public void setTransRequirementId(BigDecimal transRequirementId) {
+        this.transRequirementId = transRequirementId;
+    }
+
+    public BigDecimal getSourceOrderId() {
+        return sourceOrderId;
+    }
+
+    public void setSourceOrderId(BigDecimal sourceOrderId) {
+        this.sourceOrderId = sourceOrderId;
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber == null ? null : serialNumber.trim();
+    }
+
+    public String getAuditNumber() {
+        return auditNumber;
+    }
+
+    public void setAuditNumber(String auditNumber) {
+        this.auditNumber = auditNumber == null ? null : auditNumber.trim();
+    }
+
+    public BigDecimal getTransMode() {
+        return transMode;
+    }
+
+    public void setTransMode(BigDecimal transMode) {
+        this.transMode = transMode;
+    }
+
+    public BigDecimal getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(BigDecimal businessType) {
+        this.businessType = businessType;
+    }
+
+    public String getBusinessEmployee() {
+        return businessEmployee;
+    }
+
+    public void setBusinessEmployee(String businessEmployee) {
+        this.businessEmployee = businessEmployee == null ? null : businessEmployee.trim();
+    }
+
+    public BigDecimal getBusinessCompanyId() {
+        return businessCompanyId;
+    }
+
+    public void setBusinessCompanyId(BigDecimal businessCompanyId) {
+        this.businessCompanyId = businessCompanyId;
+    }
+
+    public BigDecimal getShippingCompanyId() {
+        return shippingCompanyId;
+    }
+
+    public void setShippingCompanyId(BigDecimal shippingCompanyId) {
+        this.shippingCompanyId = shippingCompanyId;
+    }
+
+    public BigDecimal getReceivingCompanyId() {
+        return receivingCompanyId;
+    }
+
+    public void setReceivingCompanyId(BigDecimal receivingCompanyId) {
+        this.receivingCompanyId = receivingCompanyId;
+    }
+
+    public BigDecimal getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(BigDecimal lineId) {
+        this.lineId = lineId;
+    }
+
+    public Integer getControlMode() {
+        return controlMode;
+    }
+
+    public void setControlMode(Integer controlMode) {
+        this.controlMode = controlMode;
+    }
+
+    public Integer getPrintStampList() {
+        return printStampList;
+    }
+
+    public void setPrintStampList(Integer printStampList) {
+        this.printStampList = printStampList;
+    }
+
+    public Integer getNuclearLoadControl() {
+        return nuclearLoadControl;
+    }
+
+    public void setNuclearLoadControl(Integer nuclearLoadControl) {
+        this.nuclearLoadControl = nuclearLoadControl;
+    }
+
+    public String getTheoryWeight() {
+        return theoryWeight;
+    }
+
+    public void setTheoryWeight(String theoryWeight) {
+        this.theoryWeight = theoryWeight == null ? null : theoryWeight.trim();
+    }
+
+    public Integer getIsDomestic() {
+        return isDomestic;
+    }
+
+    public void setIsDomestic(Integer isDomestic) {
+        this.isDomestic = isDomestic;
+    }
+
+    public String getTranShipmentType() {
+        return tranShipmentType;
+    }
+
+    public void setTranShipmentType(String tranShipmentType) {
+        this.tranShipmentType = tranShipmentType == null ? null : tranShipmentType.trim();
+    }
+
+    public String getBillingType() {
+        return billingType;
+    }
+
+    public void setBillingType(String billingType) {
+        this.billingType = billingType == null ? null : billingType.trim();
+    }
+
+    public Date getDueTime() {
+        return dueTime;
+    }
+
+    public void setDueTime(Date dueTime) {
+        this.dueTime = dueTime;
+    }
+
+    public Date getRequirementTime() {
+        return requirementTime;
+    }
+
+    public void setRequirementTime(Date requirementTime) {
+        this.requirementTime = requirementTime;
+    }
+
+    public BigDecimal getCapacityTypeId() {
+        return capacityTypeId;
+    }
+
+    public void setCapacityTypeId(BigDecimal capacityTypeId) {
+        this.capacityTypeId = capacityTypeId;
+    }
+
+    public String getRequirementContact() {
+        return requirementContact;
+    }
+
+    public void setRequirementContact(String requirementContact) {
+        this.requirementContact = requirementContact == null ? null : requirementContact.trim();
+    }
+
+    public String getRequirementContactPhone() {
+        return requirementContactPhone;
+    }
+
+    public void setRequirementContactPhone(String requirementContactPhone) {
+        this.requirementContactPhone = requirementContactPhone == null ? null : requirementContactPhone.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getUploadName() {
+        return uploadName;
+    }
+
+    public void setUploadName(String uploadName) {
+        this.uploadName = uploadName == null ? null : uploadName.trim();
+    }
+
+    public Date getUploadTime() {
+        return uploadTime;
+    }
+
+    public void setUploadTime(Date uploadTime) {
+        this.uploadTime = uploadTime;
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public String getAlternateFields9() {
+        return alternateFields9;
+    }
+
+    public void setAlternateFields9(String alternateFields9) {
+        this.alternateFields9 = alternateFields9 == null ? null : alternateFields9.trim();
+    }
+
+    public String getAlternateFields10() {
+        return alternateFields10;
+    }
+
+    public void setAlternateFields10(String alternateFields10) {
+        this.alternateFields10 = alternateFields10 == null ? null : alternateFields10.trim();
+    }
+
+    public String getAlternateFields11() {
+        return alternateFields11;
+    }
+
+    public void setAlternateFields11(String alternateFields11) {
+        this.alternateFields11 = alternateFields11 == null ? null : alternateFields11.trim();
+    }
+
+    public String getAlternateFields12() {
+        return alternateFields12;
+    }
+
+    public void setAlternateFields12(String alternateFields12) {
+        this.alternateFields12 = alternateFields12 == null ? null : alternateFields12.trim();
+    }
+
+    public String getAlternateFields13() {
+        return alternateFields13;
+    }
+
+    public void setAlternateFields13(String alternateFields13) {
+        this.alternateFields13 = alternateFields13 == null ? null : alternateFields13.trim();
+    }
+
+    public String getAlternateFields14() {
+        return alternateFields14;
+    }
+
+    public void setAlternateFields14(String alternateFields14) {
+        this.alternateFields14 = alternateFields14 == null ? null : alternateFields14.trim();
+    }
+
+    public String getAlternateFields15() {
+        return alternateFields15;
+    }
+
+    public void setAlternateFields15(String alternateFields15) {
+        this.alternateFields15 = alternateFields15 == null ? null : alternateFields15.trim();
+    }
+
+    public String getAlternateFields16() {
+        return alternateFields16;
+    }
+
+    public void setAlternateFields16(String alternateFields16) {
+        this.alternateFields16 = alternateFields16 == null ? null : alternateFields16.trim();
+    }
+
+    public Date getRequirementStartTime() {
+        return requirementStartTime;
+    }
+
+    public void setRequirementStartTime(Date requirementStartTime) {
+        this.requirementStartTime = requirementStartTime;
+    }
+
+    public Date getRequirementEndTime() {
+        return requirementEndTime;
+    }
+
+    public void setRequirementEndTime(Date requirementEndTime) {
+        this.requirementEndTime = requirementEndTime;
+    }
+
+    public String getUnloadFee() {
+        return unloadFee;
+    }
+
+    public void setUnloadFee(String unloadFee) {
+        this.unloadFee = unloadFee == null ? null : unloadFee.trim();
+    }
+
+    public String getUploadId() {
+        return uploadId;
+    }
+
+    public void setUploadId(String uploadId) {
+        this.uploadId = uploadId == null ? null : uploadId.trim();
+    }
+
+    public String getAlternateFields17() {
+        return alternateFields17;
+    }
+
+    public void setAlternateFields17(String alternateFields17) {
+        this.alternateFields17 = alternateFields17 == null ? null : alternateFields17.trim();
+    }
+
+    public String getAlternateFields18() {
+        return alternateFields18;
+    }
+
+    public void setAlternateFields18(String alternateFields18) {
+        this.alternateFields18 = alternateFields18 == null ? null : alternateFields18.trim();
+    }
+
+    public String getAlternateFields19() {
+        return alternateFields19;
+    }
+
+    public void setAlternateFields19(String alternateFields19) {
+        this.alternateFields19 = alternateFields19 == null ? null : alternateFields19.trim();
+    }
+
+    public String getAlternateFields20() {
+        return alternateFields20;
+    }
+
+    public void setAlternateFields20(String alternateFields20) {
+        this.alternateFields20 = alternateFields20 == null ? null : alternateFields20.trim();
+    }
+
+    public String getAlternateFields21() {
+        return alternateFields21;
+    }
+
+    public void setAlternateFields21(String alternateFields21) {
+        this.alternateFields21 = alternateFields21 == null ? null : alternateFields21.trim();
+    }
+
+    public String getAlternateFields22() {
+        return alternateFields22;
+    }
+
+    public void setAlternateFields22(String alternateFields22) {
+        this.alternateFields22 = alternateFields22 == null ? null : alternateFields22.trim();
+    }
+
+    public String getAlternateFields23() {
+        return alternateFields23;
+    }
+
+    public void setAlternateFields23(String alternateFields23) {
+        this.alternateFields23 = alternateFields23 == null ? null : alternateFields23.trim();
+    }
+
+    public String getAlternateFields24() {
+        return alternateFields24;
+    }
+
+    public void setAlternateFields24(String alternateFields24) {
+        this.alternateFields24 = alternateFields24 == null ? null : alternateFields24.trim();
+    }
+
+    public String getAlternateFields25() {
+        return alternateFields25;
+    }
+
+    public void setAlternateFields25(String alternateFields25) {
+        this.alternateFields25 = alternateFields25 == null ? null : alternateFields25.trim();
+    }
+
+    public String getAlternateFields26() {
+        return alternateFields26;
+    }
+
+    public void setAlternateFields26(String alternateFields26) {
+        this.alternateFields26 = alternateFields26 == null ? null : alternateFields26.trim();
+    }
+
+    public String getAlternateFields27() {
+        return alternateFields27;
+    }
+
+    public void setAlternateFields27(String alternateFields27) {
+        this.alternateFields27 = alternateFields27 == null ? null : alternateFields27.trim();
+    }
+
+    public String getAlternateFields28() {
+        return alternateFields28;
+    }
+
+    public void setAlternateFields28(String alternateFields28) {
+        this.alternateFields28 = alternateFields28 == null ? null : alternateFields28.trim();
+    }
+
+    public String getAlternateFields29() {
+        return alternateFields29;
+    }
+
+    public void setAlternateFields29(String alternateFields29) {
+        this.alternateFields29 = alternateFields29 == null ? null : alternateFields29.trim();
+    }
+
+    public String getAlternateFields30() {
+        return alternateFields30;
+    }
+
+    public void setAlternateFields30(String alternateFields30) {
+        this.alternateFields30 = alternateFields30 == null ? null : alternateFields30.trim();
+    }
+
+    public String getAlternateFields31() {
+        return alternateFields31;
+    }
+
+    public void setAlternateFields31(String alternateFields31) {
+        this.alternateFields31 = alternateFields31 == null ? null : alternateFields31.trim();
+    }
+
+    public String getAlternateFields32() {
+        return alternateFields32;
+    }
+
+    public void setAlternateFields32(String alternateFields32) {
+        this.alternateFields32 = alternateFields32 == null ? null : alternateFields32.trim();
+    }
+
+    public String getAlternateFields33() {
+        return alternateFields33;
+    }
+
+    public void setAlternateFields33(String alternateFields33) {
+        this.alternateFields33 = alternateFields33 == null ? null : alternateFields33.trim();
+    }
+
+    public String getAlternateFields34() {
+        return alternateFields34;
+    }
+
+    public void setAlternateFields34(String alternateFields34) {
+        this.alternateFields34 = alternateFields34 == null ? null : alternateFields34.trim();
+    }
+
+    public String getAlternateFields35() {
+        return alternateFields35;
+    }
+
+    public void setAlternateFields35(String alternateFields35) {
+        this.alternateFields35 = alternateFields35 == null ? null : alternateFields35.trim();
+    }
+
+    public String getAlternateFields36() {
+        return alternateFields36;
+    }
+
+    public void setAlternateFields36(String alternateFields36) {
+        this.alternateFields36 = alternateFields36 == null ? null : alternateFields36.trim();
+    }
+
+    public String getAlternateFields37() {
+        return alternateFields37;
+    }
+
+    public void setAlternateFields37(String alternateFields37) {
+        this.alternateFields37 = alternateFields37 == null ? null : alternateFields37.trim();
+    }
+
+    public String getAlternateFields38() {
+        return alternateFields38;
+    }
+
+    public void setAlternateFields38(String alternateFields38) {
+        this.alternateFields38 = alternateFields38 == null ? null : alternateFields38.trim();
+    }
+
+    public String getBusinessCompanyName() {
+        return businessCompanyName;
+    }
+
+    public void setBusinessCompanyName(String businessCompanyName) {
+        this.businessCompanyName = businessCompanyName == null ? null : businessCompanyName.trim();
+    }
+
+    public String getBusinessCompanyCode() {
+        return businessCompanyCode;
+    }
+
+    public void setBusinessCompanyCode(String businessCompanyCode) {
+        this.businessCompanyCode = businessCompanyCode == null ? null : businessCompanyCode.trim();
+    }
+
+    public String getShippingCompanyName() {
+        return shippingCompanyName;
+    }
+
+    public void setShippingCompanyName(String shippingCompanyName) {
+        this.shippingCompanyName = shippingCompanyName == null ? null : shippingCompanyName.trim();
+    }
+
+    public String getShippingCompanyCode() {
+        return shippingCompanyCode;
+    }
+
+    public void setShippingCompanyCode(String shippingCompanyCode) {
+        this.shippingCompanyCode = shippingCompanyCode == null ? null : shippingCompanyCode.trim();
+    }
+
+    public String getReceivingCompanyName() {
+        return receivingCompanyName;
+    }
+
+    public void setReceivingCompanyName(String receivingCompanyName) {
+        this.receivingCompanyName = receivingCompanyName == null ? null : receivingCompanyName.trim();
+    }
+
+    public String getReceivingCompanyCode() {
+        return receivingCompanyCode;
+    }
+
+    public void setReceivingCompanyCode(String receivingCompanyCode) {
+        this.receivingCompanyCode = receivingCompanyCode == null ? null : receivingCompanyCode.trim();
+    }
+
+    public String getLineName() {
+        return lineName;
+    }
+
+    public void setLineName(String lineName) {
+        this.lineName = lineName == null ? null : lineName.trim();
+    }
+
+    public String getLineSteps() {
+        return lineSteps;
+    }
+
+    public void setLineSteps(String lineSteps) {
+        this.lineSteps = lineSteps == null ? null : lineSteps.trim();
+    }
+
+    public String getCapacityTypeName() {
+        return capacityTypeName;
+    }
+
+    public void setCapacityTypeName(String capacityTypeName) {
+        this.capacityTypeName = capacityTypeName == null ? null : capacityTypeName.trim();
+    }
+
+    public String getBusinessScene() {
+        return businessScene;
+    }
+
+    public void setBusinessScene(String businessScene) {
+        this.businessScene = businessScene == null ? null : businessScene.trim();
+    }
+
+    public String getBusinessTypeName() {
+        return businessTypeName;
+    }
+
+    public void setBusinessTypeName(String businessTypeName) {
+        this.businessTypeName = businessTypeName == null ? null : businessTypeName.trim();
+    }
+
+    public String getRequirementType() {
+        return requirementType;
+    }
+
+    public void setRequirementType(String requirementType) {
+        this.requirementType = requirementType == null ? null : requirementType.trim();
+    }
+
+    public BigDecimal getParentBusinessCompanyId() {
+        return parentBusinessCompanyId;
+    }
+
+    public void setParentBusinessCompanyId(BigDecimal parentBusinessCompanyId) {
+        this.parentBusinessCompanyId = parentBusinessCompanyId;
+    }
+
+    public String getParentBusinessCompanyName() {
+        return parentBusinessCompanyName;
+    }
+
+    public void setParentBusinessCompanyName(String parentBusinessCompanyName) {
+        this.parentBusinessCompanyName = parentBusinessCompanyName == null ? null : parentBusinessCompanyName.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", transRequirementId=").append(transRequirementId);
+        sb.append(", sourceOrderId=").append(sourceOrderId);
+        sb.append(", serialNumber=").append(serialNumber);
+        sb.append(", auditNumber=").append(auditNumber);
+        sb.append(", transMode=").append(transMode);
+        sb.append(", businessType=").append(businessType);
+        sb.append(", businessEmployee=").append(businessEmployee);
+        sb.append(", businessCompanyId=").append(businessCompanyId);
+        sb.append(", shippingCompanyId=").append(shippingCompanyId);
+        sb.append(", receivingCompanyId=").append(receivingCompanyId);
+        sb.append(", lineId=").append(lineId);
+        sb.append(", controlMode=").append(controlMode);
+        sb.append(", printStampList=").append(printStampList);
+        sb.append(", nuclearLoadControl=").append(nuclearLoadControl);
+        sb.append(", theoryWeight=").append(theoryWeight);
+        sb.append(", isDomestic=").append(isDomestic);
+        sb.append(", tranShipmentType=").append(tranShipmentType);
+        sb.append(", billingType=").append(billingType);
+        sb.append(", dueTime=").append(dueTime);
+        sb.append(", requirementTime=").append(requirementTime);
+        sb.append(", capacityTypeId=").append(capacityTypeId);
+        sb.append(", requirementContact=").append(requirementContact);
+        sb.append(", requirementContactPhone=").append(requirementContactPhone);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", uploadName=").append(uploadName);
+        sb.append(", uploadTime=").append(uploadTime);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", alternateFields9=").append(alternateFields9);
+        sb.append(", alternateFields10=").append(alternateFields10);
+        sb.append(", alternateFields11=").append(alternateFields11);
+        sb.append(", alternateFields12=").append(alternateFields12);
+        sb.append(", alternateFields13=").append(alternateFields13);
+        sb.append(", alternateFields14=").append(alternateFields14);
+        sb.append(", alternateFields15=").append(alternateFields15);
+        sb.append(", alternateFields16=").append(alternateFields16);
+        sb.append(", requirementStartTime=").append(requirementStartTime);
+        sb.append(", requirementEndTime=").append(requirementEndTime);
+        sb.append(", unloadFee=").append(unloadFee);
+        sb.append(", uploadId=").append(uploadId);
+        sb.append(", alternateFields17=").append(alternateFields17);
+        sb.append(", alternateFields18=").append(alternateFields18);
+        sb.append(", alternateFields19=").append(alternateFields19);
+        sb.append(", alternateFields20=").append(alternateFields20);
+        sb.append(", alternateFields21=").append(alternateFields21);
+        sb.append(", alternateFields22=").append(alternateFields22);
+        sb.append(", alternateFields23=").append(alternateFields23);
+        sb.append(", alternateFields24=").append(alternateFields24);
+        sb.append(", alternateFields25=").append(alternateFields25);
+        sb.append(", alternateFields26=").append(alternateFields26);
+        sb.append(", alternateFields27=").append(alternateFields27);
+        sb.append(", alternateFields28=").append(alternateFields28);
+        sb.append(", alternateFields29=").append(alternateFields29);
+        sb.append(", alternateFields30=").append(alternateFields30);
+        sb.append(", alternateFields31=").append(alternateFields31);
+        sb.append(", alternateFields32=").append(alternateFields32);
+        sb.append(", alternateFields33=").append(alternateFields33);
+        sb.append(", alternateFields34=").append(alternateFields34);
+        sb.append(", alternateFields35=").append(alternateFields35);
+        sb.append(", alternateFields36=").append(alternateFields36);
+        sb.append(", alternateFields37=").append(alternateFields37);
+        sb.append(", alternateFields38=").append(alternateFields38);
+        sb.append(", businessCompanyName=").append(businessCompanyName);
+        sb.append(", businessCompanyCode=").append(businessCompanyCode);
+        sb.append(", shippingCompanyName=").append(shippingCompanyName);
+        sb.append(", shippingCompanyCode=").append(shippingCompanyCode);
+        sb.append(", receivingCompanyName=").append(receivingCompanyName);
+        sb.append(", receivingCompanyCode=").append(receivingCompanyCode);
+        sb.append(", lineName=").append(lineName);
+        sb.append(", lineSteps=").append(lineSteps);
+        sb.append(", capacityTypeName=").append(capacityTypeName);
+        sb.append(", businessScene=").append(businessScene);
+        sb.append(", businessTypeName=").append(businessTypeName);
+        sb.append(", requirementType=").append(requirementType);
+        sb.append(", parentBusinessCompanyId=").append(parentBusinessCompanyId);
+        sb.append(", parentBusinessCompanyName=").append(parentBusinessCompanyName);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,364 @@
+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 DilContrastingRelation implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PRIMARY_KEY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal primaryKeyId;
+
+    /**
+     * 过磅物料名称(WEIGHT_MATERIAL_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="过磅物料名称",required=false)
+    private String weightMaterialName;
+
+    /**
+     * 过磅业务区间(WEIGHT_RANGE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="过磅业务区间",required=false)
+    private String weightRange;
+
+    /**
+     * 过磅业务场景(WEIGHT_SCENE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="过磅业务场景",required=false)
+    private String weightScene;
+
+    /**
+     * 生产业务名称(SC_BUSINESS_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="生产业务名称",required=false)
+    private String scBusinessName;
+
+    /**
+     * 生产业务区间(SC_BUSINESS_RANGE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="生产业务区间",required=false)
+    private String scBusinessRange;
+
+    /**
+     * 生产业务类型(SC_BUSINESS_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="生产业务类型",required=false)
+    private String scBusinessType;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 过磅合同号(WEIGHT_SERIAL_NUMBER,VARCHAR,255)
+     */
+    @ApiModelProperty(value="过磅合同号",required=false)
+    private String weightSerialNumber;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.primaryKeyId;
+    }
+
+    @Override
+    public void setId(BigDecimal primaryKeyId) {
+        this.primaryKeyId = primaryKeyId;
+    }
+
+    public BigDecimal getPrimaryKeyId() {
+        return primaryKeyId;
+    }
+
+    public void setPrimaryKeyId(BigDecimal primaryKeyId) {
+        this.primaryKeyId = primaryKeyId;
+    }
+
+    public String getWeightMaterialName() {
+        return weightMaterialName;
+    }
+
+    public void setWeightMaterialName(String weightMaterialName) {
+        this.weightMaterialName = weightMaterialName == null ? null : weightMaterialName.trim();
+    }
+
+    public String getWeightRange() {
+        return weightRange;
+    }
+
+    public void setWeightRange(String weightRange) {
+        this.weightRange = weightRange == null ? null : weightRange.trim();
+    }
+
+    public String getWeightScene() {
+        return weightScene;
+    }
+
+    public void setWeightScene(String weightScene) {
+        this.weightScene = weightScene == null ? null : weightScene.trim();
+    }
+
+    public String getScBusinessName() {
+        return scBusinessName;
+    }
+
+    public void setScBusinessName(String scBusinessName) {
+        this.scBusinessName = scBusinessName == null ? null : scBusinessName.trim();
+    }
+
+    public String getScBusinessRange() {
+        return scBusinessRange;
+    }
+
+    public void setScBusinessRange(String scBusinessRange) {
+        this.scBusinessRange = scBusinessRange == null ? null : scBusinessRange.trim();
+    }
+
+    public String getScBusinessType() {
+        return scBusinessType;
+    }
+
+    public void setScBusinessType(String scBusinessType) {
+        this.scBusinessType = scBusinessType == null ? null : scBusinessType.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public String getWeightSerialNumber() {
+        return weightSerialNumber;
+    }
+
+    public void setWeightSerialNumber(String weightSerialNumber) {
+        this.weightSerialNumber = weightSerialNumber == null ? null : weightSerialNumber.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", primaryKeyId=").append(primaryKeyId);
+        sb.append(", weightMaterialName=").append(weightMaterialName);
+        sb.append(", weightRange=").append(weightRange);
+        sb.append(", weightScene=").append(weightScene);
+        sb.append(", scBusinessName=").append(scBusinessName);
+        sb.append(", scBusinessRange=").append(scBusinessRange);
+        sb.append(", scBusinessType=").append(scBusinessType);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", weightSerialNumber=").append(weightSerialNumber);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,1068 @@
+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 OmsOrderChild implements IBasePO<BigDecimal> {
+    /**
+     * 运单子表ID（主键ID）(ORDER_CHILD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单子表ID（主键ID）",required=true)
+    private BigDecimal orderChildId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 计划子表ID(PLAN_CHILD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计划子表ID",required=false)
+    private BigDecimal planChildId;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 物资吨位(MATERIAL_WEIGHT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资吨位",required=false)
+    private BigDecimal materialWeight;
+
+    /**
+     * 物资数量(MATERIAL_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资数量",required=false)
+    private BigDecimal materialNumber;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 备用字段1(派车单号)(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1(派车单号)",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(发货仓库)(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2(发货仓库)",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(临时货位)(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3(临时货位)",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(原发磅单图片)(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4(原发磅单图片)",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7 （0补单标志）(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7 （0补单标志）",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 原发件数(ORIGIN_MATERIAL_ZJS,DECIMAL,38)
+     */
+    @ApiModelProperty(value="原发件数",required=false)
+    private BigDecimal originMaterialZjs;
+
+    /**
+     * 原发磅单号(ORIGIN_POUND_NO,VARCHAR,255)
+     */
+    @ApiModelProperty(value="原发磅单号",required=false)
+    private String originPoundNo;
+
+    /**
+     * 原发日期(出库日期)(ORIGIN_DATE,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="原发日期(出库日期)",required=false)
+    private Date originDate;
+
+    /**
+     * 净重(NET_WEIGHT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="净重",required=false)
+    private BigDecimal netWeight;
+
+    /**
+     * 实际吨位（理论重量）(ACTUAL_WEIGHT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实际吨位（理论重量）",required=false)
+    private BigDecimal actualWeight;
+
+    /**
+     * 扣杂(KZ,DECIMAL,38)
+     */
+    @ApiModelProperty(value="扣杂",required=false)
+    private BigDecimal kz;
+
+    /**
+     * 扣水(KS,DECIMAL,38)
+     */
+    @ApiModelProperty(value="扣水",required=false)
+    private BigDecimal ks;
+
+    /**
+     * 计时时长(TIMING_DURATION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计时时长",required=false)
+    private BigDecimal timingDuration;
+
+    /**
+     * 实际时长(ACTUAL_DURATION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实际时长",required=false)
+    private BigDecimal actualDuration;
+
+    /**
+     * 实际件数(ACTUAL_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实际件数",required=false)
+    private BigDecimal actualNumber;
+
+    /**
+     * 备用字段9（出库人）(ALTERNATE_FIELDS9,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段9（出库人）",required=false)
+    private String alternateFields9;
+
+    /**
+     * 备用字段10（毛重）(ALTERNATE_FIELDS10,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段10（毛重）",required=false)
+    private String alternateFields10;
+
+    /**
+     * 备用字段11（皮重）(ALTERNATE_FIELDS11,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段11（皮重）",required=false)
+    private String alternateFields11;
+
+    /**
+     * 备用字段12（签工）(ALTERNATE_FIELDS12,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段12（签工）",required=false)
+    private String alternateFields12;
+
+    /**
+     * 备用字段13（吊装车辆）(ALTERNATE_FIELDS13,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段13（吊装车辆）",required=false)
+    private String alternateFields13;
+
+    /**
+     * 备用字段14（吊装实绩id）(ALTERNATE_FIELDS14,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段14（吊装实绩id）",required=false)
+    private String alternateFields14;
+
+    /**
+     * 备用字段15(采购匹配到的运单ID,涉及报表，请勿重复使用)(ALTERNATE_FIELDS15,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段15(采购匹配到的运单ID,涉及报表，请勿重复使用)",required=false)
+    private String alternateFields15;
+
+    /**
+     * 备用字段16（是否传清洁能源0、未回传  1、已回传）(ALTERNATE_FIELDS16,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段16（是否传清洁能源0、未回传  1、已回传）",required=false)
+    private String alternateFields16;
+
+    /**
+     * 备用字段17（计次数量）(ALTERNATE_FIELDS17,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段17（计次数量）",required=false)
+    private String alternateFields17;
+
+    /**
+     * 备用字段18（炉号）(ALTERNATE_FIELDS18,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段18（炉号）",required=false)
+    private String alternateFields18;
+
+    /**
+     * 备用字段19（时间系统修改后）(ALTERNATE_FIELDS19,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段19（时间系统修改后）",required=false)
+    private String alternateFields19;
+
+    /**
+     * 备用字段20（装载机匹配到的大车运单）(ALTERNATE_FIELDS20,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="备用字段20（装载机匹配到的大车运单）",required=false)
+    private String alternateFields20;
+
+    /**
+     * 备用字段21(ALTERNATE_FIELDS21,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段21",required=false)
+    private String alternateFields21;
+
+    /**
+     * 备用字段22(ALTERNATE_FIELDS22,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段22",required=false)
+    private String alternateFields22;
+
+    /**
+     * 备用字段23(ALTERNATE_FIELDS23,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段23",required=false)
+    private String alternateFields23;
+
+    /**
+     * 备用字段24(ALTERNATE_FIELDS24,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段24",required=false)
+    private String alternateFields24;
+
+    /**
+     * 备用字段25(ALTERNATE_FIELDS25,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段25",required=false)
+    private String alternateFields25;
+
+    /**
+     * 物资名字(MATERIAL_NAME,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资名字",required=false)
+    private String materialName;
+
+    /**
+     * 物资编号(MATERIAL_CODE,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资编号",required=false)
+    private String materialCode;
+
+    /**
+     * 物资规格(MATERIAL_SPECIFICATION,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资规格",required=false)
+    private String materialSpecification;
+
+    /**
+     * 物资型号(MATERIAL_MODEL,VARCHAR,500)
+     */
+    @ApiModelProperty(value="物资型号",required=false)
+    private String materialModel;
+
+    /**
+     * 物资类型名称(MATERIAL_TYPE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="物资类型名称",required=false)
+    private String materialTypeName;
+
+    /**
+     * 需求编号(REQUIREMENT_NO,VARCHAR,100)
+     */
+    @ApiModelProperty(value="需求编号",required=false)
+    private String requirementNo;
+
+    /**
+     * 进厂时间(ENFACTORY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="进厂时间",required=false)
+    private Date enfactoryTime;
+
+    /**
+     * 皮重时间(TARE_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="皮重时间",required=false)
+    private Date tareWeightTime;
+
+    /**
+     * 毛重时间(GROSS_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="毛重时间",required=false)
+    private Date grossWeightTime;
+
+    /**
+     * 净重时间(NET_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="净重时间",required=false)
+    private Date netWeightTime;
+
+    /**
+     * 出厂时间(OUTFACTORY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="出厂时间",required=false)
+    private Date outfactoryTime;
+
+    /**
+     * 装货时间(LOAD_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="装货时间",required=false)
+    private Date loadTime;
+
+    /**
+     * 卸货时间(UNLOAD_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="卸货时间",required=false)
+    private Date unloadTime;
+
+    /**
+     * 签到时间(SIGN_IN_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="签到时间",required=false)
+    private Date signInTime;
+
+    /**
+     * 抵达时间(ARRIVAL_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="抵达时间",required=false)
+    private Date arrivalTime;
+
+    /**
+     * 签收时间（作为生产计重的关闭时间）(RECEIPT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="签收时间（作为生产计重的关闭时间）",required=false)
+    private Date receiptTime;
+
+    /**
+     * 采样时间(SAMPLING_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="采样时间",required=false)
+    private Date samplingTime;
+
+    /**
+     * 签到时间(ASSAY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="签到时间",required=false)
+    private Date assayTime;
+
+    /**
+     * 需求子表id(REQUIREMENT_CHILD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="需求子表id",required=false)
+    private BigDecimal requirementChildId;
+
+    /**
+     * 需求开始时间(REQUIREMENT_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="需求开始时间",required=false)
+    private Date requirementStartTime;
+
+    /**
+     * 需求结束时间(REQUIREMENT_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="需求结束时间",required=false)
+    private Date requirementEndTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.orderChildId;
+    }
+
+    @Override
+    public void setId(BigDecimal orderChildId) {
+        this.orderChildId = orderChildId;
+    }
+
+    public BigDecimal getOrderChildId() {
+        return orderChildId;
+    }
+
+    public void setOrderChildId(BigDecimal orderChildId) {
+        this.orderChildId = orderChildId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public BigDecimal getPlanChildId() {
+        return planChildId;
+    }
+
+    public void setPlanChildId(BigDecimal planChildId) {
+        this.planChildId = planChildId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getMaterialWeight() {
+        return materialWeight;
+    }
+
+    public void setMaterialWeight(BigDecimal materialWeight) {
+        this.materialWeight = materialWeight;
+    }
+
+    public BigDecimal getMaterialNumber() {
+        return materialNumber;
+    }
+
+    public void setMaterialNumber(BigDecimal materialNumber) {
+        this.materialNumber = materialNumber;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public BigDecimal getOriginMaterialZjs() {
+        return originMaterialZjs;
+    }
+
+    public void setOriginMaterialZjs(BigDecimal originMaterialZjs) {
+        this.originMaterialZjs = originMaterialZjs;
+    }
+
+    public String getOriginPoundNo() {
+        return originPoundNo;
+    }
+
+    public void setOriginPoundNo(String originPoundNo) {
+        this.originPoundNo = originPoundNo == null ? null : originPoundNo.trim();
+    }
+
+    public Date getOriginDate() {
+        return originDate;
+    }
+
+    public void setOriginDate(Date originDate) {
+        this.originDate = originDate;
+    }
+
+    public BigDecimal getNetWeight() {
+        return netWeight;
+    }
+
+    public void setNetWeight(BigDecimal netWeight) {
+        this.netWeight = netWeight;
+    }
+
+    public BigDecimal getActualWeight() {
+        return actualWeight;
+    }
+
+    public void setActualWeight(BigDecimal actualWeight) {
+        this.actualWeight = actualWeight;
+    }
+
+    public BigDecimal getKz() {
+        return kz;
+    }
+
+    public void setKz(BigDecimal kz) {
+        this.kz = kz;
+    }
+
+    public BigDecimal getKs() {
+        return ks;
+    }
+
+    public void setKs(BigDecimal ks) {
+        this.ks = ks;
+    }
+
+    public BigDecimal getTimingDuration() {
+        return timingDuration;
+    }
+
+    public void setTimingDuration(BigDecimal timingDuration) {
+        this.timingDuration = timingDuration;
+    }
+
+    public BigDecimal getActualDuration() {
+        return actualDuration;
+    }
+
+    public void setActualDuration(BigDecimal actualDuration) {
+        this.actualDuration = actualDuration;
+    }
+
+    public BigDecimal getActualNumber() {
+        return actualNumber;
+    }
+
+    public void setActualNumber(BigDecimal actualNumber) {
+        this.actualNumber = actualNumber;
+    }
+
+    public String getAlternateFields9() {
+        return alternateFields9;
+    }
+
+    public void setAlternateFields9(String alternateFields9) {
+        this.alternateFields9 = alternateFields9 == null ? null : alternateFields9.trim();
+    }
+
+    public String getAlternateFields10() {
+        return alternateFields10;
+    }
+
+    public void setAlternateFields10(String alternateFields10) {
+        this.alternateFields10 = alternateFields10 == null ? null : alternateFields10.trim();
+    }
+
+    public String getAlternateFields11() {
+        return alternateFields11;
+    }
+
+    public void setAlternateFields11(String alternateFields11) {
+        this.alternateFields11 = alternateFields11 == null ? null : alternateFields11.trim();
+    }
+
+    public String getAlternateFields12() {
+        return alternateFields12;
+    }
+
+    public void setAlternateFields12(String alternateFields12) {
+        this.alternateFields12 = alternateFields12 == null ? null : alternateFields12.trim();
+    }
+
+    public String getAlternateFields13() {
+        return alternateFields13;
+    }
+
+    public void setAlternateFields13(String alternateFields13) {
+        this.alternateFields13 = alternateFields13 == null ? null : alternateFields13.trim();
+    }
+
+    public String getAlternateFields14() {
+        return alternateFields14;
+    }
+
+    public void setAlternateFields14(String alternateFields14) {
+        this.alternateFields14 = alternateFields14 == null ? null : alternateFields14.trim();
+    }
+
+    public String getAlternateFields15() {
+        return alternateFields15;
+    }
+
+    public void setAlternateFields15(String alternateFields15) {
+        this.alternateFields15 = alternateFields15 == null ? null : alternateFields15.trim();
+    }
+
+    public String getAlternateFields16() {
+        return alternateFields16;
+    }
+
+    public void setAlternateFields16(String alternateFields16) {
+        this.alternateFields16 = alternateFields16 == null ? null : alternateFields16.trim();
+    }
+
+    public String getAlternateFields17() {
+        return alternateFields17;
+    }
+
+    public void setAlternateFields17(String alternateFields17) {
+        this.alternateFields17 = alternateFields17 == null ? null : alternateFields17.trim();
+    }
+
+    public String getAlternateFields18() {
+        return alternateFields18;
+    }
+
+    public void setAlternateFields18(String alternateFields18) {
+        this.alternateFields18 = alternateFields18 == null ? null : alternateFields18.trim();
+    }
+
+    public String getAlternateFields19() {
+        return alternateFields19;
+    }
+
+    public void setAlternateFields19(String alternateFields19) {
+        this.alternateFields19 = alternateFields19 == null ? null : alternateFields19.trim();
+    }
+
+    public String getAlternateFields20() {
+        return alternateFields20;
+    }
+
+    public void setAlternateFields20(String alternateFields20) {
+        this.alternateFields20 = alternateFields20 == null ? null : alternateFields20.trim();
+    }
+
+    public String getAlternateFields21() {
+        return alternateFields21;
+    }
+
+    public void setAlternateFields21(String alternateFields21) {
+        this.alternateFields21 = alternateFields21 == null ? null : alternateFields21.trim();
+    }
+
+    public String getAlternateFields22() {
+        return alternateFields22;
+    }
+
+    public void setAlternateFields22(String alternateFields22) {
+        this.alternateFields22 = alternateFields22 == null ? null : alternateFields22.trim();
+    }
+
+    public String getAlternateFields23() {
+        return alternateFields23;
+    }
+
+    public void setAlternateFields23(String alternateFields23) {
+        this.alternateFields23 = alternateFields23 == null ? null : alternateFields23.trim();
+    }
+
+    public String getAlternateFields24() {
+        return alternateFields24;
+    }
+
+    public void setAlternateFields24(String alternateFields24) {
+        this.alternateFields24 = alternateFields24 == null ? null : alternateFields24.trim();
+    }
+
+    public String getAlternateFields25() {
+        return alternateFields25;
+    }
+
+    public void setAlternateFields25(String alternateFields25) {
+        this.alternateFields25 = alternateFields25 == null ? null : alternateFields25.trim();
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName == null ? null : materialName.trim();
+    }
+
+    public String getMaterialCode() {
+        return materialCode;
+    }
+
+    public void setMaterialCode(String materialCode) {
+        this.materialCode = materialCode == null ? null : materialCode.trim();
+    }
+
+    public String getMaterialSpecification() {
+        return materialSpecification;
+    }
+
+    public void setMaterialSpecification(String materialSpecification) {
+        this.materialSpecification = materialSpecification == null ? null : materialSpecification.trim();
+    }
+
+    public String getMaterialModel() {
+        return materialModel;
+    }
+
+    public void setMaterialModel(String materialModel) {
+        this.materialModel = materialModel == null ? null : materialModel.trim();
+    }
+
+    public String getMaterialTypeName() {
+        return materialTypeName;
+    }
+
+    public void setMaterialTypeName(String materialTypeName) {
+        this.materialTypeName = materialTypeName == null ? null : materialTypeName.trim();
+    }
+
+    public String getRequirementNo() {
+        return requirementNo;
+    }
+
+    public void setRequirementNo(String requirementNo) {
+        this.requirementNo = requirementNo == null ? null : requirementNo.trim();
+    }
+
+    public Date getEnfactoryTime() {
+        return enfactoryTime;
+    }
+
+    public void setEnfactoryTime(Date enfactoryTime) {
+        this.enfactoryTime = enfactoryTime;
+    }
+
+    public Date getTareWeightTime() {
+        return tareWeightTime;
+    }
+
+    public void setTareWeightTime(Date tareWeightTime) {
+        this.tareWeightTime = tareWeightTime;
+    }
+
+    public Date getGrossWeightTime() {
+        return grossWeightTime;
+    }
+
+    public void setGrossWeightTime(Date grossWeightTime) {
+        this.grossWeightTime = grossWeightTime;
+    }
+
+    public Date getNetWeightTime() {
+        return netWeightTime;
+    }
+
+    public void setNetWeightTime(Date netWeightTime) {
+        this.netWeightTime = netWeightTime;
+    }
+
+    public Date getOutfactoryTime() {
+        return outfactoryTime;
+    }
+
+    public void setOutfactoryTime(Date outfactoryTime) {
+        this.outfactoryTime = outfactoryTime;
+    }
+
+    public Date getLoadTime() {
+        return loadTime;
+    }
+
+    public void setLoadTime(Date loadTime) {
+        this.loadTime = loadTime;
+    }
+
+    public Date getUnloadTime() {
+        return unloadTime;
+    }
+
+    public void setUnloadTime(Date unloadTime) {
+        this.unloadTime = unloadTime;
+    }
+
+    public Date getSignInTime() {
+        return signInTime;
+    }
+
+    public void setSignInTime(Date signInTime) {
+        this.signInTime = signInTime;
+    }
+
+    public Date getArrivalTime() {
+        return arrivalTime;
+    }
+
+    public void setArrivalTime(Date arrivalTime) {
+        this.arrivalTime = arrivalTime;
+    }
+
+    public Date getReceiptTime() {
+        return receiptTime;
+    }
+
+    public void setReceiptTime(Date receiptTime) {
+        this.receiptTime = receiptTime;
+    }
+
+    public Date getSamplingTime() {
+        return samplingTime;
+    }
+
+    public void setSamplingTime(Date samplingTime) {
+        this.samplingTime = samplingTime;
+    }
+
+    public Date getAssayTime() {
+        return assayTime;
+    }
+
+    public void setAssayTime(Date assayTime) {
+        this.assayTime = assayTime;
+    }
+
+    public BigDecimal getRequirementChildId() {
+        return requirementChildId;
+    }
+
+    public void setRequirementChildId(BigDecimal requirementChildId) {
+        this.requirementChildId = requirementChildId;
+    }
+
+    public Date getRequirementStartTime() {
+        return requirementStartTime;
+    }
+
+    public void setRequirementStartTime(Date requirementStartTime) {
+        this.requirementStartTime = requirementStartTime;
+    }
+
+    public Date getRequirementEndTime() {
+        return requirementEndTime;
+    }
+
+    public void setRequirementEndTime(Date requirementEndTime) {
+        this.requirementEndTime = requirementEndTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", orderChildId=").append(orderChildId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", planChildId=").append(planChildId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", materialWeight=").append(materialWeight);
+        sb.append(", materialNumber=").append(materialNumber);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", originMaterialZjs=").append(originMaterialZjs);
+        sb.append(", originPoundNo=").append(originPoundNo);
+        sb.append(", originDate=").append(originDate);
+        sb.append(", netWeight=").append(netWeight);
+        sb.append(", actualWeight=").append(actualWeight);
+        sb.append(", kz=").append(kz);
+        sb.append(", ks=").append(ks);
+        sb.append(", timingDuration=").append(timingDuration);
+        sb.append(", actualDuration=").append(actualDuration);
+        sb.append(", actualNumber=").append(actualNumber);
+        sb.append(", alternateFields9=").append(alternateFields9);
+        sb.append(", alternateFields10=").append(alternateFields10);
+        sb.append(", alternateFields11=").append(alternateFields11);
+        sb.append(", alternateFields12=").append(alternateFields12);
+        sb.append(", alternateFields13=").append(alternateFields13);
+        sb.append(", alternateFields14=").append(alternateFields14);
+        sb.append(", alternateFields15=").append(alternateFields15);
+        sb.append(", alternateFields16=").append(alternateFields16);
+        sb.append(", alternateFields17=").append(alternateFields17);
+        sb.append(", alternateFields18=").append(alternateFields18);
+        sb.append(", alternateFields19=").append(alternateFields19);
+        sb.append(", alternateFields20=").append(alternateFields20);
+        sb.append(", alternateFields21=").append(alternateFields21);
+        sb.append(", alternateFields22=").append(alternateFields22);
+        sb.append(", alternateFields23=").append(alternateFields23);
+        sb.append(", alternateFields24=").append(alternateFields24);
+        sb.append(", alternateFields25=").append(alternateFields25);
+        sb.append(", materialName=").append(materialName);
+        sb.append(", materialCode=").append(materialCode);
+        sb.append(", materialSpecification=").append(materialSpecification);
+        sb.append(", materialModel=").append(materialModel);
+        sb.append(", materialTypeName=").append(materialTypeName);
+        sb.append(", requirementNo=").append(requirementNo);
+        sb.append(", enfactoryTime=").append(enfactoryTime);
+        sb.append(", tareWeightTime=").append(tareWeightTime);
+        sb.append(", grossWeightTime=").append(grossWeightTime);
+        sb.append(", netWeightTime=").append(netWeightTime);
+        sb.append(", outfactoryTime=").append(outfactoryTime);
+        sb.append(", loadTime=").append(loadTime);
+        sb.append(", unloadTime=").append(unloadTime);
+        sb.append(", signInTime=").append(signInTime);
+        sb.append(", arrivalTime=").append(arrivalTime);
+        sb.append(", receiptTime=").append(receiptTime);
+        sb.append(", samplingTime=").append(samplingTime);
+        sb.append(", assayTime=").append(assayTime);
+        sb.append(", requirementChildId=").append(requirementChildId);
+        sb.append(", requirementStartTime=").append(requirementStartTime);
+        sb.append(", requirementEndTime=").append(requirementEndTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,1278 @@
+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 OmsTransOrder implements IBasePO<BigDecimal> {
+    /**
+     * 运单ID（主键ID）(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID（主键ID）",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 订单编号(SERIAL_NUMBER,VARCHAR,255)
+     */
+    @ApiModelProperty(value="订单编号",required=true)
+    private String serialNumber;
+
+    /**
+     * 车牌号(CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="车牌号",required=false)
+    private BigDecimal capacityId;
+
+    /**
+     * 司机ID(DRIVER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="司机ID",required=false)
+    private BigDecimal driverId;
+
+    /**
+     * 司机联系电话(DRIVER_PHONE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="司机联系电话",required=false)
+    private String driverPhone;
+
+    /**
+     * 业务类型(ORDER_TYPE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="业务类型",required=false)
+    private BigDecimal orderType;
+
+    /**
+     * 订单下发时间(ISSUE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="订单下发时间",required=false)
+    private Date issueTime;
+
+    /**
+     * 司机确认理由（拒绝必须填理由）(CONFIRM_REASON,VARCHAR,255)
+     */
+    @ApiModelProperty(value="司机确认理由（拒绝必须填理由）",required=false)
+    private String confirmReason;
+
+    /**
+     * 司机确认订单时间(DRIVER_CONFIRM_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="司机确认订单时间",required=false)
+    private Date driverConfirmTime;
+
+    /**
+     * 通信时长=司机接单/拒绝时间-订单下发时间（分钟））(ORDER_COMMUNICATION_DURATION,DECIMAL,0)
+     */
+    @ApiModelProperty(value="通信时长=司机接单/拒绝时间-订单下发时间（分钟））",required=false)
+    private BigDecimal orderCommunicationDuration;
+
+    /**
+     * 作业路径ID(LINE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="作业路径ID",required=false)
+    private BigDecimal lineId;
+
+    /**
+     * 当前作业路段顺序号(CURRENT_LINE_SEQ,DECIMAL,38)
+     */
+    @ApiModelProperty(value="当前作业路段顺序号",required=true)
+    private BigDecimal currentLineSeq;
+
+    /**
+     * 预约作业时间（预约进厂时间）(APPOINT_OPERATION_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="预约作业时间（预约进厂时间）",required=false)
+    private Date appointOperationTime;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（1删除，2，已完成，4，未确认，5,已确认，6，拒绝，7已关闭，9一车多趟临时禁用）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（1删除，2，已完成，4，未确认，5,已确认，6，拒绝，7已关闭，9一车多趟临时禁用）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 删除理由(DELETE_REASON,VARCHAR,255)
+     */
+    @ApiModelProperty(value="删除理由",required=false)
+    private String deleteReason;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 备用字段1（生产物流出勤类型，正常作业及加班作业）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（生产物流出勤类型，正常作业及加班作业）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2 （所属组织：安泰或新泰）(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2 （所属组织：安泰或新泰）",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3（是否一车多趟：是/否）(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3（是否一车多趟：是/否）",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4（生产实绩报文1）(ALTERNATE_FIELDS4,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="备用字段4（生产实绩报文1）",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5（生产实绩报文2）(ALTERNATE_FIELDS5,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="备用字段5（生产实绩报文2）",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6（补单单号）(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6（补单单号）",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7（磅单单号-生产单据编号）(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7（磅单单号-生产单据编号）",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8 （一车多趟类型）(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8 （一车多趟类型）",required=false)
+    private String alternateFields8;
+
+    /**
+     * 司机ID2(DRIVER_ID2,DECIMAL,38)
+     */
+    @ApiModelProperty(value="司机ID2",required=false)
+    private BigDecimal driverId2;
+
+    /**
+     * 运单执行状态(ORDER_STATUS,VARCHAR,255)
+     */
+    @ApiModelProperty(value="运单执行状态",required=false)
+    private String orderStatus;
+
+    /**
+     * 承运商(CARRIER_ID,DECIMAL,8)
+     */
+    @ApiModelProperty(value="承运商",required=false)
+    private Integer carrierId;
+
+    /**
+     * 备用字段9 （调拨车号）(ALTERNATE_FIELDS9,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段9 （调拨车号）",required=false)
+    private String alternateFields9;
+
+    /**
+     * 备用字段10（调拨司机）(ALTERNATE_FIELDS10,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段10（调拨司机）",required=false)
+    private String alternateFields10;
+
+    /**
+     * 备用字段11（其他操作工）(ALTERNATE_FIELDS11,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段11（其他操作工）",required=false)
+    private String alternateFields11;
+
+    /**
+     * 备用字段12（其他操作工）(ALTERNATE_FIELDS12,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段12（其他操作工）",required=false)
+    private String alternateFields12;
+
+    /**
+     * 备用字段13（其他操作工）(ALTERNATE_FIELDS13,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段13（其他操作工）",required=false)
+    private String alternateFields13;
+
+    /**
+     * 备用字段14（其他操作工）(ALTERNATE_FIELDS14,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段14（其他操作工）",required=false)
+    private String alternateFields14;
+
+    /**
+     * 备用字段15（其他操作工）(ALTERNATE_FIELDS15,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段15（其他操作工）",required=false)
+    private String alternateFields15;
+
+    /**
+     * 备用字段16 (线路名称)(ALTERNATE_FIELDS16,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段16 (线路名称)",required=false)
+    private String alternateFields16;
+
+    /**
+     * 备用字段17（线路详情）(ALTERNATE_FIELDS17,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段17（线路详情）",required=false)
+    private String alternateFields17;
+
+    /**
+     * 备用字段18（火车发站）(ALTERNATE_FIELDS18,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段18（火车发站）",required=false)
+    private String alternateFields18;
+
+    /**
+     * 备用字段19（火车到站）(ALTERNATE_FIELDS19,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段19（火车到站）",required=false)
+    private String alternateFields19;
+
+    /**
+     * 备用字段20（火车列序号：港口-月列序号）(ALTERNATE_FIELDS20,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段20（火车列序号：港口-月列序号）",required=false)
+    private String alternateFields20;
+
+    /**
+     * 备用字段21（计次作业次数）(ALTERNATE_FIELDS21,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段21（计次作业次数）",required=false)
+    private String alternateFields21;
+
+    /**
+     * 备用字段22（计次作业时间）(ALTERNATE_FIELDS22,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段22（计次作业时间）",required=false)
+    private String alternateFields22;
+
+    /**
+     * 备用字段23（计次作业操作人）(ALTERNATE_FIELDS23,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段23（计次作业操作人）",required=false)
+    private String alternateFields23;
+
+    /**
+     * 备用字段24（是否禁用0：未禁用，1：已禁用）(ALTERNATE_FIELDS24,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段24（是否禁用0：未禁用，1：已禁用）",required=false)
+    private String alternateFields24;
+
+    /**
+     * 备用字段25（匹配到的运单ID-生产）(ALTERNATE_FIELDS25,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段25（匹配到的运单ID-生产）",required=false)
+    private String alternateFields25;
+
+    /**
+     * 备用字段26（匹配到的实绩ID-生产计重）(ALTERNATE_FIELDS26,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段26（匹配到的实绩ID-生产计重）",required=false)
+    private String alternateFields26;
+
+    /**
+     * 运力编号(CAPACITY_NUMBER,VARCHAR,255)
+     */
+    @ApiModelProperty(value="运力编号",required=false)
+    private String capacityNumber;
+
+    /**
+     * 司机姓名(DRIVER_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="司机姓名",required=false)
+    private String driverName;
+
+    /**
+     * 身份证号(IDENTITY_CARD,VARCHAR,60)
+     */
+    @ApiModelProperty(value="身份证号",required=false)
+    private String identityCard;
+
+    /**
+     * 内码(INNER_CODE,VARCHAR,60)
+     */
+    @ApiModelProperty(value="内码",required=false)
+    private String innerCode;
+
+    /**
+     * 环保标准(EMISSION_STANDARD_NAME,VARCHAR,40)
+     */
+    @ApiModelProperty(value="环保标准",required=false)
+    private String emissionStandardName;
+
+    /**
+     * 业务类型名称(BUSINESS_TYPE_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="业务类型名称",required=false)
+    private String businessTypeName;
+
+    /**
+     * 业务场景(BUSINESS_SCENE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="业务场景",required=false)
+    private String businessScene;
+
+    /**
+     * 承运商名称(CARRIER_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="承运商名称",required=false)
+    private String carrierName;
+
+    /**
+     * 备用字段27（同步失败）(ALTERNATE_FIELDS27,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段27（同步失败）",required=false)
+    private String alternateFields27;
+
+    /**
+     * 备用字段28（一车多趟次数）(ALTERNATE_FIELDS28,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段28（一车多趟次数）",required=false)
+    private String alternateFields28;
+
+    /**
+     * 备用字段29（是否允许异常操作）(ALTERNATE_FIELDS29,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段29（是否允许异常操作）",required=false)
+    private String alternateFields29;
+
+    /**
+     * 备用字段30（修改后的生产实绩报文1)(ALTERNATE_FIELDS30,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="备用字段30（修改后的生产实绩报文1)",required=false)
+    private String alternateFields30;
+
+    /**
+     * 备用字段31（修改后的生产实绩报文2)(ALTERNATE_FIELDS31,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="备用字段31（修改后的生产实绩报文2)",required=false)
+    private String alternateFields31;
+
+    /**
+     * 备用字段32(ALTERNATE_FIELDS32,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段32",required=false)
+    private String alternateFields32;
+
+    /**
+     * 备用字段33(ALTERNATE_FIELDS33,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段33",required=false)
+    private String alternateFields33;
+
+    /**
+     * 备用字段34(ALTERNATE_FIELDS34,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段34",required=false)
+    private String alternateFields34;
+
+    /**
+     * 备用字段35(逃逸自动判断过期运单选项 1：逃逸)(ALTERNATE_FIELDS35,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段35(逃逸自动判断过期运单选项 1：逃逸)",required=false)
+    private String alternateFields35;
+
+    /**
+     * 备用字段36(ALTERNATE_FIELDS36,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段36",required=false)
+    private String alternateFields36;
+
+    /**
+     * 备用字段37(ALTERNATE_FIELDS37,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段37",required=false)
+    private String alternateFields37;
+
+    /**
+     * 备用字段38(ALTERNATE_FIELDS38,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段38",required=false)
+    private String alternateFields38;
+
+    /**
+     * 备用字段39(ALTERNATE_FIELDS39,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段39",required=false)
+    private String alternateFields39;
+
+    /**
+     * 备用字段40(ALTERNATE_FIELDS40,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段40",required=false)
+    private String alternateFields40;
+
+    /**
+     * 备用字段41(ALTERNATE_FIELDS41,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段41",required=false)
+    private String alternateFields41;
+
+    /**
+     * 备用字段42(ALTERNATE_FIELDS42,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段42",required=false)
+    private String alternateFields42;
+
+    /**
+     * 备用字段43(ALTERNATE_FIELDS43,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段43",required=false)
+    private String alternateFields43;
+
+    /**
+     * 备用字段44(ALTERNATE_FIELDS44,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段44",required=false)
+    private String alternateFields44;
+
+    /**
+     * 备用字段35(ALTERNATE_FIELDS45,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段35",required=false)
+    private String alternateFields45;
+
+    /**
+     * 备用字段46(ALTERNATE_FIELDS46,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段46",required=false)
+    private String alternateFields46;
+
+    /**
+     * 备用字段47(ALTERNATE_FIELDS47,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段47",required=false)
+    private String alternateFields47;
+
+    /**
+     * 备用字段48(ALTERNATE_FIELDS48,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段48",required=false)
+    private String alternateFields48;
+
+    /**
+     * 备用字段49(ALTERNATE_FIELDS49,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段49",required=false)
+    private String alternateFields49;
+
+    /**
+     * 备用字段50(ALTERNATE_FIELDS50,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段50",required=false)
+    private String alternateFields50;
+
+    /**
+     * 小号(CAPACITY_INNER_NUMBER,VARCHAR,50)
+     */
+    @ApiModelProperty(value="小号",required=false)
+    private String capacityInnerNumber;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.transOrderId;
+    }
+
+    @Override
+    public void setId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public String getSerialNumber() {
+        return serialNumber;
+    }
+
+    public void setSerialNumber(String serialNumber) {
+        this.serialNumber = serialNumber == null ? null : serialNumber.trim();
+    }
+
+    public BigDecimal getCapacityId() {
+        return capacityId;
+    }
+
+    public void setCapacityId(BigDecimal capacityId) {
+        this.capacityId = capacityId;
+    }
+
+    public BigDecimal getDriverId() {
+        return driverId;
+    }
+
+    public void setDriverId(BigDecimal driverId) {
+        this.driverId = driverId;
+    }
+
+    public String getDriverPhone() {
+        return driverPhone;
+    }
+
+    public void setDriverPhone(String driverPhone) {
+        this.driverPhone = driverPhone == null ? null : driverPhone.trim();
+    }
+
+    public BigDecimal getOrderType() {
+        return orderType;
+    }
+
+    public void setOrderType(BigDecimal orderType) {
+        this.orderType = orderType;
+    }
+
+    public Date getIssueTime() {
+        return issueTime;
+    }
+
+    public void setIssueTime(Date issueTime) {
+        this.issueTime = issueTime;
+    }
+
+    public String getConfirmReason() {
+        return confirmReason;
+    }
+
+    public void setConfirmReason(String confirmReason) {
+        this.confirmReason = confirmReason == null ? null : confirmReason.trim();
+    }
+
+    public Date getDriverConfirmTime() {
+        return driverConfirmTime;
+    }
+
+    public void setDriverConfirmTime(Date driverConfirmTime) {
+        this.driverConfirmTime = driverConfirmTime;
+    }
+
+    public BigDecimal getOrderCommunicationDuration() {
+        return orderCommunicationDuration;
+    }
+
+    public void setOrderCommunicationDuration(BigDecimal orderCommunicationDuration) {
+        this.orderCommunicationDuration = orderCommunicationDuration;
+    }
+
+    public BigDecimal getLineId() {
+        return lineId;
+    }
+
+    public void setLineId(BigDecimal lineId) {
+        this.lineId = lineId;
+    }
+
+    public BigDecimal getCurrentLineSeq() {
+        return currentLineSeq;
+    }
+
+    public void setCurrentLineSeq(BigDecimal currentLineSeq) {
+        this.currentLineSeq = currentLineSeq;
+    }
+
+    public Date getAppointOperationTime() {
+        return appointOperationTime;
+    }
+
+    public void setAppointOperationTime(Date appointOperationTime) {
+        this.appointOperationTime = appointOperationTime;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    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 String getDeleteReason() {
+        return deleteReason;
+    }
+
+    public void setDeleteReason(String deleteReason) {
+        this.deleteReason = deleteReason == null ? null : deleteReason.trim();
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public BigDecimal getDriverId2() {
+        return driverId2;
+    }
+
+    public void setDriverId2(BigDecimal driverId2) {
+        this.driverId2 = driverId2;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus == null ? null : orderStatus.trim();
+    }
+
+    public Integer getCarrierId() {
+        return carrierId;
+    }
+
+    public void setCarrierId(Integer carrierId) {
+        this.carrierId = carrierId;
+    }
+
+    public String getAlternateFields9() {
+        return alternateFields9;
+    }
+
+    public void setAlternateFields9(String alternateFields9) {
+        this.alternateFields9 = alternateFields9 == null ? null : alternateFields9.trim();
+    }
+
+    public String getAlternateFields10() {
+        return alternateFields10;
+    }
+
+    public void setAlternateFields10(String alternateFields10) {
+        this.alternateFields10 = alternateFields10 == null ? null : alternateFields10.trim();
+    }
+
+    public String getAlternateFields11() {
+        return alternateFields11;
+    }
+
+    public void setAlternateFields11(String alternateFields11) {
+        this.alternateFields11 = alternateFields11 == null ? null : alternateFields11.trim();
+    }
+
+    public String getAlternateFields12() {
+        return alternateFields12;
+    }
+
+    public void setAlternateFields12(String alternateFields12) {
+        this.alternateFields12 = alternateFields12 == null ? null : alternateFields12.trim();
+    }
+
+    public String getAlternateFields13() {
+        return alternateFields13;
+    }
+
+    public void setAlternateFields13(String alternateFields13) {
+        this.alternateFields13 = alternateFields13 == null ? null : alternateFields13.trim();
+    }
+
+    public String getAlternateFields14() {
+        return alternateFields14;
+    }
+
+    public void setAlternateFields14(String alternateFields14) {
+        this.alternateFields14 = alternateFields14 == null ? null : alternateFields14.trim();
+    }
+
+    public String getAlternateFields15() {
+        return alternateFields15;
+    }
+
+    public void setAlternateFields15(String alternateFields15) {
+        this.alternateFields15 = alternateFields15 == null ? null : alternateFields15.trim();
+    }
+
+    public String getAlternateFields16() {
+        return alternateFields16;
+    }
+
+    public void setAlternateFields16(String alternateFields16) {
+        this.alternateFields16 = alternateFields16 == null ? null : alternateFields16.trim();
+    }
+
+    public String getAlternateFields17() {
+        return alternateFields17;
+    }
+
+    public void setAlternateFields17(String alternateFields17) {
+        this.alternateFields17 = alternateFields17 == null ? null : alternateFields17.trim();
+    }
+
+    public String getAlternateFields18() {
+        return alternateFields18;
+    }
+
+    public void setAlternateFields18(String alternateFields18) {
+        this.alternateFields18 = alternateFields18 == null ? null : alternateFields18.trim();
+    }
+
+    public String getAlternateFields19() {
+        return alternateFields19;
+    }
+
+    public void setAlternateFields19(String alternateFields19) {
+        this.alternateFields19 = alternateFields19 == null ? null : alternateFields19.trim();
+    }
+
+    public String getAlternateFields20() {
+        return alternateFields20;
+    }
+
+    public void setAlternateFields20(String alternateFields20) {
+        this.alternateFields20 = alternateFields20 == null ? null : alternateFields20.trim();
+    }
+
+    public String getAlternateFields21() {
+        return alternateFields21;
+    }
+
+    public void setAlternateFields21(String alternateFields21) {
+        this.alternateFields21 = alternateFields21 == null ? null : alternateFields21.trim();
+    }
+
+    public String getAlternateFields22() {
+        return alternateFields22;
+    }
+
+    public void setAlternateFields22(String alternateFields22) {
+        this.alternateFields22 = alternateFields22 == null ? null : alternateFields22.trim();
+    }
+
+    public String getAlternateFields23() {
+        return alternateFields23;
+    }
+
+    public void setAlternateFields23(String alternateFields23) {
+        this.alternateFields23 = alternateFields23 == null ? null : alternateFields23.trim();
+    }
+
+    public String getAlternateFields24() {
+        return alternateFields24;
+    }
+
+    public void setAlternateFields24(String alternateFields24) {
+        this.alternateFields24 = alternateFields24 == null ? null : alternateFields24.trim();
+    }
+
+    public String getAlternateFields25() {
+        return alternateFields25;
+    }
+
+    public void setAlternateFields25(String alternateFields25) {
+        this.alternateFields25 = alternateFields25 == null ? null : alternateFields25.trim();
+    }
+
+    public String getAlternateFields26() {
+        return alternateFields26;
+    }
+
+    public void setAlternateFields26(String alternateFields26) {
+        this.alternateFields26 = alternateFields26 == null ? null : alternateFields26.trim();
+    }
+
+    public String getCapacityNumber() {
+        return capacityNumber;
+    }
+
+    public void setCapacityNumber(String capacityNumber) {
+        this.capacityNumber = capacityNumber == null ? null : capacityNumber.trim();
+    }
+
+    public String getDriverName() {
+        return driverName;
+    }
+
+    public void setDriverName(String driverName) {
+        this.driverName = driverName == null ? null : driverName.trim();
+    }
+
+    public String getIdentityCard() {
+        return identityCard;
+    }
+
+    public void setIdentityCard(String identityCard) {
+        this.identityCard = identityCard == null ? null : identityCard.trim();
+    }
+
+    public String getInnerCode() {
+        return innerCode;
+    }
+
+    public void setInnerCode(String innerCode) {
+        this.innerCode = innerCode == null ? null : innerCode.trim();
+    }
+
+    public String getEmissionStandardName() {
+        return emissionStandardName;
+    }
+
+    public void setEmissionStandardName(String emissionStandardName) {
+        this.emissionStandardName = emissionStandardName == null ? null : emissionStandardName.trim();
+    }
+
+    public String getBusinessTypeName() {
+        return businessTypeName;
+    }
+
+    public void setBusinessTypeName(String businessTypeName) {
+        this.businessTypeName = businessTypeName == null ? null : businessTypeName.trim();
+    }
+
+    public String getBusinessScene() {
+        return businessScene;
+    }
+
+    public void setBusinessScene(String businessScene) {
+        this.businessScene = businessScene == null ? null : businessScene.trim();
+    }
+
+    public String getCarrierName() {
+        return carrierName;
+    }
+
+    public void setCarrierName(String carrierName) {
+        this.carrierName = carrierName == null ? null : carrierName.trim();
+    }
+
+    public String getAlternateFields27() {
+        return alternateFields27;
+    }
+
+    public void setAlternateFields27(String alternateFields27) {
+        this.alternateFields27 = alternateFields27 == null ? null : alternateFields27.trim();
+    }
+
+    public String getAlternateFields28() {
+        return alternateFields28;
+    }
+
+    public void setAlternateFields28(String alternateFields28) {
+        this.alternateFields28 = alternateFields28 == null ? null : alternateFields28.trim();
+    }
+
+    public String getAlternateFields29() {
+        return alternateFields29;
+    }
+
+    public void setAlternateFields29(String alternateFields29) {
+        this.alternateFields29 = alternateFields29 == null ? null : alternateFields29.trim();
+    }
+
+    public String getAlternateFields30() {
+        return alternateFields30;
+    }
+
+    public void setAlternateFields30(String alternateFields30) {
+        this.alternateFields30 = alternateFields30 == null ? null : alternateFields30.trim();
+    }
+
+    public String getAlternateFields31() {
+        return alternateFields31;
+    }
+
+    public void setAlternateFields31(String alternateFields31) {
+        this.alternateFields31 = alternateFields31 == null ? null : alternateFields31.trim();
+    }
+
+    public String getAlternateFields32() {
+        return alternateFields32;
+    }
+
+    public void setAlternateFields32(String alternateFields32) {
+        this.alternateFields32 = alternateFields32 == null ? null : alternateFields32.trim();
+    }
+
+    public String getAlternateFields33() {
+        return alternateFields33;
+    }
+
+    public void setAlternateFields33(String alternateFields33) {
+        this.alternateFields33 = alternateFields33 == null ? null : alternateFields33.trim();
+    }
+
+    public String getAlternateFields34() {
+        return alternateFields34;
+    }
+
+    public void setAlternateFields34(String alternateFields34) {
+        this.alternateFields34 = alternateFields34 == null ? null : alternateFields34.trim();
+    }
+
+    public String getAlternateFields35() {
+        return alternateFields35;
+    }
+
+    public void setAlternateFields35(String alternateFields35) {
+        this.alternateFields35 = alternateFields35 == null ? null : alternateFields35.trim();
+    }
+
+    public String getAlternateFields36() {
+        return alternateFields36;
+    }
+
+    public void setAlternateFields36(String alternateFields36) {
+        this.alternateFields36 = alternateFields36 == null ? null : alternateFields36.trim();
+    }
+
+    public String getAlternateFields37() {
+        return alternateFields37;
+    }
+
+    public void setAlternateFields37(String alternateFields37) {
+        this.alternateFields37 = alternateFields37 == null ? null : alternateFields37.trim();
+    }
+
+    public String getAlternateFields38() {
+        return alternateFields38;
+    }
+
+    public void setAlternateFields38(String alternateFields38) {
+        this.alternateFields38 = alternateFields38 == null ? null : alternateFields38.trim();
+    }
+
+    public String getAlternateFields39() {
+        return alternateFields39;
+    }
+
+    public void setAlternateFields39(String alternateFields39) {
+        this.alternateFields39 = alternateFields39 == null ? null : alternateFields39.trim();
+    }
+
+    public String getAlternateFields40() {
+        return alternateFields40;
+    }
+
+    public void setAlternateFields40(String alternateFields40) {
+        this.alternateFields40 = alternateFields40 == null ? null : alternateFields40.trim();
+    }
+
+    public String getAlternateFields41() {
+        return alternateFields41;
+    }
+
+    public void setAlternateFields41(String alternateFields41) {
+        this.alternateFields41 = alternateFields41 == null ? null : alternateFields41.trim();
+    }
+
+    public String getAlternateFields42() {
+        return alternateFields42;
+    }
+
+    public void setAlternateFields42(String alternateFields42) {
+        this.alternateFields42 = alternateFields42 == null ? null : alternateFields42.trim();
+    }
+
+    public String getAlternateFields43() {
+        return alternateFields43;
+    }
+
+    public void setAlternateFields43(String alternateFields43) {
+        this.alternateFields43 = alternateFields43 == null ? null : alternateFields43.trim();
+    }
+
+    public String getAlternateFields44() {
+        return alternateFields44;
+    }
+
+    public void setAlternateFields44(String alternateFields44) {
+        this.alternateFields44 = alternateFields44 == null ? null : alternateFields44.trim();
+    }
+
+    public String getAlternateFields45() {
+        return alternateFields45;
+    }
+
+    public void setAlternateFields45(String alternateFields45) {
+        this.alternateFields45 = alternateFields45 == null ? null : alternateFields45.trim();
+    }
+
+    public String getAlternateFields46() {
+        return alternateFields46;
+    }
+
+    public void setAlternateFields46(String alternateFields46) {
+        this.alternateFields46 = alternateFields46 == null ? null : alternateFields46.trim();
+    }
+
+    public String getAlternateFields47() {
+        return alternateFields47;
+    }
+
+    public void setAlternateFields47(String alternateFields47) {
+        this.alternateFields47 = alternateFields47 == null ? null : alternateFields47.trim();
+    }
+
+    public String getAlternateFields48() {
+        return alternateFields48;
+    }
+
+    public void setAlternateFields48(String alternateFields48) {
+        this.alternateFields48 = alternateFields48 == null ? null : alternateFields48.trim();
+    }
+
+    public String getAlternateFields49() {
+        return alternateFields49;
+    }
+
+    public void setAlternateFields49(String alternateFields49) {
+        this.alternateFields49 = alternateFields49 == null ? null : alternateFields49.trim();
+    }
+
+    public String getAlternateFields50() {
+        return alternateFields50;
+    }
+
+    public void setAlternateFields50(String alternateFields50) {
+        this.alternateFields50 = alternateFields50 == null ? null : alternateFields50.trim();
+    }
+
+    public String getCapacityInnerNumber() {
+        return capacityInnerNumber;
+    }
+
+    public void setCapacityInnerNumber(String capacityInnerNumber) {
+        this.capacityInnerNumber = capacityInnerNumber == null ? null : capacityInnerNumber.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", serialNumber=").append(serialNumber);
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", driverId=").append(driverId);
+        sb.append(", driverPhone=").append(driverPhone);
+        sb.append(", orderType=").append(orderType);
+        sb.append(", issueTime=").append(issueTime);
+        sb.append(", confirmReason=").append(confirmReason);
+        sb.append(", driverConfirmTime=").append(driverConfirmTime);
+        sb.append(", orderCommunicationDuration=").append(orderCommunicationDuration);
+        sb.append(", lineId=").append(lineId);
+        sb.append(", currentLineSeq=").append(currentLineSeq);
+        sb.append(", appointOperationTime=").append(appointOperationTime);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", deleteReason=").append(deleteReason);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", driverId2=").append(driverId2);
+        sb.append(", orderStatus=").append(orderStatus);
+        sb.append(", carrierId=").append(carrierId);
+        sb.append(", alternateFields9=").append(alternateFields9);
+        sb.append(", alternateFields10=").append(alternateFields10);
+        sb.append(", alternateFields11=").append(alternateFields11);
+        sb.append(", alternateFields12=").append(alternateFields12);
+        sb.append(", alternateFields13=").append(alternateFields13);
+        sb.append(", alternateFields14=").append(alternateFields14);
+        sb.append(", alternateFields15=").append(alternateFields15);
+        sb.append(", alternateFields16=").append(alternateFields16);
+        sb.append(", alternateFields17=").append(alternateFields17);
+        sb.append(", alternateFields18=").append(alternateFields18);
+        sb.append(", alternateFields19=").append(alternateFields19);
+        sb.append(", alternateFields20=").append(alternateFields20);
+        sb.append(", alternateFields21=").append(alternateFields21);
+        sb.append(", alternateFields22=").append(alternateFields22);
+        sb.append(", alternateFields23=").append(alternateFields23);
+        sb.append(", alternateFields24=").append(alternateFields24);
+        sb.append(", alternateFields25=").append(alternateFields25);
+        sb.append(", alternateFields26=").append(alternateFields26);
+        sb.append(", capacityNumber=").append(capacityNumber);
+        sb.append(", driverName=").append(driverName);
+        sb.append(", identityCard=").append(identityCard);
+        sb.append(", innerCode=").append(innerCode);
+        sb.append(", emissionStandardName=").append(emissionStandardName);
+        sb.append(", businessTypeName=").append(businessTypeName);
+        sb.append(", businessScene=").append(businessScene);
+        sb.append(", carrierName=").append(carrierName);
+        sb.append(", alternateFields27=").append(alternateFields27);
+        sb.append(", alternateFields28=").append(alternateFields28);
+        sb.append(", alternateFields29=").append(alternateFields29);
+        sb.append(", alternateFields30=").append(alternateFields30);
+        sb.append(", alternateFields31=").append(alternateFields31);
+        sb.append(", alternateFields32=").append(alternateFields32);
+        sb.append(", alternateFields33=").append(alternateFields33);
+        sb.append(", alternateFields34=").append(alternateFields34);
+        sb.append(", alternateFields35=").append(alternateFields35);
+        sb.append(", alternateFields36=").append(alternateFields36);
+        sb.append(", alternateFields37=").append(alternateFields37);
+        sb.append(", alternateFields38=").append(alternateFields38);
+        sb.append(", alternateFields39=").append(alternateFields39);
+        sb.append(", alternateFields40=").append(alternateFields40);
+        sb.append(", alternateFields41=").append(alternateFields41);
+        sb.append(", alternateFields42=").append(alternateFields42);
+        sb.append(", alternateFields43=").append(alternateFields43);
+        sb.append(", alternateFields44=").append(alternateFields44);
+        sb.append(", alternateFields45=").append(alternateFields45);
+        sb.append(", alternateFields46=").append(alternateFields46);
+        sb.append(", alternateFields47=").append(alternateFields47);
+        sb.append(", alternateFields48=").append(alternateFields48);
+        sb.append(", alternateFields49=").append(alternateFields49);
+        sb.append(", alternateFields50=").append(alternateFields50);
+        sb.append(", capacityInnerNumber=").append(capacityInnerNumber);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,498 @@
+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 ReportTransMonitor implements IBasePO<BigDecimal> {
+    /**
+     * 运输订单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运输订单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 业务场景(BUSINESS_SCENE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="业务场景",required=false)
+    private String businessScene;
+
+    /**
+     * 车辆ID(CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="车辆ID",required=true)
+    private BigDecimal capacityId;
+
+    /**
+     * 车牌号(CAPACITY_NUMBER,VARCHAR,50)
+     */
+    @ApiModelProperty(value="车牌号",required=true)
+    private String capacityNumber;
+
+    /**
+     * 换车头时间(REPLACE_FRONT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="换车头时间",required=false)
+    private Date replaceFrontTime;
+
+    /**
+     * 签到时间（接单时间）(SIGN_IN_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="签到时间（接单时间）",required=false)
+    private Date signInTime;
+
+    /**
+     * 首次进厂时间(FIRST_ENFACTORY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="首次进厂时间",required=false)
+    private Date firstEnfactoryTime;
+
+    /**
+     * 一次计量时间(FIRST_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="一次计量时间",required=false)
+    private Date firstWeightTime;
+
+    /**
+     * 采样时间(SAMPLING_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="采样时间",required=false)
+    private Date samplingTime;
+
+    /**
+     * 卸货时间(UNLOAD_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="卸货时间",required=false)
+    private Date unloadTime;
+
+    /**
+     * 装货时间(LOAD_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="装货时间",required=false)
+    private Date loadTime;
+
+    /**
+     * 二次计量时间(SECOND_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="二次计量时间",required=false)
+    private Date secondWeightTime;
+
+    /**
+     * 首次出厂时间(FIRST_OUTFACTORY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="首次出厂时间",required=false)
+    private Date firstOutfactoryTime;
+
+    /**
+     * 二次进厂时间(SECOND_ENFACTORY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="二次进厂时间",required=false)
+    private Date secondEnfactoryTime;
+
+    /**
+     * 三次计量时间(THIRD_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="三次计量时间",required=false)
+    private Date thirdWeightTime;
+
+    /**
+     * 四次计量时间(FOURTH_WEIGHT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="四次计量时间",required=false)
+    private Date fourthWeightTime;
+
+    /**
+     * 二次出厂时间(SECOND_OUTFACTORY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="二次出厂时间",required=false)
+    private Date secondOutfactoryTime;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.transOrderId;
+    }
+
+    @Override
+    public void setId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public String getBusinessScene() {
+        return businessScene;
+    }
+
+    public void setBusinessScene(String businessScene) {
+        this.businessScene = businessScene == null ? null : businessScene.trim();
+    }
+
+    public BigDecimal getCapacityId() {
+        return capacityId;
+    }
+
+    public void setCapacityId(BigDecimal capacityId) {
+        this.capacityId = capacityId;
+    }
+
+    public String getCapacityNumber() {
+        return capacityNumber;
+    }
+
+    public void setCapacityNumber(String capacityNumber) {
+        this.capacityNumber = capacityNumber == null ? null : capacityNumber.trim();
+    }
+
+    public Date getReplaceFrontTime() {
+        return replaceFrontTime;
+    }
+
+    public void setReplaceFrontTime(Date replaceFrontTime) {
+        this.replaceFrontTime = replaceFrontTime;
+    }
+
+    public Date getSignInTime() {
+        return signInTime;
+    }
+
+    public void setSignInTime(Date signInTime) {
+        this.signInTime = signInTime;
+    }
+
+    public Date getFirstEnfactoryTime() {
+        return firstEnfactoryTime;
+    }
+
+    public void setFirstEnfactoryTime(Date firstEnfactoryTime) {
+        this.firstEnfactoryTime = firstEnfactoryTime;
+    }
+
+    public Date getFirstWeightTime() {
+        return firstWeightTime;
+    }
+
+    public void setFirstWeightTime(Date firstWeightTime) {
+        this.firstWeightTime = firstWeightTime;
+    }
+
+    public Date getSamplingTime() {
+        return samplingTime;
+    }
+
+    public void setSamplingTime(Date samplingTime) {
+        this.samplingTime = samplingTime;
+    }
+
+    public Date getUnloadTime() {
+        return unloadTime;
+    }
+
+    public void setUnloadTime(Date unloadTime) {
+        this.unloadTime = unloadTime;
+    }
+
+    public Date getLoadTime() {
+        return loadTime;
+    }
+
+    public void setLoadTime(Date loadTime) {
+        this.loadTime = loadTime;
+    }
+
+    public Date getSecondWeightTime() {
+        return secondWeightTime;
+    }
+
+    public void setSecondWeightTime(Date secondWeightTime) {
+        this.secondWeightTime = secondWeightTime;
+    }
+
+    public Date getFirstOutfactoryTime() {
+        return firstOutfactoryTime;
+    }
+
+    public void setFirstOutfactoryTime(Date firstOutfactoryTime) {
+        this.firstOutfactoryTime = firstOutfactoryTime;
+    }
+
+    public Date getSecondEnfactoryTime() {
+        return secondEnfactoryTime;
+    }
+
+    public void setSecondEnfactoryTime(Date secondEnfactoryTime) {
+        this.secondEnfactoryTime = secondEnfactoryTime;
+    }
+
+    public Date getThirdWeightTime() {
+        return thirdWeightTime;
+    }
+
+    public void setThirdWeightTime(Date thirdWeightTime) {
+        this.thirdWeightTime = thirdWeightTime;
+    }
+
+    public Date getFourthWeightTime() {
+        return fourthWeightTime;
+    }
+
+    public void setFourthWeightTime(Date fourthWeightTime) {
+        this.fourthWeightTime = fourthWeightTime;
+    }
+
+    public Date getSecondOutfactoryTime() {
+        return secondOutfactoryTime;
+    }
+
+    public void setSecondOutfactoryTime(Date secondOutfactoryTime) {
+        this.secondOutfactoryTime = secondOutfactoryTime;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", businessScene=").append(businessScene);
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", capacityNumber=").append(capacityNumber);
+        sb.append(", replaceFrontTime=").append(replaceFrontTime);
+        sb.append(", signInTime=").append(signInTime);
+        sb.append(", firstEnfactoryTime=").append(firstEnfactoryTime);
+        sb.append(", firstWeightTime=").append(firstWeightTime);
+        sb.append(", samplingTime=").append(samplingTime);
+        sb.append(", unloadTime=").append(unloadTime);
+        sb.append(", loadTime=").append(loadTime);
+        sb.append(", secondWeightTime=").append(secondWeightTime);
+        sb.append(", firstOutfactoryTime=").append(firstOutfactoryTime);
+        sb.append(", secondEnfactoryTime=").append(secondEnfactoryTime);
+        sb.append(", thirdWeightTime=").append(thirdWeightTime);
+        sb.append(", fourthWeightTime=").append(fourthWeightTime);
+        sb.append(", secondOutfactoryTime=").append(secondOutfactoryTime);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,307 @@
+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 RmsOperationPoint implements IBasePO<BigDecimal> {
+    //临时字段
+    public  String  userId;
+    public  String  userName;
+    /**
+     * 主键(OPERATION_POINT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private BigDecimal operationPointId;
+
+    /**
+     * 作业点名字(OPERATION_POINT_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="作业点名字",required=true)
+    private String operationPointName;
+
+    /**
+     * 作业点类型(OPERATION_POINT_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="作业点类型",required=false)
+    private String operationPointType;
+
+    /**
+     * 作业点状态(OPERATION_POINT_STATUS,VARCHAR,255)
+     */
+    @ApiModelProperty(value="作业点状态",required=false)
+    private String operationPointStatus;
+
+    /**
+     * 经度(LONGITUDE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="经度",required=false)
+    private String longitude;
+
+    /**
+     * 纬度(LATITUDE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="纬度",required=false)
+    private String latitude;
+
+    /**
+     * 地址ID(PLACE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="地址ID",required=false)
+    private BigDecimal placeId;
+
+    /**
+     * 所属公司ID(COMPANY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="所属公司ID",required=false)
+    private BigDecimal companyId;
+
+    /**
+     * 环保标准ID(EMISSION_STANDARD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="环保标准ID",required=false)
+    private BigDecimal emissionStandardId;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String remark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 作业点编码(OPERATION_POINT_CODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="作业点编码",required=false)
+    private String operationPointCode;
+
+    /**
+     * 父级作业点ID(PARENT_POINT_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="父级作业点ID",required=false)
+    private BigDecimal parentPointId;
+
+    /**
+     * NC主键(SOURCE_ID,VARCHAR,255)
+     */
+    @ApiModelProperty(value="NC主键",required=false)
+    private String sourceId;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.operationPointId;
+    }
+
+    @Override
+    public void setId(BigDecimal operationPointId) {
+        this.operationPointId = operationPointId;
+    }
+
+    public BigDecimal getOperationPointId() {
+        return operationPointId;
+    }
+
+    public void setOperationPointId(BigDecimal operationPointId) {
+        this.operationPointId = operationPointId;
+    }
+
+    public String getOperationPointName() {
+        return operationPointName;
+    }
+
+    public void setOperationPointName(String operationPointName) {
+        this.operationPointName = operationPointName == null ? null : operationPointName.trim();
+    }
+
+    public String getOperationPointType() {
+        return operationPointType;
+    }
+
+    public void setOperationPointType(String operationPointType) {
+        this.operationPointType = operationPointType == null ? null : operationPointType.trim();
+    }
+
+    public String getOperationPointStatus() {
+        return operationPointStatus;
+    }
+
+    public void setOperationPointStatus(String operationPointStatus) {
+        this.operationPointStatus = operationPointStatus == null ? null : operationPointStatus.trim();
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude == null ? null : longitude.trim();
+    }
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude == null ? null : latitude.trim();
+    }
+
+    public BigDecimal getPlaceId() {
+        return placeId;
+    }
+
+    public void setPlaceId(BigDecimal placeId) {
+        this.placeId = placeId;
+    }
+
+    public BigDecimal getCompanyId() {
+        return companyId;
+    }
+
+    public void setCompanyId(BigDecimal companyId) {
+        this.companyId = companyId;
+    }
+
+    public BigDecimal getEmissionStandardId() {
+        return emissionStandardId;
+    }
+
+    public void setEmissionStandardId(BigDecimal emissionStandardId) {
+        this.emissionStandardId = emissionStandardId;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getOperationPointCode() {
+        return operationPointCode;
+    }
+
+    public void setOperationPointCode(String operationPointCode) {
+        this.operationPointCode = operationPointCode == null ? null : operationPointCode.trim();
+    }
+
+    public BigDecimal getParentPointId() {
+        return parentPointId;
+    }
+
+    public void setParentPointId(BigDecimal parentPointId) {
+        this.parentPointId = parentPointId;
+    }
+
+    public String getSourceId() {
+        return sourceId;
+    }
+
+    public void setSourceId(String sourceId) {
+        this.sourceId = sourceId == null ? null : sourceId.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", operationPointId=").append(operationPointId);
+        sb.append(", operationPointName=").append(operationPointName);
+        sb.append(", operationPointType=").append(operationPointType);
+        sb.append(", operationPointStatus=").append(operationPointStatus);
+        sb.append(", longitude=").append(longitude);
+        sb.append(", latitude=").append(latitude);
+        sb.append(", placeId=").append(placeId);
+        sb.append(", companyId=").append(companyId);
+        sb.append(", emissionStandardId=").append(emissionStandardId);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", remark=").append(remark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", operationPointCode=").append(operationPointCode);
+        sb.append(", parentPointId=").append(parentPointId);
+        sb.append(", sourceId=").append(sourceId);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,319 @@
+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 SyncProductList implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(PRIMARY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal primaryId;
+
+    /**
+     * 单据类型（内部收货、调拨）(DJLX,VARCHAR,100)
+     */
+    @ApiModelProperty(value="单据类型（内部收货、调拨）",required=true)
+    private String djlx;
+
+    /**
+     * 单据编号(DJBH,VARCHAR,255)
+     */
+    @ApiModelProperty(value="单据编号",required=true)
+    private String djbh;
+
+    /**
+     * 物资名称(MATERIAL_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="物资名称",required=true)
+    private String materialName;
+
+    /**
+     * 报文(PRODUCT_LIST,VARCHAR,4000)
+     */
+    @ApiModelProperty(value="报文",required=false)
+    private String productList;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.primaryId;
+    }
+
+    @Override
+    public void setId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public BigDecimal getPrimaryId() {
+        return primaryId;
+    }
+
+    public void setPrimaryId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public String getDjlx() {
+        return djlx;
+    }
+
+    public void setDjlx(String djlx) {
+        this.djlx = djlx == null ? null : djlx.trim();
+    }
+
+    public String getDjbh() {
+        return djbh;
+    }
+
+    public void setDjbh(String djbh) {
+        this.djbh = djbh == null ? null : djbh.trim();
+    }
+
+    public String getMaterialName() {
+        return materialName;
+    }
+
+    public void setMaterialName(String materialName) {
+        this.materialName = materialName == null ? null : materialName.trim();
+    }
+
+    public String getProductList() {
+        return productList;
+    }
+
+    public void setProductList(String productList) {
+        this.productList = productList == null ? null : productList.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", primaryId=").append(primaryId);
+        sb.append(", djlx=").append(djlx);
+        sb.append(", djbh=").append(djbh);
+        sb.append(", materialName=").append(materialName);
+        sb.append(", productList=").append(productList);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,469 @@
+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 TmsAddenergyResult implements IBasePO<BigDecimal> {
+    /**
+     * 实绩ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实绩ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 卡号(CARD_NO,VARCHAR,100)
+     */
+    @ApiModelProperty(value="卡号",required=false)
+    private String cardNo;
+
+    /**
+     * 能源名称(ENERGY_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="能源名称",required=false)
+    private String energyName;
+
+    /**
+     * 能源数量(ENERGY_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="能源数量",required=false)
+    private BigDecimal energyNumber;
+
+    /**
+     * 加油站价格(ENERGY_JY_PRICE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="加油站价格",required=false)
+    private BigDecimal energyJyPrice;
+
+    /**
+     * 宏瑞价格(ENERGY_HR_PRICE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="宏瑞价格",required=false)
+    private BigDecimal energyHrPrice;
+
+    /**
+     * 加油站金额(ENERGY_JY_AMOUNT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="加油站金额",required=false)
+    private BigDecimal energyJyAmount;
+
+    /**
+     * 加油站金额(ENERGY_HR_AMOUNT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="加油站金额",required=false)
+    private BigDecimal energyHrAmount;
+
+    /**
+     * 能源添加时间(ENERGY_ADD_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="能源添加时间",required=false)
+    private Date energyAddTime;
+
+    /**
+     * 车号(CAPACITY_NUMBER,VARCHAR,100)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String capacityNumber;
+
+    /**
+     * 车辆小号(CAPACITY_INNER_NUMBER,VARCHAR,100)
+     */
+    @ApiModelProperty(value="车辆小号",required=false)
+    private String capacityInnerNumber;
+
+    /**
+     * 运力ID(CAPACITY_ID,VARCHAR,100)
+     */
+    @ApiModelProperty(value="运力ID",required=false)
+    private String capacityId;
+
+    /**
+     * 持卡人(CARDHOLDER,VARCHAR,100)
+     */
+    @ApiModelProperty(value="持卡人",required=false)
+    private String cardholder;
+
+    /**
+     * 所属单位(COMPANY_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="所属单位",required=false)
+    private String companyName;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 车型(CAPACITY_TYPE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="车型",required=false)
+    private String capacityType;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo == null ? null : cardNo.trim();
+    }
+
+    public String getEnergyName() {
+        return energyName;
+    }
+
+    public void setEnergyName(String energyName) {
+        this.energyName = energyName == null ? null : energyName.trim();
+    }
+
+    public BigDecimal getEnergyNumber() {
+        return energyNumber;
+    }
+
+    public void setEnergyNumber(BigDecimal energyNumber) {
+        this.energyNumber = energyNumber;
+    }
+
+    public BigDecimal getEnergyJyPrice() {
+        return energyJyPrice;
+    }
+
+    public void setEnergyJyPrice(BigDecimal energyJyPrice) {
+        this.energyJyPrice = energyJyPrice;
+    }
+
+    public BigDecimal getEnergyHrPrice() {
+        return energyHrPrice;
+    }
+
+    public void setEnergyHrPrice(BigDecimal energyHrPrice) {
+        this.energyHrPrice = energyHrPrice;
+    }
+
+    public BigDecimal getEnergyJyAmount() {
+        return energyJyAmount;
+    }
+
+    public void setEnergyJyAmount(BigDecimal energyJyAmount) {
+        this.energyJyAmount = energyJyAmount;
+    }
+
+    public BigDecimal getEnergyHrAmount() {
+        return energyHrAmount;
+    }
+
+    public void setEnergyHrAmount(BigDecimal energyHrAmount) {
+        this.energyHrAmount = energyHrAmount;
+    }
+
+    public Date getEnergyAddTime() {
+        return energyAddTime;
+    }
+
+    public void setEnergyAddTime(Date energyAddTime) {
+        this.energyAddTime = energyAddTime;
+    }
+
+    public String getCapacityNumber() {
+        return capacityNumber;
+    }
+
+    public void setCapacityNumber(String capacityNumber) {
+        this.capacityNumber = capacityNumber == null ? null : capacityNumber.trim();
+    }
+
+    public String getCapacityInnerNumber() {
+        return capacityInnerNumber;
+    }
+
+    public void setCapacityInnerNumber(String capacityInnerNumber) {
+        this.capacityInnerNumber = capacityInnerNumber == null ? null : capacityInnerNumber.trim();
+    }
+
+    public String getCapacityId() {
+        return capacityId;
+    }
+
+    public void setCapacityId(String capacityId) {
+        this.capacityId = capacityId == null ? null : capacityId.trim();
+    }
+
+    public String getCardholder() {
+        return cardholder;
+    }
+
+    public void setCardholder(String cardholder) {
+        this.cardholder = cardholder == null ? null : cardholder.trim();
+    }
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName == null ? null : companyName.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public String getCapacityType() {
+        return capacityType;
+    }
+
+    public void setCapacityType(String capacityType) {
+        this.capacityType = capacityType == null ? null : capacityType.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", cardNo=").append(cardNo);
+        sb.append(", energyName=").append(energyName);
+        sb.append(", energyNumber=").append(energyNumber);
+        sb.append(", energyJyPrice=").append(energyJyPrice);
+        sb.append(", energyHrPrice=").append(energyHrPrice);
+        sb.append(", energyJyAmount=").append(energyJyAmount);
+        sb.append(", energyHrAmount=").append(energyHrAmount);
+        sb.append(", energyAddTime=").append(energyAddTime);
+        sb.append(", capacityNumber=").append(capacityNumber);
+        sb.append(", capacityInnerNumber=").append(capacityInnerNumber);
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", cardholder=").append(cardholder);
+        sb.append(", companyName=").append(companyName);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", capacityType=").append(capacityType);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,394 @@
+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 TmsArrivalResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 抵达时间(ARRIVAL_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="抵达时间",required=false)
+    private Date arrivalTime;
+
+    /**
+     * 抵达地址(ARRIVAL_ADDRESS,VARCHAR,400)
+     */
+    @ApiModelProperty(value="抵达地址",required=false)
+    private String arrivalAddress;
+
+    /**
+     * 定位获取方式（手机定位，车辆定位，PC端手动输入签收）(LOCATION_MODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="定位获取方式（手机定位，车辆定位，PC端手动输入签收）",required=false)
+    private String locationMode;
+
+    /**
+     * 抵达方式（客户确认抵达、司机确认抵达）(ARRIVAL_MODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="抵达方式（客户确认抵达、司机确认抵达）",required=false)
+    private String arrivalMode;
+
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 备用字段1（线路步骤子表ID）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（线路步骤子表ID）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public Date getArrivalTime() {
+        return arrivalTime;
+    }
+
+    public void setArrivalTime(Date arrivalTime) {
+        this.arrivalTime = arrivalTime;
+    }
+
+    public String getArrivalAddress() {
+        return arrivalAddress;
+    }
+
+    public void setArrivalAddress(String arrivalAddress) {
+        this.arrivalAddress = arrivalAddress == null ? null : arrivalAddress.trim();
+    }
+
+    public String getLocationMode() {
+        return locationMode;
+    }
+
+    public void setLocationMode(String locationMode) {
+        this.locationMode = locationMode == null ? null : locationMode.trim();
+    }
+
+    public String getArrivalMode() {
+        return arrivalMode;
+    }
+
+    public void setArrivalMode(String arrivalMode) {
+        this.arrivalMode = arrivalMode == null ? null : arrivalMode.trim();
+    }
+
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    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(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", arrivalTime=").append(arrivalTime);
+        sb.append(", arrivalAddress=").append(arrivalAddress);
+        sb.append(", locationMode=").append(locationMode);
+        sb.append(", arrivalMode=").append(arrivalMode);
+        sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,693 @@
+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 TmsComprehensiveResult implements IBasePO<BigDecimal> {
+    /**
+     * 实绩ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实绩ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运力ID(CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运力ID",required=false)
+    private BigDecimal capacityId;
+
+    /**
+     * 实绩类型（维保、加油、异常、请假、借车）(RESULT_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩类型（维保、加油、异常、请假、借车）",required=false)
+    private String resultType;
+
+    /**
+     * 实绩时间(RESULT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="实绩时间",required=false)
+    private Date resultTime;
+
+    /**
+     * 金额(AMOUNT,VARCHAR,255)
+     */
+    @ApiModelProperty(value="金额",required=false)
+    private String amount;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 图片(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="图片",required=false)
+    private String alternateFields1;
+
+    /**
+     * 异常类型(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="异常类型",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3（请假事由、借车作业内容、维保内容）(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3（请假事由、借车作业内容、维保内容）",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4 （请假时间、借车时间、维保计划时间）(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4 （请假时间、借车时间、维保计划时间）",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5（假期联系电话）(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5（假期联系电话）",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6（班组负责人签字）(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6（班组负责人签字）",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7（主管负责人签字、维修组长）(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7（主管负责人签字、维修组长）",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8 （复岗申请）(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8 （复岗申请）",required=false)
+    private String alternateFields8;
+
+    /**
+     * 人员ID(PERSONNEL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="人员ID",required=false)
+    private BigDecimal personnelId;
+
+    /**
+     * 备用字段9 （复岗申请审批）(ALTERNATE_FIELDS9,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段9 （复岗申请审批）",required=false)
+    private String alternateFields9;
+
+    /**
+     * 备用字段10 （驳回人）(ALTERNATE_FIELDS10,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段10 （驳回人）",required=false)
+    private String alternateFields10;
+
+    /**
+     * 备用字段11 （借车人车号ID、维修车号ID）(ALTERNATE_FIELDS11,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段11 （借车人车号ID、维修车号ID）",required=false)
+    private String alternateFields11;
+
+    /**
+     * 备用字段12 （借用车号ID）(ALTERNATE_FIELDS12,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段12 （借用车号ID）",required=false)
+    private String alternateFields12;
+
+    /**
+     * 备用字段13（请假时长/工时）(ALTERNATE_FIELDS13,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段13（请假时长/工时）",required=false)
+    private String alternateFields13;
+
+    /**
+     * 备用字段14（维修人）(ALTERNATE_FIELDS14,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段14（维修人）",required=false)
+    private String alternateFields14;
+
+    /**
+     * 备用字段15（备品备件消耗）(ALTERNATE_FIELDS15,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段15（备品备件消耗）",required=false)
+    private String alternateFields15;
+
+    /**
+     * 备用字段16（紧急联系人）(ALTERNATE_FIELDS16,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段16（紧急联系人）",required=false)
+    private String alternateFields16;
+
+    /**
+     * 备用字段17（维保协调员）(ALTERNATE_FIELDS17,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段17（维保协调员）",required=false)
+    private String alternateFields17;
+
+    /**
+     * 备用字段18(ALTERNATE_FIELDS18,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段18",required=false)
+    private String alternateFields18;
+
+    /**
+     * 备用字段19(ALTERNATE_FIELDS19,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段19",required=false)
+    private String alternateFields19;
+
+    /**
+     * 备用字段20(ALTERNATE_FIELDS20,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段20",required=false)
+    private String alternateFields20;
+
+    /**
+     * 备用字段21(ALTERNATE_FIELDS21,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段21",required=false)
+    private String alternateFields21;
+
+    /**
+     * 备用字段22(ALTERNATE_FIELDS22,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段22",required=false)
+    private String alternateFields22;
+
+    /**
+     * 备用字段23(ALTERNATE_FIELDS23,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段23",required=false)
+    private String alternateFields23;
+
+    /**
+     * 备用字段24(ALTERNATE_FIELDS24,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段24",required=false)
+    private String alternateFields24;
+
+    /**
+     * 备用字段25(ALTERNATE_FIELDS25,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段25",required=false)
+    private String alternateFields25;
+
+    /**
+     * 备用字段26(ALTERNATE_FIELDS26,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段26",required=false)
+    private String alternateFields26;
+
+    /**
+     * 备用字段27(ALTERNATE_FIELDS27,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段27",required=false)
+    private String alternateFields27;
+
+    /**
+     * 单价(RESULT_PRICE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="单价",required=false)
+    private BigDecimal resultPrice;
+
+    /**
+     * 数量(RESULT_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="数量",required=false)
+    private BigDecimal resultNumber;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getCapacityId() {
+        return capacityId;
+    }
+
+    public void setCapacityId(BigDecimal capacityId) {
+        this.capacityId = capacityId;
+    }
+
+    public String getResultType() {
+        return resultType;
+    }
+
+    public void setResultType(String resultType) {
+        this.resultType = resultType == null ? null : resultType.trim();
+    }
+
+    public Date getResultTime() {
+        return resultTime;
+    }
+
+    public void setResultTime(Date resultTime) {
+        this.resultTime = resultTime;
+    }
+
+    public String getAmount() {
+        return amount;
+    }
+
+    public void setAmount(String amount) {
+        this.amount = amount == null ? null : amount.trim();
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public BigDecimal getPersonnelId() {
+        return personnelId;
+    }
+
+    public void setPersonnelId(BigDecimal personnelId) {
+        this.personnelId = personnelId;
+    }
+
+    public String getAlternateFields9() {
+        return alternateFields9;
+    }
+
+    public void setAlternateFields9(String alternateFields9) {
+        this.alternateFields9 = alternateFields9 == null ? null : alternateFields9.trim();
+    }
+
+    public String getAlternateFields10() {
+        return alternateFields10;
+    }
+
+    public void setAlternateFields10(String alternateFields10) {
+        this.alternateFields10 = alternateFields10 == null ? null : alternateFields10.trim();
+    }
+
+    public String getAlternateFields11() {
+        return alternateFields11;
+    }
+
+    public void setAlternateFields11(String alternateFields11) {
+        this.alternateFields11 = alternateFields11 == null ? null : alternateFields11.trim();
+    }
+
+    public String getAlternateFields12() {
+        return alternateFields12;
+    }
+
+    public void setAlternateFields12(String alternateFields12) {
+        this.alternateFields12 = alternateFields12 == null ? null : alternateFields12.trim();
+    }
+
+    public String getAlternateFields13() {
+        return alternateFields13;
+    }
+
+    public void setAlternateFields13(String alternateFields13) {
+        this.alternateFields13 = alternateFields13 == null ? null : alternateFields13.trim();
+    }
+
+    public String getAlternateFields14() {
+        return alternateFields14;
+    }
+
+    public void setAlternateFields14(String alternateFields14) {
+        this.alternateFields14 = alternateFields14 == null ? null : alternateFields14.trim();
+    }
+
+    public String getAlternateFields15() {
+        return alternateFields15;
+    }
+
+    public void setAlternateFields15(String alternateFields15) {
+        this.alternateFields15 = alternateFields15 == null ? null : alternateFields15.trim();
+    }
+
+    public String getAlternateFields16() {
+        return alternateFields16;
+    }
+
+    public void setAlternateFields16(String alternateFields16) {
+        this.alternateFields16 = alternateFields16 == null ? null : alternateFields16.trim();
+    }
+
+    public String getAlternateFields17() {
+        return alternateFields17;
+    }
+
+    public void setAlternateFields17(String alternateFields17) {
+        this.alternateFields17 = alternateFields17 == null ? null : alternateFields17.trim();
+    }
+
+    public String getAlternateFields18() {
+        return alternateFields18;
+    }
+
+    public void setAlternateFields18(String alternateFields18) {
+        this.alternateFields18 = alternateFields18 == null ? null : alternateFields18.trim();
+    }
+
+    public String getAlternateFields19() {
+        return alternateFields19;
+    }
+
+    public void setAlternateFields19(String alternateFields19) {
+        this.alternateFields19 = alternateFields19 == null ? null : alternateFields19.trim();
+    }
+
+    public String getAlternateFields20() {
+        return alternateFields20;
+    }
+
+    public void setAlternateFields20(String alternateFields20) {
+        this.alternateFields20 = alternateFields20 == null ? null : alternateFields20.trim();
+    }
+
+    public String getAlternateFields21() {
+        return alternateFields21;
+    }
+
+    public void setAlternateFields21(String alternateFields21) {
+        this.alternateFields21 = alternateFields21 == null ? null : alternateFields21.trim();
+    }
+
+    public String getAlternateFields22() {
+        return alternateFields22;
+    }
+
+    public void setAlternateFields22(String alternateFields22) {
+        this.alternateFields22 = alternateFields22 == null ? null : alternateFields22.trim();
+    }
+
+    public String getAlternateFields23() {
+        return alternateFields23;
+    }
+
+    public void setAlternateFields23(String alternateFields23) {
+        this.alternateFields23 = alternateFields23 == null ? null : alternateFields23.trim();
+    }
+
+    public String getAlternateFields24() {
+        return alternateFields24;
+    }
+
+    public void setAlternateFields24(String alternateFields24) {
+        this.alternateFields24 = alternateFields24 == null ? null : alternateFields24.trim();
+    }
+
+    public String getAlternateFields25() {
+        return alternateFields25;
+    }
+
+    public void setAlternateFields25(String alternateFields25) {
+        this.alternateFields25 = alternateFields25 == null ? null : alternateFields25.trim();
+    }
+
+    public String getAlternateFields26() {
+        return alternateFields26;
+    }
+
+    public void setAlternateFields26(String alternateFields26) {
+        this.alternateFields26 = alternateFields26 == null ? null : alternateFields26.trim();
+    }
+
+    public String getAlternateFields27() {
+        return alternateFields27;
+    }
+
+    public void setAlternateFields27(String alternateFields27) {
+        this.alternateFields27 = alternateFields27 == null ? null : alternateFields27.trim();
+    }
+
+    public BigDecimal getResultPrice() {
+        return resultPrice;
+    }
+
+    public void setResultPrice(BigDecimal resultPrice) {
+        this.resultPrice = resultPrice;
+    }
+
+    public BigDecimal getResultNumber() {
+        return resultNumber;
+    }
+
+    public void setResultNumber(BigDecimal resultNumber) {
+        this.resultNumber = resultNumber;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", resultType=").append(resultType);
+        sb.append(", resultTime=").append(resultTime);
+        sb.append(", amount=").append(amount);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", personnelId=").append(personnelId);
+        sb.append(", alternateFields9=").append(alternateFields9);
+        sb.append(", alternateFields10=").append(alternateFields10);
+        sb.append(", alternateFields11=").append(alternateFields11);
+        sb.append(", alternateFields12=").append(alternateFields12);
+        sb.append(", alternateFields13=").append(alternateFields13);
+        sb.append(", alternateFields14=").append(alternateFields14);
+        sb.append(", alternateFields15=").append(alternateFields15);
+        sb.append(", alternateFields16=").append(alternateFields16);
+        sb.append(", alternateFields17=").append(alternateFields17);
+        sb.append(", alternateFields18=").append(alternateFields18);
+        sb.append(", alternateFields19=").append(alternateFields19);
+        sb.append(", alternateFields20=").append(alternateFields20);
+        sb.append(", alternateFields21=").append(alternateFields21);
+        sb.append(", alternateFields22=").append(alternateFields22);
+        sb.append(", alternateFields23=").append(alternateFields23);
+        sb.append(", alternateFields24=").append(alternateFields24);
+        sb.append(", alternateFields25=").append(alternateFields25);
+        sb.append(", alternateFields26=").append(alternateFields26);
+        sb.append(", alternateFields27=").append(alternateFields27);
+        sb.append(", resultPrice=").append(resultPrice);
+        sb.append(", resultNumber=").append(resultNumber);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,379 @@
+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 TmsEnfactoryResult implements IBasePO<BigDecimal> {
+    /**
+     * 实绩ID（主键ID）(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实绩ID（主键ID）",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 进厂门岗ID(GATEPOST_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="进厂门岗ID",required=false)
+    private BigDecimal gatepostId;
+
+    /**
+     * 进厂方式（手动抬杆，自动抬杆））(ENTRY_MODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="进厂方式（手动抬杆，自动抬杆））",required=false)
+    private String entryMode;
+
+    /**
+     * 进厂时间(ENTRY_GATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="进厂时间",required=false)
+    private Date entryGateTime;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 备用字段1（线路步骤子表ID）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（线路步骤子表ID）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public BigDecimal getGatepostId() {
+        return gatepostId;
+    }
+
+    public void setGatepostId(BigDecimal gatepostId) {
+        this.gatepostId = gatepostId;
+    }
+
+    public String getEntryMode() {
+        return entryMode;
+    }
+
+    public void setEntryMode(String entryMode) {
+        this.entryMode = entryMode == null ? null : entryMode.trim();
+    }
+
+    public Date getEntryGateTime() {
+        return entryGateTime;
+    }
+
+    public void setEntryGateTime(Date entryGateTime) {
+        this.entryGateTime = entryGateTime;
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    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(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", gatepostId=").append(gatepostId);
+        sb.append(", entryMode=").append(entryMode);
+        sb.append(", entryGateTime=").append(entryGateTime);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,693 @@
+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 TmsLoadResult implements IBasePO<BigDecimal> {
+    /**
+     * 实绩ID（主键ID）(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实绩ID（主键ID）",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 装货开始时间(LOAD_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="装货开始时间",required=false)
+    private Date loadStartTime;
+
+    /**
+     * 装货结束时间(LOAD_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="装货结束时间",required=false)
+    private Date loadEndTime;
+
+    /**
+     * 装货时长（单位，分钟）(LOAD_DURATION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="装货时长（单位，分钟）",required=false)
+    private BigDecimal loadDuration;
+
+    /**
+     * 标准时长信息ID(STANDARD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="标准时长信息ID",required=false)
+    private BigDecimal standardId;
+
+    /**
+     * 装货地点ID(LOAD_POINT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="装货地点ID",required=false)
+    private BigDecimal loadPointId;
+
+    /**
+     * 装货实际地区（获取手机或车辆GPS）(LOAD_ACTUAL_ADDRESS,VARCHAR,400)
+     */
+    @ApiModelProperty(value="装货实际地区（获取手机或车辆GPS）",required=false)
+    private String loadActualAddress;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 装货人员ID(LOADER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="装货人员ID",required=false)
+    private BigDecimal loaderId;
+
+    /**
+     * 装货特种车辆ID(LOAD_CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="装货特种车辆ID",required=false)
+    private BigDecimal loadCapacityId;
+
+    /**
+     * 集装箱号(SHIPPING_CONTAINER_NO,VARCHAR,255)
+     */
+    @ApiModelProperty(value="集装箱号",required=false)
+    private String shippingContainerNo;
+
+    /**
+     * 是否清场（否：未清场；是：清场）(ISCLEAR,VARCHAR,10)
+     */
+    @ApiModelProperty(value="是否清场（否：未清场；是：清场）",required=false)
+    private String isclear;
+
+    /**
+     * 实装吨位(ACTUAL_TONNAGE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实装吨位",required=false)
+    private BigDecimal actualTonnage;
+
+    /**
+     * 路段顺序号(SEGMEN_SQE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmenSqe;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 备用字段1（线路步骤子表ID）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（线路步骤子表ID）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2（出库实绩件数）(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2（出库实绩件数）",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3（出库确认人）(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3（出库确认人）",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4（物资id）(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4（物资id）",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5（站台装卸确认人）(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5（站台装卸确认人）",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6（装卸车车号）(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6（装卸车车号）",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(大车运单id)(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7(大车运单id)",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8（大车装货实绩信息）(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8（大车装货实绩信息）",required=false)
+    private String alternateFields8;
+
+    /**
+     * 分录ID（包含物资信息）(TRANS_ORDER_CHILD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="分录ID（包含物资信息）",required=false)
+    private BigDecimal transOrderChildId;
+
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
+    /**
+     * 皮重(TARE_WEIGHT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="皮重",required=false)
+    private BigDecimal tareWeight;
+
+    /**
+     * 毛重(GROSS_WEIGHT,DECIMAL,38)
+     */
+    @ApiModelProperty(value="毛重",required=false)
+    private BigDecimal grossWeight;
+
+    /**
+     * 备用字段9(ALTERNATE_FIELDS9,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段9",required=false)
+    private String alternateFields9;
+
+    /**
+     * 备用字段10(ALTERNATE_FIELDS10,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段10",required=false)
+    private String alternateFields10;
+
+    /**
+     * 备用字段11(ALTERNATE_FIELDS11,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段11",required=false)
+    private String alternateFields11;
+
+    /**
+     * 备用字段12(ALTERNATE_FIELDS12,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段12",required=false)
+    private String alternateFields12;
+
+    /**
+     * 备用字段13(ALTERNATE_FIELDS13,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段13",required=false)
+    private String alternateFields13;
+
+    /**
+     * 备用字段14(ALTERNATE_FIELDS14,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段14",required=false)
+    private String alternateFields14;
+
+    /**
+     * 备用字段15(ALTERNATE_FIELDS15,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段15",required=false)
+    private String alternateFields15;
+
+    /**
+     * 备用字段16(ALTERNATE_FIELDS16,VARCHAR,1000)
+     */
+    @ApiModelProperty(value="备用字段16",required=false)
+    private String alternateFields16;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public Date getLoadStartTime() {
+        return loadStartTime;
+    }
+
+    public void setLoadStartTime(Date loadStartTime) {
+        this.loadStartTime = loadStartTime;
+    }
+
+    public Date getLoadEndTime() {
+        return loadEndTime;
+    }
+
+    public void setLoadEndTime(Date loadEndTime) {
+        this.loadEndTime = loadEndTime;
+    }
+
+    public BigDecimal getLoadDuration() {
+        return loadDuration;
+    }
+
+    public void setLoadDuration(BigDecimal loadDuration) {
+        this.loadDuration = loadDuration;
+    }
+
+    public BigDecimal getStandardId() {
+        return standardId;
+    }
+
+    public void setStandardId(BigDecimal standardId) {
+        this.standardId = standardId;
+    }
+
+    public BigDecimal getLoadPointId() {
+        return loadPointId;
+    }
+
+    public void setLoadPointId(BigDecimal loadPointId) {
+        this.loadPointId = loadPointId;
+    }
+
+    public String getLoadActualAddress() {
+        return loadActualAddress;
+    }
+
+    public void setLoadActualAddress(String loadActualAddress) {
+        this.loadActualAddress = loadActualAddress == null ? null : loadActualAddress.trim();
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getLoaderId() {
+        return loaderId;
+    }
+
+    public void setLoaderId(BigDecimal loaderId) {
+        this.loaderId = loaderId;
+    }
+
+    public BigDecimal getLoadCapacityId() {
+        return loadCapacityId;
+    }
+
+    public void setLoadCapacityId(BigDecimal loadCapacityId) {
+        this.loadCapacityId = loadCapacityId;
+    }
+
+    public String getShippingContainerNo() {
+        return shippingContainerNo;
+    }
+
+    public void setShippingContainerNo(String shippingContainerNo) {
+        this.shippingContainerNo = shippingContainerNo == null ? null : shippingContainerNo.trim();
+    }
+
+    public String getIsclear() {
+        return isclear;
+    }
+
+    public void setIsclear(String isclear) {
+        this.isclear = isclear == null ? null : isclear.trim();
+    }
+
+    public BigDecimal getActualTonnage() {
+        return actualTonnage;
+    }
+
+    public void setActualTonnage(BigDecimal actualTonnage) {
+        this.actualTonnage = actualTonnage;
+    }
+
+    public BigDecimal getSegmenSqe() {
+        return segmenSqe;
+    }
+
+    public void setSegmenSqe(BigDecimal segmenSqe) {
+        this.segmenSqe = segmenSqe;
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    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 String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public BigDecimal getTransOrderChildId() {
+        return transOrderChildId;
+    }
+
+    public void setTransOrderChildId(BigDecimal transOrderChildId) {
+        this.transOrderChildId = transOrderChildId;
+    }
+
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
+    public BigDecimal getTareWeight() {
+        return tareWeight;
+    }
+
+    public void setTareWeight(BigDecimal tareWeight) {
+        this.tareWeight = tareWeight;
+    }
+
+    public BigDecimal getGrossWeight() {
+        return grossWeight;
+    }
+
+    public void setGrossWeight(BigDecimal grossWeight) {
+        this.grossWeight = grossWeight;
+    }
+
+    public String getAlternateFields9() {
+        return alternateFields9;
+    }
+
+    public void setAlternateFields9(String alternateFields9) {
+        this.alternateFields9 = alternateFields9 == null ? null : alternateFields9.trim();
+    }
+
+    public String getAlternateFields10() {
+        return alternateFields10;
+    }
+
+    public void setAlternateFields10(String alternateFields10) {
+        this.alternateFields10 = alternateFields10 == null ? null : alternateFields10.trim();
+    }
+
+    public String getAlternateFields11() {
+        return alternateFields11;
+    }
+
+    public void setAlternateFields11(String alternateFields11) {
+        this.alternateFields11 = alternateFields11 == null ? null : alternateFields11.trim();
+    }
+
+    public String getAlternateFields12() {
+        return alternateFields12;
+    }
+
+    public void setAlternateFields12(String alternateFields12) {
+        this.alternateFields12 = alternateFields12 == null ? null : alternateFields12.trim();
+    }
+
+    public String getAlternateFields13() {
+        return alternateFields13;
+    }
+
+    public void setAlternateFields13(String alternateFields13) {
+        this.alternateFields13 = alternateFields13 == null ? null : alternateFields13.trim();
+    }
+
+    public String getAlternateFields14() {
+        return alternateFields14;
+    }
+
+    public void setAlternateFields14(String alternateFields14) {
+        this.alternateFields14 = alternateFields14 == null ? null : alternateFields14.trim();
+    }
+
+    public String getAlternateFields15() {
+        return alternateFields15;
+    }
+
+    public void setAlternateFields15(String alternateFields15) {
+        this.alternateFields15 = alternateFields15 == null ? null : alternateFields15.trim();
+    }
+
+    public String getAlternateFields16() {
+        return alternateFields16;
+    }
+
+    public void setAlternateFields16(String alternateFields16) {
+        this.alternateFields16 = alternateFields16 == null ? null : alternateFields16.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", loadStartTime=").append(loadStartTime);
+        sb.append(", loadEndTime=").append(loadEndTime);
+        sb.append(", loadDuration=").append(loadDuration);
+        sb.append(", standardId=").append(standardId);
+        sb.append(", loadPointId=").append(loadPointId);
+        sb.append(", loadActualAddress=").append(loadActualAddress);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", loaderId=").append(loaderId);
+        sb.append(", loadCapacityId=").append(loadCapacityId);
+        sb.append(", shippingContainerNo=").append(shippingContainerNo);
+        sb.append(", isclear=").append(isclear);
+        sb.append(", actualTonnage=").append(actualTonnage);
+        sb.append(", segmenSqe=").append(segmenSqe);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", transOrderChildId=").append(transOrderChildId);
+        sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", tareWeight=").append(tareWeight);
+        sb.append(", grossWeight=").append(grossWeight);
+        sb.append(", alternateFields9=").append(alternateFields9);
+        sb.append(", alternateFields10=").append(alternateFields10);
+        sb.append(", alternateFields11=").append(alternateFields11);
+        sb.append(", alternateFields12=").append(alternateFields12);
+        sb.append(", alternateFields13=").append(alternateFields13);
+        sb.append(", alternateFields14=").append(alternateFields14);
+        sb.append(", alternateFields15=").append(alternateFields15);
+        sb.append(", alternateFields16=").append(alternateFields16);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,535 @@
+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 TmsMaintenanceResult implements IBasePO<BigDecimal> {
+    /**
+     * 维保实绩ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="维保实绩ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 车型(CAPACITY_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="车型",required=false)
+    private String capacityType;
+
+    /**
+     * 车属单位(CAPACITY_COMPANY,VARCHAR,100)
+     */
+    @ApiModelProperty(value="车属单位",required=false)
+    private String capacityCompany;
+
+    /**
+     * 车辆小号(CAPACITY_INNER_NUMBER,VARCHAR,100)
+     */
+    @ApiModelProperty(value="车辆小号",required=false)
+    private String capacityInnerNumber;
+
+    /**
+     * 匹配到的车号(CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="匹配到的车号",required=false)
+    private BigDecimal capacityId;
+
+    /**
+     * 车号(CAPACITY_NUMBER,VARCHAR,100)
+     */
+    @ApiModelProperty(value="车号",required=false)
+    private String capacityNumber;
+
+    /**
+     * 维修时间(MAINTENANCE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="维修时间",required=false)
+    private Date maintenanceTime;
+
+    /**
+     * 维修内容(MAINTENANCE_CONTENT,VARCHAR,100)
+     */
+    @ApiModelProperty(value="维修内容",required=false)
+    private String maintenanceContent;
+
+    /**
+     * 工时费用-维修(MAINTENANCE_COST1,DECIMAL,38)
+     */
+    @ApiModelProperty(value="工时费用-维修",required=false)
+    private BigDecimal maintenanceCost1;
+
+    /**
+     * 工时费用-电器(MAINTENANCE_COST2,DECIMAL,38)
+     */
+    @ApiModelProperty(value="工时费用-电器",required=false)
+    private BigDecimal maintenanceCost2;
+
+    /**
+     * 工时费用-钣焊(MAINTENANCE_COST3,DECIMAL,38)
+     */
+    @ApiModelProperty(value="工时费用-钣焊",required=false)
+    private BigDecimal maintenanceCost3;
+
+    /**
+     * 工时费用-补胎(MAINTENANCE_COST4,DECIMAL,38)
+     */
+    @ApiModelProperty(value="工时费用-补胎",required=false)
+    private BigDecimal maintenanceCost4;
+
+    /**
+     * 工时费用-其他(MAINTENANCE_COST5,DECIMAL,38)
+     */
+    @ApiModelProperty(value="工时费用-其他",required=false)
+    private BigDecimal maintenanceCost5;
+
+    @ApiModelProperty(value="",required=false)
+    private BigDecimal maintenanceCost6;
+
+    @ApiModelProperty(value="",required=false)
+    private BigDecimal maintenanceCost7;
+
+    @ApiModelProperty(value="",required=false)
+    private BigDecimal maintenanceCost8;
+
+    /**
+     * 工时费用合计(TOTAL_MAINTENANCE_COST,DECIMAL,38)
+     */
+    @ApiModelProperty(value="工时费用合计",required=false)
+    private BigDecimal totalMaintenanceCost;
+
+    /**
+     * 备件费用(SPARE_PART_COST,DECIMAL,38)
+     */
+    @ApiModelProperty(value="备件费用",required=false)
+    private BigDecimal sparePartCost;
+
+    /**
+     * 外修费用(EXTERNAL_REPAIR_COST,DECIMAL,38)
+     */
+    @ApiModelProperty(value="外修费用",required=false)
+    private BigDecimal externalRepairCost;
+
+    /**
+     * 合计(TOTAL_COST,DECIMAL,38)
+     */
+    @ApiModelProperty(value="合计",required=false)
+    private BigDecimal totalCost;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public String getCapacityType() {
+        return capacityType;
+    }
+
+    public void setCapacityType(String capacityType) {
+        this.capacityType = capacityType == null ? null : capacityType.trim();
+    }
+
+    public String getCapacityCompany() {
+        return capacityCompany;
+    }
+
+    public void setCapacityCompany(String capacityCompany) {
+        this.capacityCompany = capacityCompany == null ? null : capacityCompany.trim();
+    }
+
+    public String getCapacityInnerNumber() {
+        return capacityInnerNumber;
+    }
+
+    public void setCapacityInnerNumber(String capacityInnerNumber) {
+        this.capacityInnerNumber = capacityInnerNumber == null ? null : capacityInnerNumber.trim();
+    }
+
+    public BigDecimal getCapacityId() {
+        return capacityId;
+    }
+
+    public void setCapacityId(BigDecimal capacityId) {
+        this.capacityId = capacityId;
+    }
+
+    public String getCapacityNumber() {
+        return capacityNumber;
+    }
+
+    public void setCapacityNumber(String capacityNumber) {
+        this.capacityNumber = capacityNumber == null ? null : capacityNumber.trim();
+    }
+
+    public Date getMaintenanceTime() {
+        return maintenanceTime;
+    }
+
+    public void setMaintenanceTime(Date maintenanceTime) {
+        this.maintenanceTime = maintenanceTime;
+    }
+
+    public String getMaintenanceContent() {
+        return maintenanceContent;
+    }
+
+    public void setMaintenanceContent(String maintenanceContent) {
+        this.maintenanceContent = maintenanceContent == null ? null : maintenanceContent.trim();
+    }
+
+    public BigDecimal getMaintenanceCost1() {
+        return maintenanceCost1;
+    }
+
+    public void setMaintenanceCost1(BigDecimal maintenanceCost1) {
+        this.maintenanceCost1 = maintenanceCost1;
+    }
+
+    public BigDecimal getMaintenanceCost2() {
+        return maintenanceCost2;
+    }
+
+    public void setMaintenanceCost2(BigDecimal maintenanceCost2) {
+        this.maintenanceCost2 = maintenanceCost2;
+    }
+
+    public BigDecimal getMaintenanceCost3() {
+        return maintenanceCost3;
+    }
+
+    public void setMaintenanceCost3(BigDecimal maintenanceCost3) {
+        this.maintenanceCost3 = maintenanceCost3;
+    }
+
+    public BigDecimal getMaintenanceCost4() {
+        return maintenanceCost4;
+    }
+
+    public void setMaintenanceCost4(BigDecimal maintenanceCost4) {
+        this.maintenanceCost4 = maintenanceCost4;
+    }
+
+    public BigDecimal getMaintenanceCost5() {
+        return maintenanceCost5;
+    }
+
+    public void setMaintenanceCost5(BigDecimal maintenanceCost5) {
+        this.maintenanceCost5 = maintenanceCost5;
+    }
+
+    public BigDecimal getMaintenanceCost6() {
+        return maintenanceCost6;
+    }
+
+    public void setMaintenanceCost6(BigDecimal maintenanceCost6) {
+        this.maintenanceCost6 = maintenanceCost6;
+    }
+
+    public BigDecimal getMaintenanceCost7() {
+        return maintenanceCost7;
+    }
+
+    public void setMaintenanceCost7(BigDecimal maintenanceCost7) {
+        this.maintenanceCost7 = maintenanceCost7;
+    }
+
+    public BigDecimal getMaintenanceCost8() {
+        return maintenanceCost8;
+    }
+
+    public void setMaintenanceCost8(BigDecimal maintenanceCost8) {
+        this.maintenanceCost8 = maintenanceCost8;
+    }
+
+    public BigDecimal getTotalMaintenanceCost() {
+        return totalMaintenanceCost;
+    }
+
+    public void setTotalMaintenanceCost(BigDecimal totalMaintenanceCost) {
+        this.totalMaintenanceCost = totalMaintenanceCost;
+    }
+
+    public BigDecimal getSparePartCost() {
+        return sparePartCost;
+    }
+
+    public void setSparePartCost(BigDecimal sparePartCost) {
+        this.sparePartCost = sparePartCost;
+    }
+
+    public BigDecimal getExternalRepairCost() {
+        return externalRepairCost;
+    }
+
+    public void setExternalRepairCost(BigDecimal externalRepairCost) {
+        this.externalRepairCost = externalRepairCost;
+    }
+
+    public BigDecimal getTotalCost() {
+        return totalCost;
+    }
+
+    public void setTotalCost(BigDecimal totalCost) {
+        this.totalCost = totalCost;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", capacityType=").append(capacityType);
+        sb.append(", capacityCompany=").append(capacityCompany);
+        sb.append(", capacityInnerNumber=").append(capacityInnerNumber);
+        sb.append(", capacityId=").append(capacityId);
+        sb.append(", capacityNumber=").append(capacityNumber);
+        sb.append(", maintenanceTime=").append(maintenanceTime);
+        sb.append(", maintenanceContent=").append(maintenanceContent);
+        sb.append(", maintenanceCost1=").append(maintenanceCost1);
+        sb.append(", maintenanceCost2=").append(maintenanceCost2);
+        sb.append(", maintenanceCost3=").append(maintenanceCost3);
+        sb.append(", maintenanceCost4=").append(maintenanceCost4);
+        sb.append(", maintenanceCost5=").append(maintenanceCost5);
+        sb.append(", maintenanceCost6=").append(maintenanceCost6);
+        sb.append(", maintenanceCost7=").append(maintenanceCost7);
+        sb.append(", maintenanceCost8=").append(maintenanceCost8);
+        sb.append(", totalMaintenanceCost=").append(totalMaintenanceCost);
+        sb.append(", sparePartCost=").append(sparePartCost);
+        sb.append(", externalRepairCost=").append(externalRepairCost);
+        sb.append(", totalCost=").append(totalCost);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,379 @@
+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 TmsOutfactoryResult implements IBasePO<BigDecimal> {
+    /**
+     * 实绩ID（主键ID）(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实绩ID（主键ID）",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 出厂门岗ID(GATEPOST_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="出厂门岗ID",required=false)
+    private BigDecimal gatepostId;
+
+    /**
+     * 出厂方式（手动抬杆，自动抬杆））(OUT_MODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="出厂方式（手动抬杆，自动抬杆））",required=false)
+    private String outMode;
+
+    /**
+     * 出厂时间(OUT_GATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="出厂时间",required=false)
+    private Date outGateTime;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 备用字段1（线路步骤子表ID）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（线路步骤子表ID）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public BigDecimal getGatepostId() {
+        return gatepostId;
+    }
+
+    public void setGatepostId(BigDecimal gatepostId) {
+        this.gatepostId = gatepostId;
+    }
+
+    public String getOutMode() {
+        return outMode;
+    }
+
+    public void setOutMode(String outMode) {
+        this.outMode = outMode == null ? null : outMode.trim();
+    }
+
+    public Date getOutGateTime() {
+        return outGateTime;
+    }
+
+    public void setOutGateTime(Date outGateTime) {
+        this.outGateTime = outGateTime;
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    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(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", gatepostId=").append(gatepostId);
+        sb.append(", outMode=").append(outMode);
+        sb.append(", outGateTime=").append(outGateTime);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,201 @@
+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 TmsPleaseApprove implements IBasePO<BigDecimal> {
+    //以下是临时字段
+    public String userId;
+    public String userName;
+    /**
+     * 主键(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 发站(SENDSTATION,VARCHAR,255)
+     */
+    @ApiModelProperty(value="发站",required=false)
+    private String sendstation;
+
+    /**
+     * 请车时间(PLEASE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="请车时间",required=false)
+    private Date pleaseTime;
+
+    /**
+     * 请车数量(PLEASE_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="请车数量",required=false)
+    private BigDecimal pleaseNumber;
+
+    /**
+     * 批车数量(APPROVE_NUMBER,DECIMAL,38)
+     */
+    @ApiModelProperty(value="批车数量",required=false)
+    private BigDecimal approveNumber;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String remark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public String getSendstation() {
+        return sendstation;
+    }
+
+    public void setSendstation(String sendstation) {
+        this.sendstation = sendstation == null ? null : sendstation.trim();
+    }
+
+    public Date getPleaseTime() {
+        return pleaseTime;
+    }
+
+    public void setPleaseTime(Date pleaseTime) {
+        this.pleaseTime = pleaseTime;
+    }
+
+    public BigDecimal getPleaseNumber() {
+        return pleaseNumber;
+    }
+
+    public void setPleaseNumber(BigDecimal pleaseNumber) {
+        this.pleaseNumber = pleaseNumber;
+    }
+
+    public BigDecimal getApproveNumber() {
+        return approveNumber;
+    }
+
+    public void setApproveNumber(BigDecimal approveNumber) {
+        this.approveNumber = approveNumber;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", sendstation=").append(sendstation);
+        sb.append(", pleaseTime=").append(pleaseTime);
+        sb.append(", pleaseNumber=").append(pleaseNumber);
+        sb.append(", approveNumber=").append(approveNumber);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", remark=").append(remark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,514 @@
+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 TmsQualityResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 物资ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物资ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 采样单号(SAMPLING_NO,VARCHAR,255)
+     */
+    @ApiModelProperty(value="采样单号",required=false)
+    private String samplingNo;
+
+    /**
+     * 采样时间(SAMPLING_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="采样时间",required=false)
+    private Date samplingTime;
+
+    /**
+     * 采样地点ID(SAMPLING_POINT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="采样地点ID",required=false)
+    private BigDecimal samplingPointId;
+
+    /**
+     * 组样时间(ASSEMBLE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="组样时间",required=false)
+    private Date assembleTime;
+
+    /**
+     * 化验时间(ASSAY_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="化验时间",required=false)
+    private Date assayTime;
+
+    /**
+     * 化验单号(ASSAY_NO,VARCHAR,255)
+     */
+    @ApiModelProperty(value="化验单号",required=false)
+    private String assayNo;
+
+    /**
+     * 化验结果(ASSAY_RESULTS,VARCHAR,255)
+     */
+    @ApiModelProperty(value="化验结果",required=false)
+    private String assayResults;
+
+    /**
+     * 水份%(WATER_PROPORTION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="水份%",required=false)
+    private BigDecimal waterProportion;
+
+    /**
+     * 硫份%(SULFUR_PROPORTION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="硫份%",required=false)
+    private BigDecimal sulfurProportion;
+
+    /**
+     * 挥发份%(VOLATILE_PROPORTION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="挥发份%",required=false)
+    private BigDecimal volatileProportion;
+
+    /**
+     * 灰份%(ASH_PROPORTION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="灰份%",required=false)
+    private BigDecimal ashProportion;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 备用字段1（线路步骤子表ID）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（线路步骤子表ID）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public String getSamplingNo() {
+        return samplingNo;
+    }
+
+    public void setSamplingNo(String samplingNo) {
+        this.samplingNo = samplingNo == null ? null : samplingNo.trim();
+    }
+
+    public Date getSamplingTime() {
+        return samplingTime;
+    }
+
+    public void setSamplingTime(Date samplingTime) {
+        this.samplingTime = samplingTime;
+    }
+
+    public BigDecimal getSamplingPointId() {
+        return samplingPointId;
+    }
+
+    public void setSamplingPointId(BigDecimal samplingPointId) {
+        this.samplingPointId = samplingPointId;
+    }
+
+    public Date getAssembleTime() {
+        return assembleTime;
+    }
+
+    public void setAssembleTime(Date assembleTime) {
+        this.assembleTime = assembleTime;
+    }
+
+    public Date getAssayTime() {
+        return assayTime;
+    }
+
+    public void setAssayTime(Date assayTime) {
+        this.assayTime = assayTime;
+    }
+
+    public String getAssayNo() {
+        return assayNo;
+    }
+
+    public void setAssayNo(String assayNo) {
+        this.assayNo = assayNo == null ? null : assayNo.trim();
+    }
+
+    public String getAssayResults() {
+        return assayResults;
+    }
+
+    public void setAssayResults(String assayResults) {
+        this.assayResults = assayResults == null ? null : assayResults.trim();
+    }
+
+    public BigDecimal getWaterProportion() {
+        return waterProportion;
+    }
+
+    public void setWaterProportion(BigDecimal waterProportion) {
+        this.waterProportion = waterProportion;
+    }
+
+    public BigDecimal getSulfurProportion() {
+        return sulfurProportion;
+    }
+
+    public void setSulfurProportion(BigDecimal sulfurProportion) {
+        this.sulfurProportion = sulfurProportion;
+    }
+
+    public BigDecimal getVolatileProportion() {
+        return volatileProportion;
+    }
+
+    public void setVolatileProportion(BigDecimal volatileProportion) {
+        this.volatileProportion = volatileProportion;
+    }
+
+    public BigDecimal getAshProportion() {
+        return ashProportion;
+    }
+
+    public void setAshProportion(BigDecimal ashProportion) {
+        this.ashProportion = ashProportion;
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", samplingNo=").append(samplingNo);
+        sb.append(", samplingTime=").append(samplingTime);
+        sb.append(", samplingPointId=").append(samplingPointId);
+        sb.append(", assembleTime=").append(assembleTime);
+        sb.append(", assayTime=").append(assayTime);
+        sb.append(", assayNo=").append(assayNo);
+        sb.append(", assayResults=").append(assayResults);
+        sb.append(", waterProportion=").append(waterProportion);
+        sb.append(", sulfurProportion=").append(sulfurProportion);
+        sb.append(", volatileProportion=").append(volatileProportion);
+        sb.append(", ashProportion=").append(ashProportion);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,472 @@
+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 TmsQueueGrid implements IBasePO<BigDecimal> {
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public BigDecimal getOrderChildId() {
+        return orderChildId;
+    }
+
+    public void setOrderChildId(BigDecimal orderChildId) {
+        this.orderChildId = orderChildId;
+    }
+
+    BigDecimal transOrderId;
+
+    BigDecimal orderChildId;
+    /**
+     * 网格ID(GRID_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="网格ID",required=true)
+    private BigDecimal gridId;
+
+    /**
+     * 业务场景(BUSINESS_SCENE,VARCHAR,40)
+     */
+    @ApiModelProperty(value="业务场景",required=false)
+    private String businessScene;
+
+    /**
+     * 业务类型(BUSINESS_TYPE,DECIMAL,8)
+     */
+    @ApiModelProperty(value="业务类型",required=false)
+    private Integer businessType;
+
+    /**
+     * 入厂门岗ID(GATEPOST_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="入厂门岗ID",required=false)
+    private BigDecimal gatepostId;
+
+    /**
+     * 物料种类ID(MATERIAL_TYPE_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物料种类ID",required=false)
+    private BigDecimal materialTypeId;
+
+    /**
+     * 物料ID(MATERIAL_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="物料ID",required=false)
+    private BigDecimal materialId;
+
+    /**
+     * 排队中心点经度(LONGITUDE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="排队中心点经度",required=false)
+    private BigDecimal longitude;
+
+    /**
+     * 排队中心点纬度(LATITUDE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="排队中心点纬度",required=false)
+    private BigDecimal latitude;
+
+    /**
+     * 排队半径(RANGE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="排队半径",required=false)
+    private BigDecimal range;
+
+    /**
+     * 有效时长(DURATION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="有效时长",required=false)
+    private BigDecimal duration;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 网格名称(GRID_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="网格名称",required=false)
+    private String gridName;
+
+    /**
+     * 定位方式(LOCATION_MODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="定位方式",required=false)
+    private String locationMode;
+
+    /**
+     * 触发方式(TRIGGER_MODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="触发方式",required=false)
+    private String triggerMode;
+
+    /**
+     * 最大放行限制(MAX_RELEASE_NUMBER,DECIMAL,8)
+     */
+    @ApiModelProperty(value="最大放行限制",required=false)
+    private Integer maxReleaseNumber;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.gridId;
+    }
+
+    @Override
+    public void setId(BigDecimal gridId) {
+        this.gridId = gridId;
+    }
+
+    public BigDecimal getGridId() {
+        return gridId;
+    }
+
+    public void setGridId(BigDecimal gridId) {
+        this.gridId = gridId;
+    }
+
+    public String getBusinessScene() {
+        return businessScene;
+    }
+
+    public void setBusinessScene(String businessScene) {
+        this.businessScene = businessScene == null ? null : businessScene.trim();
+    }
+
+    public Integer getBusinessType() {
+        return businessType;
+    }
+
+    public void setBusinessType(Integer businessType) {
+        this.businessType = businessType;
+    }
+
+    public BigDecimal getGatepostId() {
+        return gatepostId;
+    }
+
+    public void setGatepostId(BigDecimal gatepostId) {
+        this.gatepostId = gatepostId;
+    }
+
+    public BigDecimal getMaterialTypeId() {
+        return materialTypeId;
+    }
+
+    public void setMaterialTypeId(BigDecimal materialTypeId) {
+        this.materialTypeId = materialTypeId;
+    }
+
+    public BigDecimal getMaterialId() {
+        return materialId;
+    }
+
+    public void setMaterialId(BigDecimal materialId) {
+        this.materialId = materialId;
+    }
+
+    public BigDecimal getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(BigDecimal longitude) {
+        this.longitude = longitude;
+    }
+
+    public BigDecimal getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(BigDecimal latitude) {
+        this.latitude = latitude;
+    }
+
+    public BigDecimal getRange() {
+        return range;
+    }
+
+    public void setRange(BigDecimal range) {
+        this.range = range;
+    }
+
+    public BigDecimal getDuration() {
+        return duration;
+    }
+
+    public void setDuration(BigDecimal duration) {
+        this.duration = duration;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public String getGridName() {
+        return gridName;
+    }
+
+    public void setGridName(String gridName) {
+        this.gridName = gridName == null ? null : gridName.trim();
+    }
+
+    public String getLocationMode() {
+        return locationMode;
+    }
+
+    public void setLocationMode(String locationMode) {
+        this.locationMode = locationMode == null ? null : locationMode.trim();
+    }
+
+    public String getTriggerMode() {
+        return triggerMode;
+    }
+
+    public void setTriggerMode(String triggerMode) {
+        this.triggerMode = triggerMode == null ? null : triggerMode.trim();
+    }
+
+    public Integer getMaxReleaseNumber() {
+        return maxReleaseNumber;
+    }
+
+    public void setMaxReleaseNumber(Integer maxReleaseNumber) {
+        this.maxReleaseNumber = maxReleaseNumber;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", gridId=").append(gridId);
+        sb.append(", businessScene=").append(businessScene);
+        sb.append(", businessType=").append(businessType);
+        sb.append(", gatepostId=").append(gatepostId);
+        sb.append(", materialTypeId=").append(materialTypeId);
+        sb.append(", materialId=").append(materialId);
+        sb.append(", longitude=").append(longitude);
+        sb.append(", latitude=").append(latitude);
+        sb.append(", range=").append(range);
+        sb.append(", duration=").append(duration);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", gridName=").append(gridName);
+        sb.append(", locationMode=").append(locationMode);
+        sb.append(", triggerMode=").append(triggerMode);
+        sb.append(", maxReleaseNumber=").append(maxReleaseNumber);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,423 @@
+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 TmsQueueResult implements IBasePO<BigDecimal> {
+    /**
+     * 排队实绩ID(QUEUE_RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="排队实绩ID",required=true)
+    private BigDecimal queueResultId;
+
+    /**
+     * 排队网格ID(QUEUE_GRID_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="排队网格ID",required=false)
+    private BigDecimal queueGridId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 运单子表ID(ORDER_CHILD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单子表ID",required=true)
+    private BigDecimal orderChildId;
+
+    /**
+     * 排队开始时间(QUEUE_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="排队开始时间",required=false)
+    private Date queueStartTime;
+
+    /**
+     * 排队放行时间(QUEUE_RELEASE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="排队放行时间",required=false)
+    private Date queueReleaseTime;
+
+    /**
+     * 排队取消时间(QUEUE_CANCEL_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="排队取消时间",required=false)
+    private Date queueCancelTime;
+
+    /**
+     * 排队取消原因(QUEUE_CANCEL_REASON,VARCHAR,255)
+     */
+    @ApiModelProperty(value="排队取消原因",required=false)
+    private String queueCancelReason;
+
+    /**
+     * 插队时间(QUEUE_ADD_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="插队时间",required=false)
+    private Date queueAddTime;
+
+    /**
+     * 插队原因(QUEUE_ADD_REASON,VARCHAR,255)
+     */
+    @ApiModelProperty(value="插队原因",required=false)
+    private String queueAddReason;
+
+    /**
+     * 排队状态(QUEUE_RESULT_STATUS,VARCHAR,100)
+     */
+    @ApiModelProperty(value="排队状态",required=false)
+    private String queueResultStatus;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 排队结束时间(QUEUE_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="排队结束时间",required=false)
+    private Date queueEndTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.queueResultId;
+    }
+
+    @Override
+    public void setId(BigDecimal queueResultId) {
+        this.queueResultId = queueResultId;
+    }
+
+    public BigDecimal getQueueResultId() {
+        return queueResultId;
+    }
+
+    public void setQueueResultId(BigDecimal queueResultId) {
+        this.queueResultId = queueResultId;
+    }
+
+    public BigDecimal getQueueGridId() {
+        return queueGridId;
+    }
+
+    public void setQueueGridId(BigDecimal queueGridId) {
+        this.queueGridId = queueGridId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public BigDecimal getOrderChildId() {
+        return orderChildId;
+    }
+
+    public void setOrderChildId(BigDecimal orderChildId) {
+        this.orderChildId = orderChildId;
+    }
+
+    public Date getQueueStartTime() {
+        return queueStartTime;
+    }
+
+    public void setQueueStartTime(Date queueStartTime) {
+        this.queueStartTime = queueStartTime;
+    }
+
+    public Date getQueueReleaseTime() {
+        return queueReleaseTime;
+    }
+
+    public void setQueueReleaseTime(Date queueReleaseTime) {
+        this.queueReleaseTime = queueReleaseTime;
+    }
+
+    public Date getQueueCancelTime() {
+        return queueCancelTime;
+    }
+
+    public void setQueueCancelTime(Date queueCancelTime) {
+        this.queueCancelTime = queueCancelTime;
+    }
+
+    public String getQueueCancelReason() {
+        return queueCancelReason;
+    }
+
+    public void setQueueCancelReason(String queueCancelReason) {
+        this.queueCancelReason = queueCancelReason == null ? null : queueCancelReason.trim();
+    }
+
+    public Date getQueueAddTime() {
+        return queueAddTime;
+    }
+
+    public void setQueueAddTime(Date queueAddTime) {
+        this.queueAddTime = queueAddTime;
+    }
+
+    public String getQueueAddReason() {
+        return queueAddReason;
+    }
+
+    public void setQueueAddReason(String queueAddReason) {
+        this.queueAddReason = queueAddReason == null ? null : queueAddReason.trim();
+    }
+
+    public String getQueueResultStatus() {
+        return queueResultStatus;
+    }
+
+    public void setQueueResultStatus(String queueResultStatus) {
+        this.queueResultStatus = queueResultStatus == null ? null : queueResultStatus.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public Date getQueueEndTime() {
+        return queueEndTime;
+    }
+
+    public void setQueueEndTime(Date queueEndTime) {
+        this.queueEndTime = queueEndTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", queueResultId=").append(queueResultId);
+        sb.append(", queueGridId=").append(queueGridId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", orderChildId=").append(orderChildId);
+        sb.append(", queueStartTime=").append(queueStartTime);
+        sb.append(", queueReleaseTime=").append(queueReleaseTime);
+        sb.append(", queueCancelTime=").append(queueCancelTime);
+        sb.append(", queueCancelReason=").append(queueCancelReason);
+        sb.append(", queueAddTime=").append(queueAddTime);
+        sb.append(", queueAddReason=").append(queueAddReason);
+        sb.append(", queueResultStatus=").append(queueResultStatus);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", queueEndTime=").append(queueEndTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,394 @@
+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 TmsReceiptResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 签收时间(RECEIPT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="签收时间",required=false)
+    private Date receiptTime;
+
+    /**
+     * 签收地址(RECEIPT_ADDRESS,VARCHAR,400)
+     */
+    @ApiModelProperty(value="签收地址",required=false)
+    private String receiptAddress;
+
+    /**
+     * 定位获取方式（手机定位，车辆定位，PC端手动输入签收）(LOCATION_MODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="定位获取方式（手机定位，车辆定位，PC端手动输入签收）",required=false)
+    private String locationMode;
+
+    /**
+     * 签收方式（客户签收、司机签收）(RECEIPT_MODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="签收方式（客户签收、司机签收）",required=false)
+    private String receiptMode;
+
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 备用字段1（线路步骤子表ID）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（线路步骤子表ID）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public Date getReceiptTime() {
+        return receiptTime;
+    }
+
+    public void setReceiptTime(Date receiptTime) {
+        this.receiptTime = receiptTime;
+    }
+
+    public String getReceiptAddress() {
+        return receiptAddress;
+    }
+
+    public void setReceiptAddress(String receiptAddress) {
+        this.receiptAddress = receiptAddress == null ? null : receiptAddress.trim();
+    }
+
+    public String getLocationMode() {
+        return locationMode;
+    }
+
+    public void setLocationMode(String locationMode) {
+        this.locationMode = locationMode == null ? null : locationMode.trim();
+    }
+
+    public String getReceiptMode() {
+        return receiptMode;
+    }
+
+    public void setReceiptMode(String receiptMode) {
+        this.receiptMode = receiptMode == null ? null : receiptMode.trim();
+    }
+
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    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(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", receiptTime=").append(receiptTime);
+        sb.append(", receiptAddress=").append(receiptAddress);
+        sb.append(", locationMode=").append(locationMode);
+        sb.append(", receiptMode=").append(receiptMode);
+        sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,394 @@
+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 TmsReplaceFrontResult implements IBasePO<BigDecimal> {
+    /**
+     * 实绩ID（主键ID）(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实绩ID（主键ID）",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运输订单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运输订单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 更换时间(REPLACE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="更换时间",required=false)
+    private Date replaceTime;
+
+    /**
+     * 更换地点id（指向作业点id）(REPLACE_POINT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="更换地点id（指向作业点id）",required=false)
+    private BigDecimal replacePointId;
+
+    /**
+     * 原车头id(ORIGINAL_CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="原车头id",required=false)
+    private BigDecimal originalCapacityId;
+
+    /**
+     * 更换后车头id(AFTER_CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="更换后车头id",required=false)
+    private BigDecimal afterCapacityId;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户（指向id）(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户（指向id）",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 备用字段1（线路步骤子表ID）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（线路步骤子表ID）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public Date getReplaceTime() {
+        return replaceTime;
+    }
+
+    public void setReplaceTime(Date replaceTime) {
+        this.replaceTime = replaceTime;
+    }
+
+    public BigDecimal getReplacePointId() {
+        return replacePointId;
+    }
+
+    public void setReplacePointId(BigDecimal replacePointId) {
+        this.replacePointId = replacePointId;
+    }
+
+    public BigDecimal getOriginalCapacityId() {
+        return originalCapacityId;
+    }
+
+    public void setOriginalCapacityId(BigDecimal originalCapacityId) {
+        this.originalCapacityId = originalCapacityId;
+    }
+
+    public BigDecimal getAfterCapacityId() {
+        return afterCapacityId;
+    }
+
+    public void setAfterCapacityId(BigDecimal afterCapacityId) {
+        this.afterCapacityId = afterCapacityId;
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    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(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", replaceTime=").append(replaceTime);
+        sb.append(", replacePointId=").append(replacePointId);
+        sb.append(", originalCapacityId=").append(originalCapacityId);
+        sb.append(", afterCapacityId=").append(afterCapacityId);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,169 @@
+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 TmsRouteResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 关联订单表(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="关联订单表",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String remark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=false)
+    private Integer deleted;
+
+    /**
+     * 路径(PATH,CLOB,4000)
+     */
+    @ApiModelProperty(value="路径",required=false)
+    private String path;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getPath() {
+        return path;
+    }
+
+    public void setPath(String path) {
+        this.path = path == null ? null : path.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", remark=").append(remark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", path=").append(path);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,424 @@
+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 TmsSignInResult implements IBasePO<BigDecimal> {
+    /**
+     * 实绩ID（主键ID）(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实绩ID（主键ID）",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 签到时间(SIGN_IN_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="签到时间",required=false)
+    private Date signInTime;
+
+    /**
+     * 签到标准时长ID(STANDARD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="签到标准时长ID",required=false)
+    private BigDecimal standardId;
+
+    /**
+     * 签到地址(SIGN_IN_ADDRESS,VARCHAR,255)
+     */
+    @ApiModelProperty(value="签到地址",required=false)
+    private String signInAddress;
+
+    /**
+     * 定位获取方式（手机定位，车辆定位，PC端手动输入）(LOCATION_MODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="定位获取方式（手机定位，车辆定位，PC端手动输入）",required=false)
+    private String locationMode;
+
+    /**
+     * 签到方式（外部系统签到，物流签到））(SIGN_IN_MODE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="签到方式（外部系统签到，物流签到））",required=false)
+    private String signInMode;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 备用字段1（线路步骤子表ID）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（线路步骤子表ID）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 过期时间(EXPIRE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="过期时间",required=false)
+    private Date expireTime;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public Date getSignInTime() {
+        return signInTime;
+    }
+
+    public void setSignInTime(Date signInTime) {
+        this.signInTime = signInTime;
+    }
+
+    public BigDecimal getStandardId() {
+        return standardId;
+    }
+
+    public void setStandardId(BigDecimal standardId) {
+        this.standardId = standardId;
+    }
+
+    public String getSignInAddress() {
+        return signInAddress;
+    }
+
+    public void setSignInAddress(String signInAddress) {
+        this.signInAddress = signInAddress == null ? null : signInAddress.trim();
+    }
+
+    public String getLocationMode() {
+        return locationMode;
+    }
+
+    public void setLocationMode(String locationMode) {
+        this.locationMode = locationMode == null ? null : locationMode.trim();
+    }
+
+    public String getSignInMode() {
+        return signInMode;
+    }
+
+    public void setSignInMode(String signInMode) {
+        this.signInMode = signInMode == null ? null : signInMode.trim();
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Date getExpireTime() {
+        return expireTime;
+    }
+
+    public void setExpireTime(Date expireTime) {
+        this.expireTime = expireTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", signInTime=").append(signInTime);
+        sb.append(", standardId=").append(standardId);
+        sb.append(", signInAddress=").append(signInAddress);
+        sb.append(", locationMode=").append(locationMode);
+        sb.append(", signInMode=").append(signInMode);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", expireTime=").append(expireTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,378 @@
+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 TmsTimingResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 计时时间(RESULT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="计时时间",required=false)
+    private Date resultTime;
+
+    /**
+     * 计时类型（1，计时开始，2，暂停开始，3，暂停结束，4，计时结束））(TIME_TYPE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计时类型（1，计时开始，2，暂停开始，3，暂停结束，4，计时结束））",required=false)
+    private BigDecimal timeType;
+
+    /**
+     * 计时时长（单位：分钟）(TIMING_DURATION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="计时时长（单位：分钟）",required=false)
+    private BigDecimal timingDuration;
+
+    /**
+     * 实际时长（单位：分钟）(ACTUAL_DURATION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实际时长（单位：分钟）",required=false)
+    private BigDecimal actualDuration;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public Date getResultTime() {
+        return resultTime;
+    }
+
+    public void setResultTime(Date resultTime) {
+        this.resultTime = resultTime;
+    }
+
+    public BigDecimal getTimeType() {
+        return timeType;
+    }
+
+    public void setTimeType(BigDecimal timeType) {
+        this.timeType = timeType;
+    }
+
+    public BigDecimal getTimingDuration() {
+        return timingDuration;
+    }
+
+    public void setTimingDuration(BigDecimal timingDuration) {
+        this.timingDuration = timingDuration;
+    }
+
+    public BigDecimal getActualDuration() {
+        return actualDuration;
+    }
+
+    public void setActualDuration(BigDecimal actualDuration) {
+        this.actualDuration = actualDuration;
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    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(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", resultTime=").append(resultTime);
+        sb.append(", timeType=").append(timeType);
+        sb.append(", timingDuration=").append(timingDuration);
+        sb.append(", actualDuration=").append(actualDuration);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,289 @@
+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 TmsTransitGatepost implements IBasePO<BigDecimal> {
+    /**
+     * 主键iD(PRIMARY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键iD",required=true)
+    private BigDecimal primaryId;
+
+    /**
+     * 门岗编码(GATEPOST_CODE,VARCHAR,20)
+     */
+    @ApiModelProperty(value="门岗编码",required=true)
+    private String gatepostCode;
+
+    /**
+     * 通行单ID(TRANSIT_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="通行单ID",required=true)
+    private BigDecimal transitOrderId;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.primaryId;
+    }
+
+    @Override
+    public void setId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public BigDecimal getPrimaryId() {
+        return primaryId;
+    }
+
+    public void setPrimaryId(BigDecimal primaryId) {
+        this.primaryId = primaryId;
+    }
+
+    public String getGatepostCode() {
+        return gatepostCode;
+    }
+
+    public void setGatepostCode(String gatepostCode) {
+        this.gatepostCode = gatepostCode == null ? null : gatepostCode.trim();
+    }
+
+    public BigDecimal getTransitOrderId() {
+        return transitOrderId;
+    }
+
+    public void setTransitOrderId(BigDecimal transitOrderId) {
+        this.transitOrderId = transitOrderId;
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", primaryId=").append(primaryId);
+        sb.append(", gatepostCode=").append(gatepostCode);
+        sb.append(", transitOrderId=").append(transitOrderId);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,431 @@
+package com.steerinfo.dil.model;
+
+import com.steerinfo.framework.model.ICBasePO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+@ApiModel(value="通行单")
+public class TmsTransitOrder implements ICBasePO<TmsTransitOrder> {
+    /**
+     * 单据ID(TRANSIT_ORDER_ID,VARCHAR,32)
+     */
+    @ApiModelProperty(value="单据ID",required=true)
+    private String transitOrderId;
+
+    /**
+     * 通行单号(SERIAL_NO,VARCHAR,50)
+     */
+    @ApiModelProperty(value="通行单号",required=true)
+    private String serialNo;
+
+    /**
+     * 车辆编号(CAPACITY_NUMBER,VARCHAR,50)
+     */
+    @ApiModelProperty(value="车辆编号",required=true)
+    private String capacityNumber;
+
+    /**
+     * 车辆类型(CAPACITY_TYPE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="车辆类型",required=false)
+    private String capacityType;
+
+    /**
+     * 司机姓名(DRIVER_NAME,VARCHAR,100)
+     */
+    @ApiModelProperty(value="司机姓名",required=false)
+    private String driverName;
+
+    /**
+     * 身份证号(IDENTIFY_CARD,VARCHAR,100)
+     */
+    @ApiModelProperty(value="身份证号",required=false)
+    private String identifyCard;
+
+    /**
+     * 身份证内码(INNER_CODE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="身份证内码",required=false)
+    private String innerCode;
+
+    /**
+     * 联系电话(TEL_PHONE,VARCHAR,100)
+     */
+    @ApiModelProperty(value="联系电话",required=false)
+    private String telPhone;
+
+    /**
+     * 门禁编号(GATEPOST_NAME,VARCHAR,600)
+     */
+    @ApiModelProperty(value="门禁编号",required=false)
+    private String gatepostName;
+
+    /**
+     * 起始时间(START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="起始时间",required=true)
+    private Date startTime;
+
+    /**
+     * 结束时间(END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="结束时间",required=true)
+    private Date endTime;
+
+    /**
+     * 通行卡类型(TRANSIT_ORDER_TYPE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="通行卡类型",required=false)
+    private String transitOrderType;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备注",required=false)
+    private String insertUpdateRemark;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,8)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private Integer deleted;
+
+    /**
+     * 备用字段1(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public Map<String, Object> getId() {
+        Map<String, Object> params = new HashMap<>();
+        params.put("transitOrderId",this.transitOrderId);
+        params.put("serialNo",this.serialNo);
+        params.put("capacityNumber",this.capacityNumber);
+        return params;
+    }
+
+    @Override
+    public void setId(TmsTransitOrder tmsTransitOrder) {
+        this.transitOrderId = tmsTransitOrder.getTransitOrderId();
+        this.serialNo = tmsTransitOrder.getSerialNo();
+        this.capacityNumber = tmsTransitOrder.getCapacityNumber();
+    }
+
+    public String getTransitOrderId() {
+        return transitOrderId;
+    }
+
+    public void setTransitOrderId(String transitOrderId) {
+        this.transitOrderId = transitOrderId == null ? null : transitOrderId.trim();
+    }
+
+    public String getSerialNo() {
+        return serialNo;
+    }
+
+    public void setSerialNo(String serialNo) {
+        this.serialNo = serialNo == null ? null : serialNo.trim();
+    }
+
+    public String getCapacityNumber() {
+        return capacityNumber;
+    }
+
+    public void setCapacityNumber(String capacityNumber) {
+        this.capacityNumber = capacityNumber == null ? null : capacityNumber.trim();
+    }
+
+    public String getCapacityType() {
+        return capacityType;
+    }
+
+    public void setCapacityType(String capacityType) {
+        this.capacityType = capacityType == null ? null : capacityType.trim();
+    }
+
+    public String getDriverName() {
+        return driverName;
+    }
+
+    public void setDriverName(String driverName) {
+        this.driverName = driverName == null ? null : driverName.trim();
+    }
+
+    public String getIdentifyCard() {
+        return identifyCard;
+    }
+
+    public void setIdentifyCard(String identifyCard) {
+        this.identifyCard = identifyCard == null ? null : identifyCard.trim();
+    }
+
+    public String getInnerCode() {
+        return innerCode;
+    }
+
+    public void setInnerCode(String innerCode) {
+        this.innerCode = innerCode == null ? null : innerCode.trim();
+    }
+
+    public String getTelPhone() {
+        return telPhone;
+    }
+
+    public void setTelPhone(String telPhone) {
+        this.telPhone = telPhone == null ? null : telPhone.trim();
+    }
+
+    public String getGatepostName() {
+        return gatepostName;
+    }
+
+    public void setGatepostName(String gatepostName) {
+        this.gatepostName = gatepostName == null ? null : gatepostName.trim();
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getTransitOrderType() {
+        return transitOrderType;
+    }
+
+    public void setTransitOrderType(String transitOrderType) {
+        this.transitOrderType = transitOrderType == null ? null : transitOrderType.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public String getInsertUpdateRemark() {
+        return insertUpdateRemark;
+    }
+
+    public void setInsertUpdateRemark(String insertUpdateRemark) {
+        this.insertUpdateRemark = insertUpdateRemark == null ? null : insertUpdateRemark.trim();
+    }
+
+    public Integer getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(Integer deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", transitOrderId=").append(transitOrderId);
+        sb.append(", serialNo=").append(serialNo);
+        sb.append(", capacityNumber=").append(capacityNumber);
+        sb.append(", capacityType=").append(capacityType);
+        sb.append(", driverName=").append(driverName);
+        sb.append(", identifyCard=").append(identifyCard);
+        sb.append(", innerCode=").append(innerCode);
+        sb.append(", telPhone=").append(telPhone);
+        sb.append(", gatepostName=").append(gatepostName);
+        sb.append(", startTime=").append(startTime);
+        sb.append(", endTime=").append(endTime);
+        sb.append(", transitOrderType=").append(transitOrderType);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

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

@@ -0,0 +1,514 @@
+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 TmsUnloadResult implements IBasePO<BigDecimal> {
+    /**
+     * 主键ID(RESULT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="主键ID",required=true)
+    private BigDecimal resultId;
+
+    /**
+     * 运单ID(TRANS_ORDER_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="运单ID",required=true)
+    private BigDecimal transOrderId;
+
+    /**
+     * 卸货开始时间(UNLOAD_START_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="卸货开始时间",required=false)
+    private Date unloadStartTime;
+
+    /**
+     * 卸货结束时间(UNLOAD_END_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="卸货结束时间",required=false)
+    private Date unloadEndTime;
+
+    /**
+     * 卸货时长(UNLOAD_DURATION,DECIMAL,38)
+     */
+    @ApiModelProperty(value="卸货时长",required=false)
+    private BigDecimal unloadDuration;
+
+    /**
+     * 卸货时长标准信息ID(STANDARD_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="卸货时长标准信息ID",required=false)
+    private BigDecimal standardId;
+
+    /**
+     * 卸货点ID(UNLOAD_POINT_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="卸货点ID",required=false)
+    private BigDecimal unloadPointId;
+
+    /**
+     * 卸货实际地址（获取手机/车辆GPS)）(UNLOAD_ACTUAL_ADDRESS,VARCHAR,255)
+     */
+    @ApiModelProperty(value="卸货实际地址（获取手机/车辆GPS)）",required=false)
+    private String unloadActualAddress;
+
+    /**
+     * 分录ID（包含物资信息）(TRANS_ORDER_CHILD_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="分录ID（包含物资信息）",required=false)
+    private BigDecimal transOrderChildId;
+
+    /**
+     * 卸货人员ID(UNLOADER_ID,DECIMAL,0)
+     */
+    @ApiModelProperty(value="卸货人员ID",required=false)
+    private BigDecimal unloaderId;
+
+    /**
+     * 卸货特种车辆ID(UNLOAD_CAPACITY_ID,DECIMAL,38)
+     */
+    @ApiModelProperty(value="卸货特种车辆ID",required=false)
+    private BigDecimal unloadCapacityId;
+
+    /**
+     * 卸货状态：拒绝；同意(UNLOAD_STATUS,VARCHAR,255)
+     */
+    @ApiModelProperty(value="卸货状态：拒绝；同意",required=false)
+    private String unloadStatus;
+
+    /**
+     * 拒绝理由(REFUSE_REASON,VARCHAR,255)
+     */
+    @ApiModelProperty(value="拒绝理由",required=false)
+    private String refuseReason;
+
+    /**
+     * 实装吨位(ACTUAL_TONNAGE,DECIMAL,38)
+     */
+    @ApiModelProperty(value="实装吨位",required=false)
+    private BigDecimal actualTonnage;
+
+    /**
+     * 路段顺序号(SEGMENT_SQE,DECIMAL,0)
+     */
+    @ApiModelProperty(value="路段顺序号",required=false)
+    private BigDecimal segmentSqe;
+
+    /**
+     * 实绩属性(RESULT_ATTRIBUTE,VARCHAR,255)
+     */
+    @ApiModelProperty(value="实绩属性",required=false)
+    private String resultAttribute;
+
+    /**
+     * 实绩图片(RESULT_IMAGE,VARCHAR,2000)
+     */
+    @ApiModelProperty(value="实绩图片",required=false)
+    private String resultImage;
+
+    /**
+     * 表名(TABLE_NAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="表名",required=false)
+    private String tableName;
+
+    /**
+     * 新增时间(INSERT_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="新增时间",required=false)
+    private Date insertTime;
+
+    /**
+     * 新增用户(INSERT_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="新增用户",required=false)
+    private String insertUsername;
+
+    /**
+     * 修改时间(UPDATE_TIME,TIMESTAMP,7)
+     */
+    @ApiModelProperty(value="修改时间",required=false)
+    private Date updateTime;
+
+    /**
+     * 修改用户(UPDATE_USERNAME,VARCHAR,255)
+     */
+    @ApiModelProperty(value="修改用户",required=false)
+    private String updateUsername;
+
+    /**
+     * 逻辑删除（0正常，1删除）(DELETED,DECIMAL,38)
+     */
+    @ApiModelProperty(value="逻辑删除（0正常，1删除）",required=true)
+    private BigDecimal deleted;
+
+    /**
+     * 备用字段1（线路步骤子表ID）(ALTERNATE_FIELDS1,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段1（线路步骤子表ID）",required=false)
+    private String alternateFields1;
+
+    /**
+     * 备用字段2(ALTERNATE_FIELDS2,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段2",required=false)
+    private String alternateFields2;
+
+    /**
+     * 备用字段3(ALTERNATE_FIELDS3,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段3",required=false)
+    private String alternateFields3;
+
+    /**
+     * 备用字段4(ALTERNATE_FIELDS4,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段4",required=false)
+    private String alternateFields4;
+
+    /**
+     * 备用字段5(ALTERNATE_FIELDS5,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段5",required=false)
+    private String alternateFields5;
+
+    /**
+     * 备用字段6(ALTERNATE_FIELDS6,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段6",required=false)
+    private String alternateFields6;
+
+    /**
+     * 备用字段7(ALTERNATE_FIELDS7,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段7",required=false)
+    private String alternateFields7;
+
+    /**
+     * 备用字段8(ALTERNATE_FIELDS8,VARCHAR,255)
+     */
+    @ApiModelProperty(value="备用字段8",required=false)
+    private String alternateFields8;
+
+    /**
+     * 记录创建或修改备注(INSERT_UPDATE_REMARK,VARCHAR,255)
+     */
+    @ApiModelProperty(value="记录创建或修改备注",required=false)
+    private String insertUpdateRemark;
+
+    private static final long serialVersionUID = 1L;
+
+    @Override
+    public BigDecimal getId() {
+        return this.resultId;
+    }
+
+    @Override
+    public void setId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getResultId() {
+        return resultId;
+    }
+
+    public void setResultId(BigDecimal resultId) {
+        this.resultId = resultId;
+    }
+
+    public BigDecimal getTransOrderId() {
+        return transOrderId;
+    }
+
+    public void setTransOrderId(BigDecimal transOrderId) {
+        this.transOrderId = transOrderId;
+    }
+
+    public Date getUnloadStartTime() {
+        return unloadStartTime;
+    }
+
+    public void setUnloadStartTime(Date unloadStartTime) {
+        this.unloadStartTime = unloadStartTime;
+    }
+
+    public Date getUnloadEndTime() {
+        return unloadEndTime;
+    }
+
+    public void setUnloadEndTime(Date unloadEndTime) {
+        this.unloadEndTime = unloadEndTime;
+    }
+
+    public BigDecimal getUnloadDuration() {
+        return unloadDuration;
+    }
+
+    public void setUnloadDuration(BigDecimal unloadDuration) {
+        this.unloadDuration = unloadDuration;
+    }
+
+    public BigDecimal getStandardId() {
+        return standardId;
+    }
+
+    public void setStandardId(BigDecimal standardId) {
+        this.standardId = standardId;
+    }
+
+    public BigDecimal getUnloadPointId() {
+        return unloadPointId;
+    }
+
+    public void setUnloadPointId(BigDecimal unloadPointId) {
+        this.unloadPointId = unloadPointId;
+    }
+
+    public String getUnloadActualAddress() {
+        return unloadActualAddress;
+    }
+
+    public void setUnloadActualAddress(String unloadActualAddress) {
+        this.unloadActualAddress = unloadActualAddress == null ? null : unloadActualAddress.trim();
+    }
+
+    public BigDecimal getTransOrderChildId() {
+        return transOrderChildId;
+    }
+
+    public void setTransOrderChildId(BigDecimal transOrderChildId) {
+        this.transOrderChildId = transOrderChildId;
+    }
+
+    public BigDecimal getUnloaderId() {
+        return unloaderId;
+    }
+
+    public void setUnloaderId(BigDecimal unloaderId) {
+        this.unloaderId = unloaderId;
+    }
+
+    public BigDecimal getUnloadCapacityId() {
+        return unloadCapacityId;
+    }
+
+    public void setUnloadCapacityId(BigDecimal unloadCapacityId) {
+        this.unloadCapacityId = unloadCapacityId;
+    }
+
+    public String getUnloadStatus() {
+        return unloadStatus;
+    }
+
+    public void setUnloadStatus(String unloadStatus) {
+        this.unloadStatus = unloadStatus == null ? null : unloadStatus.trim();
+    }
+
+    public String getRefuseReason() {
+        return refuseReason;
+    }
+
+    public void setRefuseReason(String refuseReason) {
+        this.refuseReason = refuseReason == null ? null : refuseReason.trim();
+    }
+
+    public BigDecimal getActualTonnage() {
+        return actualTonnage;
+    }
+
+    public void setActualTonnage(BigDecimal actualTonnage) {
+        this.actualTonnage = actualTonnage;
+    }
+
+    public BigDecimal getSegmentSqe() {
+        return segmentSqe;
+    }
+
+    public void setSegmentSqe(BigDecimal segmentSqe) {
+        this.segmentSqe = segmentSqe;
+    }
+
+    public String getResultAttribute() {
+        return resultAttribute;
+    }
+
+    public void setResultAttribute(String resultAttribute) {
+        this.resultAttribute = resultAttribute == null ? null : resultAttribute.trim();
+    }
+
+    public String getResultImage() {
+        return resultImage;
+    }
+
+    public void setResultImage(String resultImage) {
+        this.resultImage = resultImage == null ? null : resultImage.trim();
+    }
+
+    public String getTableName() {
+        return tableName;
+    }
+
+    public void setTableName(String tableName) {
+        this.tableName = tableName == null ? null : tableName.trim();
+    }
+
+    public Date getInsertTime() {
+        return insertTime;
+    }
+
+    public void setInsertTime(Date insertTime) {
+        this.insertTime = insertTime;
+    }
+
+    public String getInsertUsername() {
+        return insertUsername;
+    }
+
+    public void setInsertUsername(String insertUsername) {
+        this.insertUsername = insertUsername == null ? null : insertUsername.trim();
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    public String getUpdateUsername() {
+        return updateUsername;
+    }
+
+    public void setUpdateUsername(String updateUsername) {
+        this.updateUsername = updateUsername == null ? null : updateUsername.trim();
+    }
+
+    public BigDecimal getDeleted() {
+        return deleted;
+    }
+
+    public void setDeleted(BigDecimal deleted) {
+        this.deleted = deleted;
+    }
+
+    public String getAlternateFields1() {
+        return alternateFields1;
+    }
+
+    public void setAlternateFields1(String alternateFields1) {
+        this.alternateFields1 = alternateFields1 == null ? null : alternateFields1.trim();
+    }
+
+    public String getAlternateFields2() {
+        return alternateFields2;
+    }
+
+    public void setAlternateFields2(String alternateFields2) {
+        this.alternateFields2 = alternateFields2 == null ? null : alternateFields2.trim();
+    }
+
+    public String getAlternateFields3() {
+        return alternateFields3;
+    }
+
+    public void setAlternateFields3(String alternateFields3) {
+        this.alternateFields3 = alternateFields3 == null ? null : alternateFields3.trim();
+    }
+
+    public String getAlternateFields4() {
+        return alternateFields4;
+    }
+
+    public void setAlternateFields4(String alternateFields4) {
+        this.alternateFields4 = alternateFields4 == null ? null : alternateFields4.trim();
+    }
+
+    public String getAlternateFields5() {
+        return alternateFields5;
+    }
+
+    public void setAlternateFields5(String alternateFields5) {
+        this.alternateFields5 = alternateFields5 == null ? null : alternateFields5.trim();
+    }
+
+    public String getAlternateFields6() {
+        return alternateFields6;
+    }
+
+    public void setAlternateFields6(String alternateFields6) {
+        this.alternateFields6 = alternateFields6 == null ? null : alternateFields6.trim();
+    }
+
+    public String getAlternateFields7() {
+        return alternateFields7;
+    }
+
+    public void setAlternateFields7(String alternateFields7) {
+        this.alternateFields7 = alternateFields7 == null ? null : alternateFields7.trim();
+    }
+
+    public String getAlternateFields8() {
+        return alternateFields8;
+    }
+
+    public void setAlternateFields8(String alternateFields8) {
+        this.alternateFields8 = alternateFields8 == null ? null : alternateFields8.trim();
+    }
+
+    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(", resultId=").append(resultId);
+        sb.append(", transOrderId=").append(transOrderId);
+        sb.append(", unloadStartTime=").append(unloadStartTime);
+        sb.append(", unloadEndTime=").append(unloadEndTime);
+        sb.append(", unloadDuration=").append(unloadDuration);
+        sb.append(", standardId=").append(standardId);
+        sb.append(", unloadPointId=").append(unloadPointId);
+        sb.append(", unloadActualAddress=").append(unloadActualAddress);
+        sb.append(", transOrderChildId=").append(transOrderChildId);
+        sb.append(", unloaderId=").append(unloaderId);
+        sb.append(", unloadCapacityId=").append(unloadCapacityId);
+        sb.append(", unloadStatus=").append(unloadStatus);
+        sb.append(", refuseReason=").append(refuseReason);
+        sb.append(", actualTonnage=").append(actualTonnage);
+        sb.append(", segmentSqe=").append(segmentSqe);
+        sb.append(", resultAttribute=").append(resultAttribute);
+        sb.append(", resultImage=").append(resultImage);
+        sb.append(", tableName=").append(tableName);
+        sb.append(", insertTime=").append(insertTime);
+        sb.append(", insertUsername=").append(insertUsername);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", updateUsername=").append(updateUsername);
+        sb.append(", deleted=").append(deleted);
+        sb.append(", alternateFields1=").append(alternateFields1);
+        sb.append(", alternateFields2=").append(alternateFields2);
+        sb.append(", alternateFields3=").append(alternateFields3);
+        sb.append(", alternateFields4=").append(alternateFields4);
+        sb.append(", alternateFields5=").append(alternateFields5);
+        sb.append(", alternateFields6=").append(alternateFields6);
+        sb.append(", alternateFields7=").append(alternateFields7);
+        sb.append(", alternateFields8=").append(alternateFields8);
+        sb.append(", insertUpdateRemark=").append(insertUpdateRemark);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}